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

drivers/net/ethernet/freescale/fec.h
  7b15515fc1ca ("Revert "fec: Restart PPS after link state change"")
  40c79ce13b03 ("net: fec: add stop mode support for imx8 platform")
https://lore.kernel.org/all/20220921105337.62b41047@canb.auug.org.au/

drivers/pinctrl/pinctrl-ocelot.c
  c297561bc98a ("pinctrl: ocelot: Fix interrupt controller")
  181f604b33cd ("pinctrl: ocelot: add ability to be used in a non-mmio configuration")
https://lore.kernel.org/all/20220921110032.7cd28114@canb.auug.org.au/

tools/testing/selftests/drivers/net/bonding/Makefile
  bbb774d921e2 ("net: Add tests for bonding and team address list management")
  152e8ec77640 ("selftests/bonding: add a test for bonding lladdr target")
https://lore.kernel.org/all/20220921110437.5b7dbd82@canb.auug.org.au/

drivers/net/can/usb/gs_usb.c
  5440428b3da6 ("can: gs_usb: gs_can_open(): fix race dev->can.state condition")
  45dfa45f52e6 ("can: gs_usb: add RX and TX hardware timestamp support")
https://lore.kernel.org/all/84f45a7d-92b6-4dc5-d7a1-072152fab6ff@tessares.net/

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/bonding/bond_main.c
Simple merge

diff --cc drivers/net/can/flexcan/flexcan-core.c
Simple merge

