Linus Torvalds 8c3fc1643d Merge branch 'libnvdimm-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm ... Pull libnvdimm fixes from Dan Williams: "A couple of compile fixes. With the removal of the ->direct_access() method from block_device_operations in favor of a new dax_device + dax_operations we broke two configurations. The CONFIG_BLOCK=n case is fixed by compiling out the block+dax helpers in the dax core. Configurations with FS_DAX=n EXT4=y / XFS=y and DAX=m fail due to the helpers the builtin filesystem needs being in a module, so we stub out the helpers in the FS_DAX=n case." * 'libnvdimm-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm: dax, xfs, ext4: compile out iomap-dax paths in the FS_DAX=n case dax: fix false CONFIG_BLOCK dependency		2017-05-19 17:35:34 -07:00
..
acpi	More ACPI updates for v4.12-rc1	2017-05-10 09:35:42 -07:00
asm-generic	Kbuild UAPI header export updates for v4.12	2017-05-10 20:45:36 -07:00
clocksource	clocksource: arm_arch_timer: add structs to describe MMIO timer	2017-04-19 16:11:48 +01:00
crypto	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security	2017-05-03 08:50:52 -07:00
drm	mm, vmalloc: use __GFP_HIGHMEM implicitly	2017-05-08 17:15:13 -07:00
dt-bindings	Sort of on the quieter side this time, which is probably due more	2017-05-10 13:38:18 -07:00
keys
kvm	KVM: arm/arm64: Fix bug when registering redist iodevs	2017-05-18 11:18:12 +02:00
linux	Merge branch 'libnvdimm-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm	2017-05-19 17:35:34 -07:00
math-emu
media	[media] cec.h: merge cec-edid.h into cec.h	2017-04-19 06:53:18 -03:00
memory
misc
net	net: x25: fix one potential use-after-free issue	2017-05-18 10:05:40 -04:00
pcmcia
ras
rdma	smc_diag.h: fix include from userland	2017-05-11 00:18:39 +09:00
rxrpc
scsi	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending	2017-05-12 11:44:13 -07:00
soc	powerpc updates for 4.12 part 2	2017-05-12 10:04:09 -07:00
sound	ASoC: Updates for v4.12	2017-05-02 08:25:25 +02:00
target	target/user: PGR Support	2017-05-01 22:21:45 -07:00
trace	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux	2017-05-12 11:58:45 -07:00
uapi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-05-15 15:50:49 -07:00
video	uapi: export all headers under uapi directories	2017-05-11 00:21:54 +09:00
xen	xen: Implement EFI reset_system callback	2017-05-02 12:06:50 +02:00