git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

author	Ingo Molnar <mingo@kernel.org>
	Fri, 11 Aug 2017 11:51:59 +0000 (13:51 +0200)
committer	Ingo Molnar <mingo@kernel.org>
	Fri, 11 Aug 2017 11:51:59 +0000 (13:51 +0200)
commit	1caba2f5a885e093a025a82a77873142ac3e97f4
tree	25709ba52ee06fccf4bfbfbf2897bb8cf86da828	tree \| snapshot
parent	a490faceed145fdccad43e46ca4135dc09253bcc	commit \| diff
parent	b83a87ec228baba9801ba7ec9e671b2d4611de4c	commit \| diff

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:

7c7b3a440efa ("mm, locking: Rework {set,clear,mm}_tlb_flush_pending()")

and fixed up the affected commits.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

fs/userfaultfd.c	diff1 \|	diff2 \|	blob \| history
include/linux/mm_types.h	diff1 \|	diff2 \|	blob \| history
kernel/fork.c	diff1 \|	diff2 \|	blob \| history
mm/huge_memory.c	diff1 \|	diff2 \|	blob \| history
mm/page_alloc.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/udp.c	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.

RSS Atom

fs/userfaultfd.c	diff1 \|	diff2 \|	blob \| history
include/linux/mm_types.h	diff1 \|	diff2 \|	blob \| history
kernel/fork.c	diff1 \|	diff2 \|	blob \| history
mm/huge_memory.c	diff1 \|	diff2 \|	blob \| history
mm/page_alloc.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/udp.c	diff1 \|	diff2 \|	blob \| history