David S. Miller 89b1698c93 Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net ... The BTF conflicts were simple overlapping changes. The virtio_net conflict was an overlap of a fix of statistics counter, happening alongisde a move over to a bonafide statistics structure rather than counting value on the stack. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-08-02 10:55:32 -07:00
..
asm-generic	net: Add a new socket option for a future transmit time.	2018-07-04 22:30:27 +09:00
drm	drm/tegra: Changes for v4.18-rc1	2018-05-22 10:45:43 +10:00
linux	Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net	2018-08-02 10:55:32 -07:00
misc	ocxl: Add an IOCTL so userspace knows what OCXL features are available	2018-06-03 20:40:32 +10:00
mtd
rdma	Verbs flow counters support	2018-06-04 08:48:11 -06:00
scsi
sound	ASoC: Updates for v4.18	2018-06-05 16:51:55 +02:00
video
xen