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
..
acpi	ACPICA: Update version to 20180105	2018-02-06 10:32:13 +01:00
asm-generic	bug.h: work around GCC PR82365 in BUG()	2018-02-21 15:35:43 -08:00
clocksource
crypto	Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2018-01-31 14:22:45 -08:00
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 changes for 4.16	2018-02-10 13:16:35 -08:00
linux	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-03-06 01:20:46 -05: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-03-06 01:20:46 -05:00
pcmcia
ras
rdma	IB/uverbs: Use u64_to_user_ptr() not a union	2018-02-15 14:59:45 -07:00
scsi	SCSI postmerge on 20180202	2018-02-03 13:07:56 -08: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 branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2018-02-14 17:02:15 -08:00
uapi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-03-06 01:20:46 -05:00
video	fbdev changes for v4.16:	2018-02-07 13:10:43 -08:00
xen