James Bottomley 2e1f44f6ad Merge branch 'fixes' into misc ... Somewhat nasty merge due to conflicts between "33b28357dd00 scsi: qla2xxx: Fix Async GPN_FT for FCP and FC-NVMe scan" and "2b5b96473efc scsi: qla2xxx: Fix FC-NVMe LUN discovery" Merge is non-trivial and has been verified by Qlogic (Cavium) Signed-off-by: James E.J. Bottomley <jejb@linux.vnet.ibm.com>		2018-04-03 17:38:39 -07:00
..
acpi
asm-generic	RISC-V changes for 4.16	2018-02-07 11:33:08 -08:00
clocksource
crypto
drm
dt-bindings	MIPS changes for 4.16	2018-02-07 11:22:44 -08:00
keys
kvm	KVM changes for 4.16	2018-02-10 13:16:35 -08:00
linux	scsi: raid_class: Add 'JBOD' RAID level	2018-02-12 11:43:25 -05:00
math-emu
media	vfs: do bulk POLL* -> EPOLL* replacement	2018-02-11 14:34:03 -08:00
memory
misc
net	vfs: do bulk POLL* -> EPOLL* replacement	2018-02-11 14:34:03 -08:00
pcmcia
ras
rdma
scsi	Merge branch 'fixes' into misc	2018-04-03 17:38:39 -07:00
soc
sound	ASoC: Updates for v4.16	2018-02-07 12:11:09 -08:00
target
trace
uapi	unify {de,}mangle_poll(), get rid of kernel-side POLL...	2018-02-11 14:37:22 -08:00
video	fbdev changes for v4.16:	2018-02-07 13:10:43 -08:00
xen