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

Conflicting commits, all resolutions pretty trivial:

drivers/bus/mhi/pci_generic.c
  5c2c85315948 ("bus: mhi: pci-generic: configurable network interface MRU")
  56f6f4c4eb2a ("bus: mhi: pci_generic: Apply no-op for wake using sideband wake boolean")

drivers/nfc/s3fwrn5/firmware.c
  a0302ff5906a ("nfc: s3fwrn5: remove unnecessary label")
  46573e3ab08f ("nfc: s3fwrn5: fix undefined parameter values in dev_err()")
  801e541c79bb ("nfc: s3fwrn5: fix undefined parameter values in dev_err()")

MAINTAINERS
  7d901a1e878a ("net: phy: add Maxlinear GPY115/21x/24x driver")
  8a7b46fa7902 ("MAINTAINERS: add Yasushi SHOJI as reviewer for the Microchip CAN BUS Analyzer Tool driver")

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

diff --cc MAINTAINERS
index 73beb91891ee4b585613561efb6a51d4d6804cbc,c9467d2839f5e894adc11c06949a842a0a9bd39f..41fcfdb24a818df621c68862bf848ba7e7df38f4
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -11341,12 -11327,12 +11341,18 @@@ W:        https://linuxtv.or
  T:    git git://linuxtv.org/media_tree.git
  F:    drivers/media/radio/radio-maxiradio*
  
 +MAXLINEAR ETHERNET PHY DRIVER
 +M:    Xu Liang <lxu@maxlinear.com>
 +L:    netdev@vger.kernel.org
 +S:    Supported
 +F:    drivers/net/phy/mxl-gpy.c
 +
+ MCAB MICROCHIP CAN BUS ANALYZER TOOL DRIVER
+ R:    Yasushi SHOJI <yashi@spacecubics.com>
+ L:    linux-can@vger.kernel.org
+ S:    Maintained
+ F:    drivers/net/can/usb/mcba_usb.c
+ 
  MCAN MMIO DEVICE DRIVER
  M:    Chandrasekar Ramakrishnan <rcsekar@samsung.com>
  L:    linux-can@vger.kernel.org

diff --cc arch/arm64/boot/dts/qcom/sc7180.dtsi
Simple merge

diff --cc arch/x86/net/bpf_jit_comp.c
Simple merge

diff --cc drivers/bus/mhi/pci_generic.c
index 19413daa091702d20579ca7ffcf4245de33ec261,4dd1077354af0c540e753d9c8ea722ccdce6e191..b33b9d75e8afe242e8cc935d267b25087abf2f21
--- 1/drivers/bus/mhi/pci_generic.c
--- 2/drivers/bus/mhi/pci_generic.c
+++ b/drivers/bus/mhi/pci_generic.c
@@@ -32,7 -32,8 +32,9 @@@
   * @edl: emergency download mode firmware path (if any)
   * @bar_num: PCI base address register to use for MHI MMIO register space
   * @dma_data_width: DMA transfer word size (32 or 64 bits)
 + * @mru_default: default MRU size for MBIM network packets
+  * @sideband_wake: Devices using dedicated sideband GPIO for wakeup instead
+  *               of inband wake support (such as sdx24)
   */
  struct mhi_pci_dev_info {
        const struct mhi_controller_config *config;
@@@ -41,7 -42,7 +43,8 @@@
        const char *edl;
        unsigned int bar_num;
        unsigned int dma_data_width;
 +      unsigned int mru_default;
+       bool sideband_wake;
  };
  
  #define MHI_CHANNEL_CONFIG_UL(ch_num, ch_name, el_count, ev_ring) \
@@@ -254,7 -272,7 +274,8 @@@ static const struct mhi_pci_dev_info mh
        .config = &modem_qcom_v1_mhiv_config,
        .bar_num = MHI_PCI_DEFAULT_BAR_NUM,
        .dma_data_width = 32,
