Merge ra.kernel.org:/pub/scm/linux/kernel/git/netdev/net

Browse source

Bug fixes overlapping feature additions and refactoring, mostly.

Signed-off-by: David S. Miller <davem@davemloft.net>

...

This commit is contained in:

David S. Miller 2021-06-07 13:01:52 -07:00

parent 9977d6f56b 3822d0670c

commit 126285651b

102 changed files with 994 additions and 560 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

10

MAINTAINERS

View file

23

drivers/bluetooth/btusb.c

View file

2

drivers/net/ethernet/chelsio/cxgb4/cxgb4.h

View file

4

drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c

View file

14

drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c

View file

9

drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_mqprio.c

View file

6

drivers/net/ethernet/chelsio/cxgb4/sge.c

View file

7

drivers/net/ethernet/intel/i40e/i40e_txrx.c

View file

8

drivers/net/ethernet/intel/i40e/i40e_xsk.c

View file

8

drivers/net/ethernet/intel/ice/ice.h

View file

51

drivers/net/ethernet/intel/ice/ice_ethtool.c

View file

1

drivers/net/ethernet/intel/ice/ice_hw_autogen.h

View file

12

drivers/net/ethernet/intel/ice/ice_lib.c

View file

17

drivers/net/ethernet/intel/ice/ice_txrx.c

View file

19

drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c

View file

11

drivers/net/ethernet/intel/ice/ice_xsk.c

View file

2

drivers/net/ethernet/intel/igb/igb.h

View file

53

drivers/net/ethernet/intel/igb/igb_main.c

View file

23

drivers/net/ethernet/intel/igb/igb_ptp.c

View file

12

drivers/net/ethernet/intel/igc/igc_main.c

View file

14

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

View file

14

drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c

View file

3

drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c

View file

12

drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c

View file

77

drivers/net/ethernet/mellanox/mlx5/core/en_main.c

View file

9

drivers/net/ethernet/mellanox/mlx5/core/en_tc.c

View file

1

drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c

View file

3

drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c

View file

2

drivers/net/ethernet/mellanox/mlx5/core/lib/fs_chains.c

View file

5

drivers/net/ethernet/mellanox/mlx5/core/lib/fs_chains.h

View file

3

drivers/net/ethernet/mellanox/mlx5/core/steering/dr_fw.c

View file

1

drivers/net/ethernet/myricom/myri10ge/myri10ge.c

View file

5

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c

View file

4

drivers/net/ieee802154/mrf24j40.c

View file

3

drivers/net/virtio_net.c

View file

3

drivers/net/wireguard/Makefile

View file

175

drivers/net/wireguard/allowedips.c

View file

14

drivers/net/wireguard/allowedips.h

View file

17

drivers/net/wireguard/main.c

View file

27

drivers/net/wireguard/peer.c

View file

3

drivers/net/wireguard/peer.h

View file

157

drivers/net/wireguard/selftest/allowedips.c

View file

2

drivers/net/wireguard/socket.c

View file

26

drivers/net/wireless/mediatek/mt76/mac80211.c

View file

1

drivers/net/wireless/mediatek/mt76/mt7615/init.c

View file

1

drivers/net/wireless/mediatek/mt76/mt7615/mac.c

View file

19

drivers/net/wireless/mediatek/mt76/mt7615/sdio_mcu.c

View file

3

drivers/net/wireless/mediatek/mt76/mt7615/usb_mcu.c

View file

4

drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c

View file

75

drivers/net/wireless/mediatek/mt76/mt76x0/pci.c

View file

4

drivers/net/wireless/mediatek/mt76/mt7921/init.c

View file

1

drivers/net/wireless/mediatek/mt76/mt7921/mac.c

View file

3

drivers/net/wireless/mediatek/mt76/mt7921/main.c

View file

17

drivers/net/wireless/mediatek/mt76/mt7921/mcu.c

View file

1

include/linux/avf/virtchnl.h

View file

2

include/linux/mlx5/mlx5_ifc.h

View file

2

include/net/caif/caif_dev.h

View file

2

include/net/caif/cfcnfg.h

View file

1

include/net/caif/cfserl.h

View file

6

include/net/netfilter/nf_tables.h

View file

10

include/net/tls.h

View file

2

include/uapi/linux/virtio_ids.h

View file

7

kernel/bpf/helpers.c

View file

28

kernel/trace/bpf_trace.c

View file

7

net/bluetooth/hci_core.c

View file

4

net/bluetooth/hci_sock.c

View file

13

net/caif/caif_dev.c

View file

14

net/caif/caif_usb.c

View file

16

net/caif/cfcnfg.c

View file

5

net/caif/cfserl.c

View file

2

net/compat.c

View file

8

net/core/devlink.c

View file

2

net/core/fib_rules.c

View file

4

net/core/rtnetlink.c

View file

16

net/core/sock.c

View file

2

net/dsa/tag_8021q.c

View file

10

net/ieee802154/nl-mac.c

View file

4

net/ieee802154/nl-phy.c

View file

9

net/ieee802154/nl802154.c

View file

5

net/ipv4/ipconfig.c

View file

8

net/ipv6/route.c

View file

3

net/ipv6/sit.c

View file

5

net/kcm/kcmsock.c

View file

16

net/mptcp/protocol.c

View file

63

net/mptcp/subflow.c

View file

2

net/netfilter/ipvs/ip_vs_ctl.c

View file

2

net/netfilter/nf_conntrack_proto.c

View file

82

net/netfilter/nf_tables_api.c

View file

6

net/netfilter/nfnetlink_cthelper.c

View file

2

net/netfilter/nft_ct.c

View file

2

net/nfc/llcp_sock.c

View file

10

net/sched/act_ct.c

View file

4

net/sched/sch_htb.c

View file

62

net/tls/tls_device.c

View file

7

net/tls/tls_device_fallback.c

View file

1

net/tls/tls_main.c

View file

2

net/x25/af_x25.c

View file

2

scripts/Makefile.modfinal

View file

2

scripts/link-vmlinux.sh

View file

7

tools/testing/selftests/net/mptcp/mptcp_connect.sh

View file

Some files were not shown because too many files have changed in this diff Show more