David S. Miller 0f3e9c97eb Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... All of the conflicts were cases of overlapping changes. In net/core/devlink.c, we have to make care that the resouce size_params have become a struct member rather than a pointer to such an object. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-03-06 01:20:46 -05:00
..
asm-generic	unify {de,}mangle_poll(), get rid of kernel-side POLL...	2018-02-11 14:37:22 -08:00
drm	virtio-gpu: fix ioctl and expose the fixed status to userspace.	2018-02-27 08:37:58 +01:00
linux	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-03-06 01:20:46 -05:00
misc	ocxl: Add AFU interrupt support	2018-01-24 11:42:58 +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	IB/uverbs: Use __aligned_u64 for uapi headers	2018-02-15 14:59:45 -07:00
scsi	License cleanup: add SPDX license identifier to uapi header files with a license	2017-11-02 11:20:11 +01:00
sound	Merge remote-tracking branches 'asoc/topic/fsl', 'asoc/topic/fsl-ssi', 'asoc/topic/fsl_asrc' and 'asoc/topic/hdac_hdmi' into asoc-next	2018-01-18 11:55:56 +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