Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Minor comment conflict in mac80211.

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

diff --cc MAINTAINERS
Simple merge

diff --cc arch/riscv/Kconfig
Simple merge

diff --cc drivers/infiniband/hw/mlx5/main.c
Simple merge

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

diff --cc drivers/net/ethernet/realtek/r8169_main.c
index 7949ec6,791d99b..9971135
--- 1/drivers/net/ethernet/realtek/r8169_main.c
--- 2/drivers/net/ethernet/realtek/r8169_main.c
+++ b/drivers/net/ethernet/realtek/r8169_main.c
@@@ -5339,20 -5449,10 +5346,11 @@@ done
  static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
  {
        struct rtl8169_private *tp;
 +      int jumbo_max, region, rc;
 +      enum mac_version chipset;
        struct net_device *dev;
 -      int chipset, region;
 -      int jumbo_max, rc;
 +      u16 xid;
  
-       /* Some tools for creating an initramfs don't consider softdeps, then
-        * r8169.ko may be in initramfs, but realtek.ko not. Then the generic
-        * PHY driver is used that doesn't work with most chip versions.
-        */
-       if (!driver_find("RTL8201CP Ethernet", &mdio_bus_type)) {
-               dev_err(&pdev->dev, "realtek.ko not loaded, maybe it needs to be added to initramfs?\n");
-               return -ENOENT;
-       }
- 
        dev = devm_alloc_etherdev(&pdev->dev, sizeof (*tp));
        if (!dev)
                return -ENOMEM;

diff --cc include/linux/bpf.h
Simple merge

diff --cc include/linux/ieee80211.h
Simple merge

diff --cc kernel/bpf/btf.c
Simple merge

diff --cc kernel/bpf/syscall.c
Simple merge

diff --cc net/mac80211/debugfs_sta.c
Simple merge

diff --cc net/mac80211/key.c
Simple merge

diff --cc net/mac80211/sta_info.c
Simple merge

diff --cc net/mac80211/sta_info.h
Simple merge

diff --cc net/mac80211/tx.c
Simple merge

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

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

diff --cc net/xfrm/xfrm_policy.c
Simple merge