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

..

acpi

ACPI: NUMA: add missing include in acpi_numa.h

2017-07-24 22:27:43 +02:00

asm-generic

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

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

clocksource

…

crypto

crypto: engine - replace pr_xxx by dev_xxx

2017-06-19 14:19:54 +08:00

drm

Merge tag 'drm-fixes-for-v4.13-rc1' of git://people.freedesktop.org/~airlied/linux

2017-07-13 11:26:18 -07:00

dt-bindings

Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

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

keys

…

kvm

KVM: arm/arm64: PMU: Fix overflow interrupt injection

2017-07-25 14:18:01 +01:00

linux

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

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

math-emu

…

media

media: platform: davinci: drop VPFE_CMD_S_CCDC_RAW_PARAMS

2017-07-26 06:14:33 -04:00

memory

…

misc

cxl: Export library to support IBM XSL

2017-07-03 23:07:03 +10:00

net

tcp: introduce tcp_rto_delta_us() helper for xmit timer fix

2017-08-03 15:38:30 -07:00

pcmcia

…

ras

trace, ras: add ARM processor error trace event

2017-06-22 18:22:05 +01:00

rdma

IB/cma: Fix reference count leak when no ipv4 addresses are set

2017-07-20 11:24:13 -04:00

rxrpc

rxrpc: Implement service upgrade

2017-06-05 14:30:49 +01:00

scsi

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending

2017-07-13 14:27:32 -07:00

soc

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

2017-07-05 12:31:59 -07:00

sound

ASoC: fix pcm-creation regression

2017-07-17 15:50:32 +01:00

target

iscsi-target: Add login_keys_workaround attribute for non RFC initiators

2017-07-11 10:56:39 -07:00

trace

ext4: remove unused metadata accounting variables

2017-07-30 22:30:11 -04:00

uapi

drm/msm: Remove __user from __u64 data types

2017-08-01 19:11:48 -04:00

video

Merge tag 'imx-drm-next-2017-06-08' of git://git.pengutronix.de/git/pza/linux into drm-next

2017-06-16 10:05:38 +10:00

xen

xen/balloon: don't online new memory initially

2017-07-23 08:13:18 +02:00