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

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm64/Kconfig
Simple merge

diff --cc drivers/net/dsa/sja1105/sja1105_main.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bcmsysport.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnxt/bnxt.c
Simple merge

diff --cc drivers/net/ethernet/cadence/macb_main.c
Simple merge

diff --cc drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
Simple merge

diff --cc drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_matchall.c
Simple merge

diff --cc drivers/net/ethernet/hisilicon/hns/hns_enet.c
Simple merge

diff --cc drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
Simple merge

diff --cc drivers/net/ethernet/intel/e1000e/netdev.c
Simple merge

diff --cc drivers/net/ethernet/intel/iavf/iavf_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/igb/igb_ethtool.c
Simple merge

diff --cc drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
Simple merge

diff --cc drivers/net/ethernet/marvell/mvneta.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlxsw/spectrum.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlxsw/spectrum_qdisc.c
Simple merge

diff --cc drivers/net/ethernet/renesas/sh_eth.c
Simple merge

diff --cc drivers/net/ethernet/stmicro/stmmac/stmmac_selftests.c
Simple merge

diff --cc drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c
Simple merge

diff --cc drivers/net/macvlan.c
Simple merge

diff --cc drivers/net/netdevsim/dev.c
Simple merge

diff --cc drivers/net/phy/Kconfig
Simple merge

diff --cc drivers/net/phy/dp83867.c
index adda0d0eab8001d10fa1b06a9b9ebc7f3d69dad0,01cf71358359a2bd4fea0d3ba0826d7017a64897..967f57ed0b65e45f405541c934591af0aac7b8db
--- 1/drivers/net/phy/dp83867.c
--- 2/drivers/net/phy/dp83867.c
+++ b/drivers/net/phy/dp83867.c
@@@ -93,12 -93,11 +93,13 @@@
  #define DP83867_STRAP_STS2_CLK_SKEW_NONE      BIT(2)
  
  /* PHY CTRL bits */
 -#define DP83867_PHYCR_FIFO_DEPTH_SHIFT                14
 +#define DP83867_PHYCR_TX_FIFO_DEPTH_SHIFT     14
 +#define DP83867_PHYCR_RX_FIFO_DEPTH_SHIFT     12
  #define DP83867_PHYCR_FIFO_DEPTH_MAX          0x03
 -#define DP83867_PHYCR_FIFO_DEPTH_MASK         GENMASK(15, 14)
 +#define DP83867_PHYCR_TX_FIFO_DEPTH_MASK      GENMASK(15, 14)
 +#define DP83867_PHYCR_RX_FIFO_DEPTH_MASK      GENMASK(13, 12)
  #define DP83867_PHYCR_RESERVED_MASK           BIT(11)
+ #define DP83867_PHYCR_FORCE_LINK_GOOD         BIT(10)
  
  /* RGMIIDCTL bits */
  #define DP83867_RGMII_TX_CLK_DELAY_MAX                0xf

diff --cc drivers/net/usb/lan78xx.c
Simple merge

diff --cc drivers/net/usb/r8152.c
Simple merge

diff --cc drivers/net/wan/fsl_ucc_hdlc.c
Simple merge

diff --cc drivers/ptp/ptp_clock.c
Simple merge

diff --cc include/net/devlink.h
Simple merge

diff --cc include/net/tcp.h
Simple merge

diff --cc net/batman-adv/distributed-arp-table.c
index 906011b60d66b29d4142c04acd7b0a71afbab284,ec7bf5a4a9fc724b63da7bfd7ece79f32b104d99..3d21dd83f8cccb117b9ceb8ba81a5d16d842fe06
--- 1/net/batman-adv/distributed-arp-table.c
--- 2/net/batman-adv/distributed-arp-table.c
+++ b/net/batman-adv/distributed-arp-table.c
@@@ -287,9 -285,10 +287,10 @@@ static u32 batadv_hash_dat(const void *
        u32 hash = 0;
        const struct batadv_dat_entry *dat = data;
        const unsigned char *key;
+       __be16 vid;
        u32 i;
  
 -      key = (const unsigned char *)&dat->ip;
 +      key = (__force const unsigned char *)&dat->ip;
        for (i = 0; i < sizeof(dat->ip); i++) {
                hash += key[i];
                hash += (hash << 10);

diff --cc net/core/dev.c
Simple merge

diff --cc net/core/devlink.c
Simple merge

diff --cc net/core/filter.c
Simple merge

diff --cc net/ipv4/fib_trie.c
Simple merge

diff --cc net/ipv4/tcp_input.c
Simple merge

diff --cc net/netfilter/nft_tunnel.c
Simple merge

diff --cc net/wireless/nl80211.c
Simple merge