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	Revert "MIPS: BCM47XX: Enable 74K Core ExternalSync for PCIe erratum"	2018-07-27 10:07:32 -07:00
uapi/asm	net: Add a new socket option for a future transmit time.	2018-07-04 22:30:27 +09:00