Minor conflict with the DSA legacy code removal.
Signed-off-by:
David S. Miller <davem@davemloft.net>
Showing
- Documentation/devicetree/bindings/net/ethernet.txt 1 addition, 1 deletionDocumentation/devicetree/bindings/net/ethernet.txt
- arch/x86/net/bpf_jit_comp32.c 172 additions, 64 deletionsarch/x86/net/bpf_jit_comp32.c
- drivers/isdn/gigaset/bas-gigaset.c 5 additions, 4 deletionsdrivers/isdn/gigaset/bas-gigaset.c
- drivers/net/ethernet/amazon/ena/ena_com.c 8 additions, 3 deletionsdrivers/net/ethernet/amazon/ena/ena_com.c
- drivers/net/ethernet/amazon/ena/ena_ethtool.c 2 additions, 2 deletionsdrivers/net/ethernet/amazon/ena/ena_ethtool.c
- drivers/net/ethernet/amazon/ena/ena_netdev.c 17 additions, 11 deletionsdrivers/net/ethernet/amazon/ena/ena_netdev.c
- drivers/net/ethernet/cadence/macb_main.c 3 additions, 3 deletionsdrivers/net/ethernet/cadence/macb_main.c
- drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c 12 additions, 3 deletionsdrivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
- drivers/net/ethernet/freescale/dpaa/dpaa_eth.c 1 addition, 1 deletiondrivers/net/ethernet/freescale/dpaa/dpaa_eth.c
- drivers/net/ethernet/freescale/ucc_geth_ethtool.c 3 additions, 5 deletionsdrivers/net/ethernet/freescale/ucc_geth_ethtool.c
- drivers/net/hyperv/netvsc.c 9 additions, 6 deletionsdrivers/net/hyperv/netvsc.c
- drivers/net/phy/phy_device.c 7 additions, 4 deletionsdrivers/net/phy/phy_device.c
- include/net/arp.h 8 additions, 0 deletionsinclude/net/arp.h
- include/net/ipv6_frag.h 0 additions, 1 deletioninclude/net/ipv6_frag.h
- net/core/neighbour.c 10 additions, 1 deletionnet/core/neighbour.c
- net/dsa/dsa.c 6 additions, 1 deletionnet/dsa/dsa.c
- net/ipv4/ipmr_base.c 1 addition, 2 deletionsnet/ipv4/ipmr_base.c
- net/ipv6/sit.c 1 addition, 1 deletionnet/ipv6/sit.c
- net/l2tp/l2tp_core.c 2 additions, 1 deletionnet/l2tp/l2tp_core.c
- net/rds/tcp.c 1 addition, 1 deletionnet/rds/tcp.c
Loading
Please register or sign in to comment