Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Merge in the fixes we had queued in case there was another -rc.
Signed-off-by: 
Jakub Kicinski <kuba@kernel.org>
No related branches found
No related tags found
Showing
- drivers/net/ethernet/amd/xgbe/xgbe-common.h 8 additions, 0 deletionsdrivers/net/ethernet/amd/xgbe/xgbe-common.h
- drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c 19 additions, 1 deletiondrivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c
- drivers/net/ethernet/ibm/ibmvnic.c 12 additions, 9 deletionsdrivers/net/ethernet/ibm/ibmvnic.c
- drivers/net/ethernet/netronome/nfp/nfp_net_common.c 2 additions, 6 deletionsdrivers/net/ethernet/netronome/nfp/nfp_net_common.c
- drivers/net/phy/phylink.c 1 addition, 1 deletiondrivers/net/phy/phylink.c
- include/net/flow_dissector.h 1 addition, 0 deletionsinclude/net/flow_dissector.h
- include/net/sctp/sctp.h 3 additions, 4 deletionsinclude/net/sctp/sctp.h
- net/bridge/br_private.h 2 additions, 0 deletionsnet/bridge/br_private.h
- net/core/flow_dissector.c 15 additions, 0 deletionsnet/core/flow_dissector.c
- net/ipv6/udp.c 1 addition, 1 deletionnet/ipv6/udp.c
- net/sched/cls_flower.c 2 additions, 1 deletionnet/sched/cls_flower.c
- net/sctp/output.c 8 additions, 5 deletionsnet/sctp/output.c
- net/sctp/transport.c 6 additions, 5 deletionsnet/sctp/transport.c
- tools/testing/selftests/net/.gitignore 5 additions, 0 deletionstools/testing/selftests/net/.gitignore
- tools/testing/selftests/net/Makefile 2 additions, 0 deletionstools/testing/selftests/net/Makefile
- tools/testing/selftests/net/cmsg_so_mark.c 67 additions, 0 deletionstools/testing/selftests/net/cmsg_so_mark.c
- tools/testing/selftests/net/cmsg_so_mark.sh 61 additions, 0 deletionstools/testing/selftests/net/cmsg_so_mark.sh
- tools/testing/selftests/net/forwarding/bridge_igmp.sh 9 additions, 3 deletionstools/testing/selftests/net/forwarding/bridge_igmp.sh
- tools/testing/selftests/net/forwarding/bridge_mld.sh 9 additions, 3 deletionstools/testing/selftests/net/forwarding/bridge_mld.sh
Loading
Please register or sign in to comment