]> 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: ce07183 1bf4b12)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Sun, 16 Apr 2017 01:16:30 +0000 (21:16 -0400)
committerDavid S. Miller <davem@davemloft.net>
Sun, 16 Apr 2017 01:16:30 +0000 (21:16 -0400)
commit6b6cbc1471676402565e958674523d06213b82d7
treea66d41d276e5eb400e27641f24f34032fe1b9275tree
parentce07183282975026716107d36fd3f5f93de76668commit | diff
parent1bf4b1268e66d9364fc6fd41f906bc01458530accommit | diff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts were simply overlapping changes.  In the net/ipv4/route.c
case the code had simply moved around a little bit and the same fix
was made in both 'net' and 'net-next'.

In the net/sched/sch_generic.c case a fix in 'net' happened at
the same time that a new argument was added to qdisc_hash_add().

Signed-off-by: David S. Miller <davem@davemloft.net>
23 files changed:
MAINTAINERS diff1 | diff2 | blob | history
drivers/net/team/team.c diff1 | diff2 | blob | history
drivers/net/usb/qmi_wwan.c diff1 | diff2 | blob | history
drivers/net/usb/usbnet.c diff1 | diff2 | blob | history
drivers/net/virtio_net.c diff1 | diff2 | blob | history
fs/cifs/cifsfs.c diff1 | diff2 | blob | history
fs/cifs/connect.c diff1 | diff2 | blob | history
fs/cifs/smb2pdu.c diff1 | diff2 | blob | history
kernel/audit.c diff1 | diff2 | blob | history
net/bridge/br_if.c diff1 | diff2 | blob | history
net/bridge/br_netlink.c diff1 | diff2 | blob | history
net/core/datagram.c diff1 | diff2 | blob | history
net/core/dev.c diff1 | diff2 | blob | history
net/ipv4/netfilter/ipt_CLUSTERIP.c diff1 | diff2 | blob | history
net/ipv4/tcp.c diff1 | diff2 | blob | history
net/ipv4/tcp_input.c diff1 | diff2 | blob | history
net/ipv4/tcp_output.c diff1 | diff2 | blob | history
net/ipv6/addrconf.c diff1 | diff2 | blob | history
net/netfilter/nf_conntrack_expect.c diff1 | diff2 | blob | history
net/netfilter/nf_conntrack_netlink.c diff1 | diff2 | blob | history
net/netfilter/nft_hash.c diff1 | diff2 | blob | history
net/sched/sch_generic.c diff1 | diff2 | blob | history
net/sctp/socket.c diff1 | diff2 | blob | history
Ubuntu Artful kernel mirror