Ingo Molnar 040cca3ab2 Merge branch 'linus' into locking/core, to resolve conflicts ... Conflicts: include/linux/mm_types.h mm/huge_memory.c I removed the smp_mb__before_spinlock() like the following commit does: 8b1b436dd1 ("mm, locking: Rework {set,clear,mm}_tlb_flush_pending()") and fixed up the affected commits. Signed-off-by: Ingo Molnar <mingo@kernel.org>		2017-08-11 13:51:59 +02:00
..
asm	Merge branch 'linus' into locking/core, to resolve conflicts	2017-08-11 13:51:59 +02:00
uapi/asm	tty: Fix TIOCGPTPEER ioctl definition	2017-07-17 17:04:41 +02:00