David S. Miller 5b79c2af66 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Lots of easy overlapping changes in the confict resolutions here. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-05-26 19:46:15 -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	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-05-26 19:46:15 -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	uapi: Fix SPDX tags for files referring to the 'OpenIB.org' license	2018-04-23 11:10:33 -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