Merge remote-tracking branch 'stable/linux-4.19.y' into rpi-4.19.y

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/thermal/broadcom/brcmstb_thermal.c
index 36289c5,8d16a41..b610f2c
--- 1/drivers/thermal/broadcom/brcmstb_thermal.c
--- 2/drivers/thermal/broadcom/brcmstb_thermal.c
+++ b/drivers/thermal/broadcom/brcmstb_thermal.c
@@@ -120,17 -115,8 +120,10 @@@ struct brcmstb_thermal_priv 
        void __iomem *tmon_base;
        struct device *dev;
        struct thermal_zone_device *thermal;
 +      struct clk *clk;
 +      const struct brcmstb_thermal_of_data *socdata;
  };
  
- static void avs_tmon_get_coeffs(struct thermal_zone_device *tz, int *slope,
-                               int *offset)
- {
-       *slope = thermal_zone_get_slope(tz);
-       *offset = thermal_zone_get_offset(tz);
- }
- 
  /* Convert a HW code to a temperature reading (millidegree celsius) */
  static inline int avs_tmon_code_to_temp(struct thermal_zone_device *tz,
                                        u32 code)

diff --cc drivers/usb/core/hub.c
Simple merge

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

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

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

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