Merge 6.3-rc6 into usb-next

We need the USB fixes in here for testing, and this resolves two merge
conflicts, one pointed out by linux-next:

	drivers/usb/dwc3/dwc3-pci.c
	drivers/usb/host/xhci-pci.c

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --cc drivers/usb/dwc3/dwc3-pci.c
index a97a6d34666502573bd27ec60d35acfff76d172f,560793545362afc0ee105f54a086a87b003fbe46..44a04c9b20735014df5e90920e1ef50e2830c138
--- 1/drivers/usb/dwc3/dwc3-pci.c
--- 2/drivers/usb/dwc3/dwc3-pci.c
+++ b/drivers/usb/dwc3/dwc3-pci.c
@@@ -387,40 -388,107 +388,41 @@@ static void dwc3_pci_remove(struct pci_
  }
  
  static const struct pci_device_id dwc3_pci_id_table[] = {
 -      { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_BSW),
 -        (kernel_ulong_t) &dwc3_pci_intel_swnode, },
 -
 -      { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_BYT),
 -        (kernel_ulong_t) &dwc3_pci_intel_byt_swnode, },
 -
 -      { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_MRFLD),
 -        (kernel_ulong_t) &dwc3_pci_intel_mrfld_swnode, },
 -
 -      { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_CMLLP),
 -        (kernel_ulong_t) &dwc3_pci_intel_swnode, },
 -
 -      { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_CMLH),
 -        (kernel_ulong_t) &dwc3_pci_intel_swnode, },
 -
 -      { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_SPTLP),
 -        (kernel_ulong_t) &dwc3_pci_intel_swnode, },
 -
 -      { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_SPTH),
 -        (kernel_ulong_t) &dwc3_pci_intel_swnode, },
 -
 -      { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_BXT),
 -        (kernel_ulong_t) &dwc3_pci_intel_swnode, },
 -
 -      { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_BXT_M),
 -        (kernel_ulong_t) &dwc3_pci_intel_swnode, },
 -
 -      { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_APL),
 -        (kernel_ulong_t) &dwc3_pci_intel_swnode, },
 -
 -      { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_KBP),
 -        (kernel_ulong_t) &dwc3_pci_intel_swnode, },
 -
 -      { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_GLK),
 -        (kernel_ulong_t) &dwc3_pci_intel_swnode, },
 -
 -      { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_CNPLP),
 -        (kernel_ulong_t) &dwc3_pci_intel_swnode, },
 -
 -      { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_CNPH),
 -        (kernel_ulong_t) &dwc3_pci_intel_swnode, },
 -
 -      { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_CNPV),
 -        (kernel_ulong_t) &dwc3_pci_intel_swnode, },
 -
 -      { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_ICLLP),
 -        (kernel_ulong_t) &dwc3_pci_intel_swnode, },
 -
 -      { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_EHL),
 -        (kernel_ulong_t) &dwc3_pci_intel_swnode, },
 -
 -      { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_TGPLP),
 -        (kernel_ulong_t) &dwc3_pci_intel_swnode, },
 -
 -      { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_TGPH),
 -        (kernel_ulong_t) &dwc3_pci_intel_swnode, },
 -
 -      { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_JSP),
 -        (kernel_ulong_t) &dwc3_pci_intel_swnode, },
 -
 -      { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_ADL),
 -        (kernel_ulong_t) &dwc3_pci_intel_swnode, },
 -
 -      { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_ADL_PCH),
 -        (kernel_ulong_t) &dwc3_pci_intel_swnode, },
 -
 -      { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_ADLN),
 -        (kernel_ulong_t) &dwc3_pci_intel_swnode, },
 -
 -      { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_ADLN_PCH),
 -        (kernel_ulong_t) &dwc3_pci_intel_swnode, },
 -
 -      { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_ADLS),
 -        (kernel_ulong_t) &dwc3_pci_intel_swnode, },
 -
 -      { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_RPL),
 -        (kernel_ulong_t) &dwc3_pci_intel_swnode, },
 -
 -      { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_RPLS),
 -        (kernel_ulong_t) &dwc3_pci_intel_swnode, },
 -
 -      { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_MTLM),
 -        (kernel_ulong_t) &dwc3_pci_intel_swnode, },
 -
 -      { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_MTLP),
 -        (kernel_ulong_t) &dwc3_pci_intel_swnode, },
 -
 -      { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_MTLS),
 -        (kernel_ulong_t) &dwc3_pci_intel_swnode, },
 -
 -      { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_MTL),
 -        (kernel_ulong_t) &dwc3_pci_intel_swnode, },
 -
 -      { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_TGL),
 -        (kernel_ulong_t) &dwc3_pci_intel_swnode, },
 -
 -      { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_NL_USB),
 -        (kernel_ulong_t) &dwc3_pci_amd_swnode, },
 -
 -      { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_MR),
 -        (kernel_ulong_t)&dwc3_pci_amd_mr_swnode, },
 +      { PCI_DEVICE_DATA(INTEL, BSW, &dwc3_pci_intel_swnode) },
 +      { PCI_DEVICE_DATA(INTEL, BYT, &dwc3_pci_intel_byt_swnode) },
 +      { PCI_DEVICE_DATA(INTEL, MRFLD, &dwc3_pci_intel_mrfld_swnode) },
 +      { PCI_DEVICE_DATA(INTEL, CMLLP, &dwc3_pci_intel_swnode) },
 +      { PCI_DEVICE_DATA(INTEL, CMLH, &dwc3_pci_intel_swnode) },
 +      { PCI_DEVICE_DATA(INTEL, SPTLP, &dwc3_pci_intel_swnode) },
 +      { PCI_DEVICE_DATA(INTEL, SPTH, &dwc3_pci_intel_swnode) },
 +      { PCI_DEVICE_DATA(INTEL, BXT, &dwc3_pci_intel_swnode) },
 +      { PCI_DEVICE_DATA(INTEL, BXT_M, &dwc3_pci_intel_swnode) },
 +      { PCI_DEVICE_DATA(INTEL, APL, &dwc3_pci_intel_swnode) },
 +      { PCI_DEVICE_DATA(INTEL, KBP, &dwc3_pci_intel_swnode) },
 +      { PCI_DEVICE_DATA(INTEL, GLK, &dwc3_pci_intel_swnode) },
 +      { PCI_DEVICE_DATA(INTEL, CNPLP, &dwc3_pci_intel_swnode) },
 +      { PCI_DEVICE_DATA(INTEL, CNPH, &dwc3_pci_intel_swnode) },
 +      { PCI_DEVICE_DATA(INTEL, CNPV, &dwc3_pci_intel_swnode) },
 +      { PCI_DEVICE_DATA(INTEL, ICLLP, &dwc3_pci_intel_swnode) },
 +      { PCI_DEVICE_DATA(INTEL, EHL, &dwc3_pci_intel_swnode) },
 +      { PCI_DEVICE_DATA(INTEL, TGPLP, &dwc3_pci_intel_swnode) },
 +      { PCI_DEVICE_DATA(INTEL, TGPH, &dwc3_pci_intel_swnode) },
 +      { PCI_DEVICE_DATA(INTEL, JSP, &dwc3_pci_intel_swnode) },
 +      { PCI_DEVICE_DATA(INTEL, ADL, &dwc3_pci_intel_swnode) },
 +      { PCI_DEVICE_DATA(INTEL, ADL_PCH, &dwc3_pci_intel_swnode) },
 +      { PCI_DEVICE_DATA(INTEL, ADLN, &dwc3_pci_intel_swnode) },
 +      { PCI_DEVICE_DATA(INTEL, ADLN_PCH, &dwc3_pci_intel_swnode) },
 +      { PCI_DEVICE_DATA(INTEL, ADLS, &dwc3_pci_intel_swnode) },
 +      { PCI_DEVICE_DATA(INTEL, RPL, &dwc3_pci_intel_swnode) },
 +      { PCI_DEVICE_DATA(INTEL, RPLS, &dwc3_pci_intel_swnode) },
 +      { PCI_DEVICE_DATA(INTEL, MTLM, &dwc3_pci_intel_swnode) },
 +      { PCI_DEVICE_DATA(INTEL, MTLP, &dwc3_pci_intel_swnode) },
 +      { PCI_DEVICE_DATA(INTEL, MTL, &dwc3_pci_intel_swnode) },