diff --cc drivers/net/can/usb/gs_usb.c
index cc363f1935ce4484014b27061d336190c3182c65,c1ff3c046d62c088f87226787419fc407f13b75c..5e0d280b0cd3a68146a763dc11419ce25ae869e4
--- 1/drivers/net/can/usb/gs_usb.c
--- 2/drivers/net/can/usb/gs_usb.c
+++ b/drivers/net/can/usb/gs_usb.c
@@@ -956,11 -823,8 +956,12 @@@ static int gs_can_open(struct net_devic
        if (ctrlmode & CAN_CTRLMODE_3_SAMPLES)
                flags |= GS_CAN_MODE_TRIPLE_SAMPLE;
  
 +      /* if hardware supports timestamps, enable it */
 +      if (dev->feature & GS_CAN_FEATURE_HW_TIMESTAMP)
 +              flags |= GS_CAN_MODE_HW_TIMESTAMP;
 +
        /* finally start device */
+       dev->can.state = CAN_STATE_ERROR_ACTIVE;
        dm->mode = cpu_to_le32(GS_CAN_MODE_START);
        dm->flags = cpu_to_le32(flags);
        rc = usb_control_msg(interface_to_usbdev(dev->iface),
@@@ -977,12 -842,6 +979,10 @@@
  
        kfree(dm);
  
-       dev->can.state = CAN_STATE_ERROR_ACTIVE;
- 
 +      /* start polling timestamp */
 +      if (dev->feature & GS_CAN_FEATURE_HW_TIMESTAMP)
 +              gs_usb_timestamp_init(dev);
 +
        parent->active_channels++;
        if (!(dev->can.ctrlmode & CAN_CTRLMODE_LISTENONLY))
                netif_start_queue(netdev);

diff --cc drivers/net/dsa/microchip/lan937x_main.c
Simple merge

diff --cc drivers/net/ethernet/freescale/fec.h
index dd055d734363e818fc0b2bd954e107211ae56b09,a5fed00cb971fccd2cdb97521dd0ce49b55d45ea..b0100fe3c9e40a4d5bf7795da3607342855a7fca
--- 1/drivers/net/ethernet/freescale/fec.h
--- 2/drivers/net/ethernet/freescale/fec.h
+++ b/drivers/net/ethernet/freescale/fec.h
@@@ -641,15 -639,6 +642,8 @@@ struct fec_enet_private 
        int pps_enable;
        unsigned int next_counter;
  
-       struct {
-               struct timespec64 ts_phc;
-               u64 ns_sys;
-               u32 at_corr;
-               u8 at_inc_corr;
-       } ptp_saved_state;
- 
 +      struct imx_sc_ipc *ipc_handle;
 +
        u64 ethtool_stats[];
  };
  

diff --cc drivers/net/ethernet/freescale/fec_main.c
Simple merge

diff --cc drivers/net/ethernet/freescale/fec_ptp.c
Simple merge

diff --cc drivers/net/ethernet/intel/i40e/i40e_main.c
Simple merge

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

diff --cc drivers/net/ethernet/intel/ice/ice_lib.c
Simple merge

diff --cc drivers/net/ethernet/intel/ice/ice_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/ice/ice_txrx.c
Simple merge

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

diff --cc drivers/net/ethernet/mediatek/mtk_eth_soc.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/main.c
Simple merge

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

diff --cc drivers/net/ethernet/sun/sunhme.c
Simple merge

diff --cc drivers/net/phy/micrel.c
Simple merge

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

diff --cc drivers/net/wireguard/netlink.c
Simple merge

diff --cc drivers/pinctrl/pinctrl-ocelot.c
index 340ca237342948b350e9b59b7ed504424404cdfe,c7df8c5fe5854462d1585782c3d0f72b7a02f5dd..83464e0bf4e6daecb925c9887312267c2574f634
--- 1/drivers/pinctrl/pinctrl-ocelot.c
--- 2/drivers/pinctrl/pinctrl-ocelot.c
+++ b/drivers/pinctrl/pinctrl-ocelot.c
@@@ -2008,11 -2086,12 +2081,11 @@@ static int ocelot_pinctrl_probe(struct 
  
        regmap_config.max_register = OCELOT_GPIO_SD_MAP * info->stride + 15 * 4;
  
 -      info->map = devm_regmap_init_mmio(dev, base, &regmap_config);
 -      if (IS_ERR(info->map)) {
 -              dev_err(dev, "Failed to create regmap\n");
 -              return PTR_ERR(info->map);
 -      }
 +      info->map = ocelot_regmap_from_resource(pdev, 0, &regmap_config);
 +      if (IS_ERR(info->map))
 +              return dev_err_probe(dev, PTR_ERR(info->map),
 +                                   "Failed to create regmap\n");
-       dev_set_drvdata(dev, info->map);
+       dev_set_drvdata(dev, info);
        info->dev = dev;
  
        /* Pinconf registers */

diff --cc net/bridge/netfilter/ebtables.c
Simple merge

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

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

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

diff --cc net/ipv6/af_inet6.c
Simple merge

diff --cc net/ipv6/ip6mr.c
Simple merge

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

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

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

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

diff --cc net/smc/smc_core.c
Simple merge

diff --cc tools/testing/selftests/drivers/net/bonding/Makefile
index d209f7a98b6c5dd00fd13f42646754f407a4c8ba,1d866658e541e559584f2c272db5818106aeffb2..d14846fcf3d1c99a3616dc8f9273178959e7305a
--- 1/tools/testing/selftests/drivers/net/bonding/Makefile
--- 2/tools/testing/selftests/drivers/net/bonding/Makefile
+++ b/tools/testing/selftests/drivers/net/bonding/Makefile
@@@ -1,7 -1,10 +1,11 @@@
  # SPDX-License-Identifier: GPL-2.0
  # Makefile for net selftests
  
- TEST_PROGS := bond-break-lacpdu-tx.sh
- TEST_PROGS += bond-lladdr-target.sh
 -TEST_PROGS := bond-break-lacpdu-tx.sh \
 -            dev_addr_lists.sh \
 -            bond-arp-interval-causes-panic.sh
++TEST_PROGS := \
++      bond-arp-interval-causes-panic.sh \
++      bond-break-lacpdu-tx.sh \
++      dev_addr_lists.sh
+ 
+ TEST_FILES := lag_lib.sh
  
  include ../../../lib.mk