www.infradead.org Git - nvme.git/commit

]> www.infradead.org Git - nvme.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	040cca3ab2f6f8b8d26e0e4965abea2b9aa14818
tree	25709ba52ee06fccf4bfbfbf2897bb8cf86da828	tree
parent	ef0758dd0fd70b98b889af26e27f003656952db8	commit \| diff
parent	b2dbdf2ca1d2803e9cdc46a94554c4a39ffb235a	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:

8b1b436dd1cc ("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

Unnamed repository; edit this file 'description' to name the repository.

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