Doug Ledford f5e27a203f Merge branch 'k.o/for-rc' into k.o/wip/dl-for-next ... Several items of conflict have arisen between the RDMA stack's for-rc branch and upcoming for-next work: 9fd4350ba8 ("IB/rxe: avoid double kfree_skb") directly conflicts with 2e47350789 ("IB/rxe: optimize the function duplicate_request") Patches already submitted by Intel for the hfi1 driver will fail to apply cleanly without this merge Other people on the mailing list have notified that their upcoming patches also fail to apply cleanly without this merge Signed-off-by: Doug Ledford <dledford@redhat.com>		2018-05-09 15:48:48 -04:00
..
asm-generic	Merge branch 'parisc-4.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux	2018-04-12 17:07:04 -07:00
drm	Linux 4.16-rc7	2018-03-28 14:30:41 +10:00
linux	uapi: Fix SPDX tags for files referring to the 'OpenIB.org' license	2018-04-23 11:10:33 -04:00
misc	ocxl: Add get_metadata IOCTL to share OCXL information to userspace	2018-03-02 13:02:14 +11:00
mtd	License cleanup: add SPDX license identifier to uapi header files with a license	2017-11-02 11:20:11 +01:00
rdma	Merge branch 'k.o/for-rc' into k.o/wip/dl-for-next	2018-05-09 15:48:48 -04:00
scsi	License cleanup: add SPDX license identifier to uapi header files with a license	2017-11-02 11:20:11 +01:00
sound	ASoC: soc-generic-dmaengine-pcm: Fix sparse warnings	2018-02-26 11:05:12 +00:00
video	License cleanup: add SPDX license identifier to uapi header files with a license	2017-11-02 11:20:11 +01:00
xen	License cleanup: add SPDX license identifier to uapi header files with a license	2017-11-02 11:20:11 +01:00