David S. Miller c0b458a946 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Minor conflicts in drivers/net/ethernet/mellanox/mlx5/core/en_rep.c, we had some overlapping changes: 1) In 'net' MLX5E_PARAMS_LOG_{SQ,RQ}_SIZE --> MLX5E_REP_PARAMS_LOG_{SQ,RQ}_SIZE 2) In 'net-next' params->log_rq_size is renamed to be params->log_rq_mtu_frames. 3) In 'net-next' params->hard_mtu is added. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-04-01 19:49:34 -04:00
..
asm-generic	signal: Correct the offset of si_pkey in struct siginfo	2018-03-06 00:22:36 -06: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-04-01 19:49:34 -04:00
misc	ocxl: Add get_metadata IOCTL to share OCXL information to userspace	2018-03-02 13:02:14 +11:00
mtd
rdma	IB/uverbs: Use __aligned_u64 for uapi headers	2018-02-15 14:59:45 -07:00
scsi
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
xen