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
..
acpi	ACPICA: Update version to 20180105	2018-02-06 10:32:13 +01:00
asm-generic	bpf: introduce BPF_RAW_TRACEPOINT	2018-03-28 22:55:19 +02:00
clocksource
crypto
drm	drm/nouveau: prefer XBGR2101010 for addfb ioctl	2018-02-23 13:51:42 +01:00
dt-bindings	net: phy: dp83867: Add binding for the CLK_OUT pin muxing option	2018-02-14 15:33:43 -05:00
keys
kvm	KVM: arm/arm64: Reset mapped IRQs on VM reset	2018-03-14 18:29:14 +00:00
linux	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-04-01 19:49:34 -04:00
math-emu
media	media: dvb: update buffer mmaped flags and frame counter	2018-02-23 11:44:08 -05:00
memory
misc	powerpc updates for 4.16	2018-02-02 10:01:04 -08:00
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-04-01 19:49:34 -04:00
pcmcia
ras
rdma	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-04-01 19:49:34 -04:00
scsi	SCSI fixes on 20180327	2018-03-27 14:11:46 -10:00
soc	ARC fixes for 4.16-rc4	2018-03-01 14:32:23 -08:00
sound	Merge branch 'topic/fixes' into for-linus	2018-02-12 09:36:26 +01:00
target
trace	Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next	2018-03-31 23:33:04 -04:00
uapi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-04-01 19:49:34 -04:00
video	fbdev changes for v4.16:	2018-02-07 13:10:43 -08:00
xen