]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commit
projects / mirror_ubuntu-artful-kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1f4407e 94836ec)
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)
commitfb796707d7a6c9b24fdf80b9b4f24fa5ffcf0ec5
treeb8c12edf3f510170cece6e9cf5337094af3095f2tree
parent1f4407e2548827e3e6e7b943640a2da90c611306commit | diff
parent94836ecf1e7378b64d37624fbb81fe48fbd4c772commit | 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
Ubuntu Artful kernel mirror