]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1294953 146b1d4)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Sat, 22 Apr 2017 03:23:53 +0000 (20:23 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sat, 22 Apr 2017 03:23:53 +0000 (20:23 -0700)
commit023b305e0f1836b636b10b0e1ef021d4e1dd43cd
treeb8c12edf3f510170cece6e9cf5337094af3095f2tree | snapshot
parent12949538e148facd65490752fa22974a9d1a64e5commit | diff
parent146b1d42090c6fc758ac7e760260b74cb4e35a33commit | diff
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>
13 files changed:
MAINTAINERS diff1 | diff2 | blob | history
drivers/net/ethernet/qlogic/qed/qed_dcbx.c diff1 | diff2 | blob | history
drivers/net/usb/kaweth.c diff1 | diff2 | blob | history
drivers/net/usb/lan78xx.c diff1 | diff2 | blob | history
drivers/net/usb/smsc75xx.c diff1 | diff2 | blob | history
drivers/net/usb/smsc95xx.c diff1 | diff2 | blob | history
drivers/net/usb/sr9700.c diff1 | diff2 | blob | history
net/ipv6/ip6mr.c diff1 | diff2 | blob | history
net/ipv6/route.c diff1 | diff2 | blob | history
net/key/af_key.c diff1 | diff2 | blob | history
net/mac80211/rx.c diff1 | diff2 | blob | history
net/qrtr/qrtr.c diff1 | diff2 | blob | history
net/sched/act_api.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.