++      { PCI_DEVICE_DATA(INTEL, MTLS, &dwc3_pci_intel_swnode) },
 +      { PCI_DEVICE_DATA(INTEL, TGL, &dwc3_pci_intel_swnode) },
 +
 +      { PCI_DEVICE_DATA(AMD, NL_USB, &dwc3_pci_amd_swnode) },
 +      { PCI_DEVICE_DATA(AMD, MR, &dwc3_pci_amd_mr_swnode) },
  
        {  }    /* Terminating Entry */
  };

diff --cc drivers/usb/gadget/function/f_fs.c
Simple merge

diff --cc drivers/usb/host/xhci-pci.c
index bbbb012820389783130b60453ed3dfd0fae6088a,6db07ca419c317488e4c0918a39d2d3e6f6a5865..ddb79f23fb3b7ce0a54b93f388e46db6508aecff
--- 1/drivers/usb/host/xhci-pci.c
--- 2/drivers/usb/host/xhci-pci.c
+++ b/drivers/usb/host/xhci-pci.c
@@@ -967,10 -771,11 +967,9 @@@ static struct pci_driver xhci_pci_drive
        /* suspend and resume implemented later */
  
        .shutdown =     usb_hcd_pci_shutdown,
 -#ifdef CONFIG_PM
        .driver = {
 -              .pm = &usb_hcd_pci_pm_ops
 +              .pm = pm_ptr(&usb_hcd_pci_pm_ops),
-               .probe_type = PROBE_PREFER_ASYNCHRONOUS,
        },
 -#endif
  };
  
  static int __init xhci_pci_init(void)

diff --cc drivers/usb/host/xhci-tegra.c
Simple merge

diff --cc drivers/usb/host/xhci.c
Simple merge