Merge 4.19-rc7 into usb-next

We want the USB fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <[email protected]>

diff --combined MAINTAINERS
index cba1218534b6f0a2f70eaa39419a25febff86cfd,48a65c3a41898f9d747379ebd602bbe8e1ea29b2..e8c38b6590caaff50043d7ce504c9b54e56a64af
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -324,7 -324,6 +324,6 @@@ F: Documentation/ABI/testing/sysfs-bus-
  F:    Documentation/ABI/testing/configfs-acpi
  F:    drivers/pci/*acpi*
  F:    drivers/pci/*/*acpi*
- F:    drivers/pci/*/*/*acpi*
  F:    tools/power/acpi/
  
  ACPI APEI
@@@ -1251,7 -1250,7 +1250,7 @@@ N:      meso
  
  ARM/Annapurna Labs ALPINE ARCHITECTURE
  M:    Tsahee Zidenberg <[email protected]>
- M:    Antoine Tenart <antoine.tenart@free-electrons.com>
+ M:    Antoine Tenart <antoine.tenart@bootlin.com>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/mach-alpine/
@@@ -2956,7 -2955,6 +2955,6 @@@ F:      include/linux/bcm963xx_tag.
  
  BROADCOM BNX2 GIGABIT ETHERNET DRIVER
  M:    Rasesh Mody <[email protected]>
- M:    Harish Patil <[email protected]>
  M:    [email protected]
  L:    [email protected]
  S:    Supported
@@@ -2977,6 -2975,7 +2975,7 @@@ F:      drivers/scsi/bnx2i
  
  BROADCOM BNX2X 10 GIGABIT ETHERNET DRIVER
  M:    Ariel Elior <[email protected]>
+ M:    Sudarsana Kalluru <[email protected]>
  M:    [email protected]
  L:    [email protected]
  S:    Supported
@@@ -5470,7 -5469,8 +5469,8 @@@ S:      Odd Fixe
  F:    drivers/net/ethernet/agere/
  
  ETHERNET BRIDGE
- M:    Stephen Hemminger <[email protected]>
+ M:    Roopa Prabhu <[email protected]>
+ M:    Nikolay Aleksandrov <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected]
  W:    http://www.linuxfoundation.org/en/Net:Bridge
