]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6c7fb3b 2e83792)
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)
commit21ca4df7529432be558dfbf3986e09e642d07d4a
tree57fd8b5b0e9c04f24f5f9ec70ceb0a706cecfb47tree | snapshot
parent6c7fb3b21006eb7fe5b6f0d04ec91ae5604c1b73commit | diff
parent2e83792e4b84e148e2d942bac995bd9f5998d8fbcommit | 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.