]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6cc1dee 8355ab6)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Thu, 10 Aug 2017 19:11:16 +0000 (12:11 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 10 Aug 2017 19:11:16 +0000 (12:11 -0700)
commitc8b1e07832346e6627cd0ff287eeb11823111e34
tree57fd8b5b0e9c04f24f5f9ec70ceb0a706cecfb47tree | snapshot
parent6cc1dee52abb515cad5b7ea98c4d5906bd227c20commit | diff
parent8355ab693ffc8a7bc34a77f1ba5541f1f7faad95commit | diff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Mainline had UFO fixes, but UFO is removed in net-next so we
take the HEAD hunks.

Minor context conflict in bcmsysport statistics bug fix.

Signed-off-by: David S. Miller <davem@davemloft.net>
MAINTAINERS diff1 | diff2 | blob | history
drivers/net/ethernet/broadcom/bcmsysport.c diff1 | diff2 | blob | history
drivers/net/geneve.c diff1 | diff2 | blob | history
net/ipv4/af_inet.c diff1 | diff2 | blob | history
net/ipv4/igmp.c diff1 | diff2 | blob | history
net/ipv4/udp.c diff1 | diff2 | blob | history
net/packet/af_packet.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.