@@@ -8598,7 -8598,6 +8598,6 @@@ F:      include/linux/spinlock*.
  F:    arch/*/include/asm/spinlock*.h
  F:    include/linux/rwlock*.h
  F:    include/linux/mutex*.h
- F:    arch/*/include/asm/mutex*.h
  F:    include/linux/rwsem*.h
  F:    arch/*/include/asm/rwsem.h
  F:    include/linux/seqlock.h
@@@ -11979,7 -11978,7 +11978,7 @@@ F:   Documentation/scsi/LICENSE.qla4xx
  F:    drivers/scsi/qla4xxx/
  
  QLOGIC QLCNIC (1/10)Gb ETHERNET DRIVER
- M:    Harish Patil <harish.patil@cavium.com>
+ M:    Shahed Shaikh <Shahed.Shaikh@cavium.com>
  M:    Manish Chopra <[email protected]>
  M:    [email protected]
  L:    [email protected]
@@@ -11987,7 -11986,6 +11986,6 @@@ S:   Supporte
  F:    drivers/net/ethernet/qlogic/qlcnic/
  
  QLOGIC QLGE 10Gb ETHERNET DRIVER
- M:    Harish Patil <[email protected]>
  M:    Manish Chopra <[email protected]>
  M:    [email protected]
  L:    [email protected]
@@@ -15292,12 -15290,6 +15290,12 @@@ F: Documentation/driver-api/usb/typec_b
  F:    drivers/usb/typec/altmodes/
  F:    include/linux/usb/typec_altmode.h
  
 +USB TYPEC PORT CONTROLLER DRIVERS
 +M:    Guenter Roeck <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/usb/typec/tcpm/
 +
  USB UHCI DRIVER
  M:    Alan Stern <[email protected]>
  L:    [email protected]
@@@ -15401,7 -15393,7 +15399,7 @@@ S:   Maintaine
  UVESAFB DRIVER
  M:    Michal Januszewski <[email protected]>
  L:    [email protected]
- W:    http://dev.gentoo.org/~spock/projects/uvesafb/
+ W:    https://github.com/mjanusz/v86d
  S:    Maintained
  F:    Documentation/fb/uvesafb.txt
  F:    drivers/video/fbdev/uvesafb.*

diff --combined drivers/usb/host/xhci-pci.c
index 9433e70aeeb02e93cdae05ce1b35248506e8f37a,722860eb5a91f5bcec455871320f6c5d6e95e535..9a279fe85b9b08255a864496998a25a344d8caf1
--- 1/drivers/usb/host/xhci-pci.c
--- 2/drivers/usb/host/xhci-pci.c
+++ b/drivers/usb/host/xhci-pci.c
@@@ -41,13 -41,6 +41,13 @@@
  #define PCI_DEVICE_ID_INTEL_BROXTON_B_XHCI            0x1aa8
  #define PCI_DEVICE_ID_INTEL_APL_XHCI                  0x5aa8
  #define PCI_DEVICE_ID_INTEL_DNV_XHCI                  0x19d0
 +#define PCI_DEVICE_ID_INTEL_ALPINE_RIDGE_2C_XHCI      0x15b5
 +#define PCI_DEVICE_ID_INTEL_ALPINE_RIDGE_4C_XHCI      0x15b6
 +#define PCI_DEVICE_ID_INTEL_ALPINE_RIDGE_C_2C_XHCI    0x15db
 +#define PCI_DEVICE_ID_INTEL_ALPINE_RIDGE_C_4C_XHCI    0x15d4
 +#define PCI_DEVICE_ID_INTEL_TITAN_RIDGE_2C_XHCI               0x15e9
 +#define PCI_DEVICE_ID_INTEL_TITAN_RIDGE_4C_XHCI               0x15ec
 +#define PCI_DEVICE_ID_INTEL_TITAN_RIDGE_DD_XHCI               0x15f0
  
  #define PCI_DEVICE_ID_AMD_PROMONTORYA_4                       0x43b9
  #define PCI_DEVICE_ID_AMD_PROMONTORYA_3                       0x43ba
@@@ -192,20 -185,12 +192,22 @@@ static void xhci_pci_quirks(struct devi
        }
        if (pdev->vendor == PCI_VENDOR_ID_INTEL &&
            (pdev->device == PCI_DEVICE_ID_INTEL_CHERRYVIEW_XHCI ||
+            pdev->device == PCI_DEVICE_ID_INTEL_SUNRISEPOINT_LP_XHCI ||
+            pdev->device == PCI_DEVICE_ID_INTEL_SUNRISEPOINT_H_XHCI ||
             pdev->device == PCI_DEVICE_ID_INTEL_APL_XHCI ||
             pdev->device == PCI_DEVICE_ID_INTEL_DNV_XHCI))
                xhci->quirks |= XHCI_MISSING_CAS;
  
 +      if (pdev->vendor == PCI_VENDOR_ID_INTEL &&
 +          (pdev->device == PCI_DEVICE_ID_INTEL_ALPINE_RIDGE_2C_XHCI ||
 +           pdev->device == PCI_DEVICE_ID_INTEL_ALPINE_RIDGE_4C_XHCI ||
 +           pdev->device == PCI_DEVICE_ID_INTEL_ALPINE_RIDGE_C_2C_XHCI ||
 +           pdev->device == PCI_DEVICE_ID_INTEL_ALPINE_RIDGE_C_4C_XHCI ||
 +           pdev->device == PCI_DEVICE_ID_INTEL_TITAN_RIDGE_2C_XHCI ||
 +           pdev->device == PCI_DEVICE_ID_INTEL_TITAN_RIDGE_4C_XHCI ||
 +           pdev->device == PCI_DEVICE_ID_INTEL_TITAN_RIDGE_DD_XHCI))
 +              xhci->quirks |= XHCI_DEFAULT_PM_RUNTIME_ALLOW;
 +
        if (pdev->vendor == PCI_VENDOR_ID_ETRON &&
                        pdev->device == PCI_DEVICE_ID_EJ168) {
                xhci->quirks |= XHCI_RESET_ON_RESUME;
@@@ -349,9 -334,6 +351,9 @@@ static int xhci_pci_probe(struct pci_de
        /* USB-2 and USB-3 roothubs initialized, allow runtime pm suspend */
        pm_runtime_put_noidle(&dev->dev);
  
 +      if (xhci->quirks & XHCI_DEFAULT_PM_RUNTIME_ALLOW)
 +              pm_runtime_allow(&dev->dev);
 +
        return 0;
  
  put_usb3_hcd:
@@@ -369,10 -351,6 +371,10 @@@ static void xhci_pci_remove(struct pci_
  
        xhci = hcd_to_xhci(pci_get_drvdata(dev));
        xhci->xhc_state |= XHCI_STATE_REMOVING;
 +
 +      if (xhci->quirks & XHCI_DEFAULT_PM_RUNTIME_ALLOW)
 +              pm_runtime_forbid(&dev->dev);
 +
        if (xhci->shared_hcd) {
                usb_remove_hcd(xhci->shared_hcd);
                usb_put_hcd(xhci->shared_hcd);