]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'linus' into locking/core, to resolve conflicts
authorIngo Molnar <mingo@kernel.org>
Fri, 11 Aug 2017 11:51:59 +0000 (13:51 +0200)
committerIngo Molnar <mingo@kernel.org>
Fri, 11 Aug 2017 11:51:59 +0000 (13:51 +0200)
commit1caba2f5a885e093a025a82a77873142ac3e97f4
tree25709ba52ee06fccf4bfbfbf2897bb8cf86da828
parenta490faceed145fdccad43e46ca4135dc09253bcc
parentb83a87ec228baba9801ba7ec9e671b2d4611de4c
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
include/linux/mm_types.h
kernel/fork.c
mm/huge_memory.c
mm/page_alloc.c
net/ipv4/udp.c