projects / platform / kernel / linux-rpi.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: feca7d8 48fb6f4)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Wed, 9 Aug 2017 23:28:45 +0000 (16:28 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 9 Aug 2017 23:28:45 +0000 (16:28 -0700)
commit3118e6e19da7b8d76b2456b880c74a9aa3a2268b
tree3060d11297c1195ef2d1f120d9c2247b4b1de4aetree | snapshot
parentfeca7d8c135bc1527b244fe817b8b6498066cceccommit | diff
parent48fb6f4db940e92cfb16cd878cddd59ea6120d06commit | diff
Merge git://git./linux/kernel/git/davem/net

The UDP offload conflict is dealt with by simply taking what is
in net-next where we have removed all of the UFO handling code
entirely.

The TCP conflict was a case of local variables in a function
being removed from both net and net-next.

In netvsc we had an assignment right next to where a missing
set of u64 stats sync object inits were added.

Signed-off-by: David S. Miller <davem@davemloft.net>
18 files changed:
MAINTAINERS diff1 | diff2 | blob | history
drivers/net/dsa/mt7530.c diff1 | diff2 | blob | history
drivers/net/ethernet/ibm/ibmvnic.c diff1 | diff2 | blob | history
drivers/net/ethernet/intel/i40e/i40e_txrx.c diff1 | diff2 | blob | history
drivers/net/ethernet/netronome/nfp/nfp_net_common.c diff1 | diff2 | blob | history
drivers/net/ethernet/qlogic/qed/qed_mcp.c diff1 | diff2 | blob | history
drivers/net/hyperv/hyperv_net.h diff1 | diff2 | blob | history
drivers/net/hyperv/netvsc.c diff1 | diff2 | blob | history
drivers/net/hyperv/rndis_filter.c diff1 | diff2 | blob | history
drivers/net/ipvlan/ipvlan_main.c diff1 | diff2 | blob | history
drivers/net/vxlan.c diff1 | diff2 | blob | history
include/net/tcp.h diff1 | diff2 | blob | history
net/core/dev.c diff1 | diff2 | blob | history
net/ipv4/tcp_input.c diff1 | diff2 | blob | history
net/ipv4/tcp_output.c diff1 | diff2 | blob | history
net/ipv4/tcp_timer.c diff1 | diff2 | blob | history
net/ipv6/route.c diff1 | diff2 | blob | history
tools/testing/selftests/bpf/test_verifier.c diff1 | diff2 | blob | history
Domain: System / Kernel;