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

drivers/ptp/Kconfig:
  55c8fca1dae1 ("ptp_pch: Restore dependency on PCI")
  e5f31552674e ("ethernet: fix PTP_1588_CLOCK dependencies")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

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

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

diff --cc drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.c
index d260993,98cc013..1419c8d
--- 1/drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.c
--- 2/drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.c
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-switch.c
@@@ -3204,12 -3083,10 +3206,10 @@@ static int dpaa2_switch_remove(struct f
        }
  
        kfree(ethsw->fdbs);
 -      kfree(ethsw->acls);
 +      kfree(ethsw->filter_blocks);
        kfree(ethsw->ports);
  
-       dpaa2_switch_takedown(sw_dev);
- 
-       destroy_workqueue(ethsw->workqueue);
+       dpaa2_switch_teardown(sw_dev);
  
        fsl_mc_portal_free(ethsw->mc_io);
  

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

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

diff --cc drivers/net/ethernet/mscc/ocelot.c
Simple merge

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

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

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

diff --cc drivers/ptp/Kconfig
index 8ad88c3,e085c25..32660dc
--- 1/drivers/ptp/Kconfig
--- 2/drivers/ptp/Kconfig
+++ b/drivers/ptp/Kconfig
@@@ -103,8 -90,9 +103,9 @@@ config PTP_1588_CLOCK_INE
  config PTP_1588_CLOCK_PCH
        tristate "Intel PCH EG20T as PTP clock"
        depends on X86_32 || COMPILE_TEST
-       depends on HAS_IOMEM && NET
+       depends on HAS_IOMEM && PCI
+       depends on NET
 -      imply PTP_1588_CLOCK
 +      depends on PTP_1588_CLOCK
        help
          This driver adds support for using the PCH EG20T as a PTP
          clock. The hardware supports time stamping of PTP packets

diff --cc drivers/vdpa/mlx5/net/mlx5_vnet.c
Simple merge

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

diff --cc init/main.c
Simple merge

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

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

diff --cc mm/memcontrol.c
Simple merge

diff --cc net/mptcp/options.c
Simple merge

diff --cc net/mptcp/pm_netlink.c
Simple merge

diff --cc net/sched/sch_cake.c
Simple merge

diff --cc net/tipc/socket.c
Simple merge