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

..

alpha

tty: Fix TIOCGPTPEER ioctl definition

2017-07-17 17:04:41 +02:00

arc

locking/atomic: Fix atomic_set_release() for 'funny' architectures

2017-08-10 12:28:54 +02:00

arm

mm: fix MADV_[FREE|DONTNEED] TLB flush miss problem

2017-08-10 15:54:07 -07:00

arm64

locking: Remove smp_mb__before_spinlock()

2017-08-10 12:29:03 +02:00

blackfin

Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2017-07-21 10:41:19 -07:00

c6x

Merge branch 'work.uaccess-unaligned' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2017-07-15 11:17:52 -07:00

cris

Merge tag 'kbuild-v4.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild

2017-07-13 13:37:57 -07:00

frv

FRV: tlbflush: move asmlinkage before return type

2017-07-12 16:26:04 -07:00

h8300

h8300: Add missing closing parenthesis in flat_get_addr_from_rp()

2017-07-16 09:24:06 -07:00

hexagon

locking/atomic: Fix atomic_set_release() for 'funny' architectures

2017-08-10 12:28:54 +02:00

ia64

mm: fix MADV_[FREE|DONTNEED] TLB flush miss problem

2017-08-10 15:54:07 -07:00

m32r

Merge branch 'work.uaccess-unaligned' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2017-07-15 11:17:52 -07:00

m68k

blackfin, m68k: Fix flat_set_persistent() for unsigned long to u32 changes

2017-07-16 09:24:06 -07:00

metag

locking/atomic: Fix atomic_set_release() for 'funny' architectures

2017-08-10 12:28:54 +02:00

microblaze

Merge branch 'work.uaccess-unaligned' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2017-07-15 11:17:52 -07:00

mips

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2017-08-09 10:14:04 -07:00

mn10300

Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2017-07-21 10:41:19 -07:00

nios2

nios2: move generic-y of exported headers to uapi/asm/Kbuild

2017-07-11 21:33:43 +09:00

openrisc

openrisc: move generic-y of exported headers to uapi/asm/Kbuild

2017-07-11 21:33:50 +09:00

parisc

locking/atomic: Fix atomic_set_release() for 'funny' architectures

2017-08-10 12:28:54 +02:00

powerpc

locking: Remove smp_mb__before_spinlock()

2017-08-10 12:29:03 +02:00

s390

mm: fix MADV_[FREE|DONTNEED] TLB flush miss problem

2017-08-10 15:54:07 -07:00

score

Merge branch 'uaccess.strlen' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2017-07-06 22:07:44 -07:00

sh

mm: fix MADV_[FREE|DONTNEED] TLB flush miss problem

2017-08-10 15:54:07 -07:00

sparc

Merge branch 'linus' into locking/core, to resolve conflicts

2017-08-11 13:51:59 +02:00

tile

locking/atomic: Fix atomic_set_release() for 'funny' architectures

2017-08-10 12:28:54 +02:00

um

mm: fix MADV_[FREE|DONTNEED] TLB flush miss problem

2017-08-10 15:54:07 -07:00

unicore32

unicore32: move generic-y of exported headers to uapi/asm/Kbuild

2017-07-11 21:33:52 +09:00

x86

Merge branch 'linus' into locking/core, to pick up fixes

2017-08-10 12:20:53 +02:00

xtensa

Merge tag 'xtensa-20170807' of git://github.com/jcmvbkbc/linux-xtensa

2017-08-07 18:58:10 -07:00

.gitignore

…

Kconfig

include/linux/string.h: add the option of fortified string.h functions

2017-07-12 16:26:03 -07:00