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:

  8b1b436dd1cc ("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
..
2017-04-12 22:02:40 +02:00
2017-08-08 21:03:47 -07:00
2017-07-21 16:26:01 -07:00
2017-06-15 12:12:40 -04:00
2017-06-15 12:12:40 -04:00