Merge tag 'v4.5-rc7' into x86/asm, to pick up SMAP fix

Signed-off-by: Ingo Molnar <[email protected]>

diff --cc arch/x86/entry/entry_32.S
Simple merge

diff --cc mm/memory.c
Simple merge

diff --cc mm/mmap.c
Simple merge