-       .mru_default = 32768
++      .mru_default = 32768,
+       .sideband_wake = false,
  };
  
  static const struct mhi_pci_dev_info mhi_qcom_sdx24_info = {
@@@ -643,11 -664,13 +667,14 @@@ static int mhi_pci_probe(struct pci_de
        mhi_cntrl->status_cb = mhi_pci_status_cb;
        mhi_cntrl->runtime_get = mhi_pci_runtime_get;
        mhi_cntrl->runtime_put = mhi_pci_runtime_put;
-       mhi_cntrl->wake_get = mhi_pci_wake_get_nop;
-       mhi_cntrl->wake_put = mhi_pci_wake_put_nop;
-       mhi_cntrl->wake_toggle = mhi_pci_wake_toggle_nop;
 +      mhi_cntrl->mru = info->mru_default;
  
+       if (info->sideband_wake) {
+               mhi_cntrl->wake_get = mhi_pci_wake_get_nop;
+               mhi_cntrl->wake_put = mhi_pci_wake_put_nop;
+               mhi_cntrl->wake_toggle = mhi_pci_wake_toggle_nop;
+       }
+ 
        err = mhi_pci_claim(mhi_cntrl, info->bar_num, DMA_BIT_MASK(info->dma_data_width));
        if (err)
                return err;

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

diff --cc drivers/net/can/usb/esd_usb2.c
Simple merge

diff --cc drivers/net/can/usb/peak_usb/pcan_usb.c
Simple merge

diff --cc drivers/net/dsa/mv88e6xxx/chip.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnxt/bnxt.c
index 4a92ea7fa7d2658be63d3ca1ae55a2ea8473187f,89606587b1566901d44432e4a93282de44c7fc83..03b821897cf312c8aed99c2711b11a47181cbc2e
--- 1/drivers/net/ethernet/broadcom/bnxt/bnxt.c
--- 2/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@@ -12168,12 -12131,10 +12168,11 @@@ static void bnxt_fw_reset_task(struct w
                /* Make sure fw_reset_state is 0 before clearing the flag */
                smp_mb__before_atomic();
                clear_bit(BNXT_STATE_IN_FW_RESET, &bp->state);
-               bnxt_ulp_start(bp, rc);
-               if (!rc)
-                       bnxt_reenable_sriov(bp);
+               bnxt_ulp_start(bp, 0);
+               bnxt_reenable_sriov(bp);
                bnxt_vf_reps_alloc(bp);
                bnxt_vf_reps_open(bp);
 +              bnxt_ptp_reapply_pps(bp);
                bnxt_dl_health_recovery_done(bp);
                bnxt_dl_health_status_update(bp, true);
                rtnl_unlock();

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

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

diff --cc drivers/net/ethernet/dec/tulip/winbond-840.c
Simple merge

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

diff --cc drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c
Simple merge

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

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

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

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

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

diff --cc drivers/net/ethernet/pensando/ionic/ionic_lif.c
Simple merge

diff --cc drivers/net/ethernet/pensando/ionic/ionic_phc.c
Simple merge

diff --cc drivers/net/ethernet/pensando/ionic/ionic_txrx.c
Simple merge

diff --cc drivers/net/ethernet/sis/sis900.c
Simple merge

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

diff --cc drivers/nfc/nfcsim.c
Simple merge

diff --cc drivers/nfc/s3fwrn5/firmware.c
index 1421ffd46d9a4234c15d730f1f6c877c73984641,e3e72b8a29e3f3e31fb468371f27319ed17f28ce..1af7a1e632cf218291300c72f2406ed8587a52f5
--- 1/drivers/nfc/s3fwrn5/firmware.c
--- 2/drivers/nfc/s3fwrn5/firmware.c
+++ b/drivers/nfc/s3fwrn5/firmware.c
@@@ -421,9 -421,10 +421,9 @@@ int s3fwrn5_fw_download(struct s3fwrn5_
  
        tfm = crypto_alloc_shash("sha1", 0, 0);
        if (IS_ERR(tfm)) {
 -              ret = PTR_ERR(tfm);
                dev_err(&fw_info->ndev->nfc_dev->dev,
-                       "Cannot allocate shash (code=%d)\n", ret);
+                       "Cannot allocate shash (code=%pe)\n", tfm);
 -              goto out;
 +              return PTR_ERR(tfm);
        }
  
        ret = crypto_shash_tfm_digest(tfm, fw->image, image_size, hash_data);

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

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

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

diff --cc mm/memcontrol.c
Simple merge

diff --cc net/can/j1939/transport.c
Simple merge

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

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

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

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

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

diff --cc net/qrtr/qrtr.c
Simple merge

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

diff --cc net/unix/af_unix.c
Simple merge