David S. Miller fb796707d7 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Both conflict were simple overlapping changes. In the kaweth case, Eric Dumazet's skb_cow() bug fix overlapped the conversion of the driver in net-next to use in-netdev stats. Signed-off-by: David S. Miller <davem@davemloft.net>		2017-04-21 20:23:53 -07:00
..
asm	s390/mm: fix CMMA vs KSM vs others	2017-04-12 07:40:24 +02:00
uapi/asm	New getsockopt option to get socket cookie	2017-04-08 08:07:01 -07:00