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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/bluetooth/hci_h5.c
Simple merge

diff --cc drivers/firmware/raspberrypi.c
Simple merge

diff --cc drivers/gpio/gpiolib.c
Simple merge

diff --cc drivers/gpu/drm/drm_connector.c
Simple merge

diff --cc drivers/gpu/drm/panel/panel-sitronix-st7701.c
index 0744f68,0989555..2b1abc9
--- 1/drivers/gpu/drm/panel/panel-sitronix-st7701.c
--- 2/drivers/gpu/drm/panel/panel-sitronix-st7701.c
+++ b/drivers/gpu/drm/panel/panel-sitronix-st7701.c
@@@ -601,32 -380,19 +601,40 @@@ static int st7701_probe(struct device *
  
        drm_panel_add(&st7701->panel);
  
 +      st7701->desc = desc;
 +      st7701->dev = dev;
 +
 +      *ret_st7701 = st7701;
 +
 +      return 0;
 +}
 +
 +static int st7701_dsi_probe(struct mipi_dsi_device *dsi)
 +{
 +      struct st7701 *st7701;
 +      int ret;
 +
 +      ret = st7701_probe(&dsi->dev, &st7701);
 +
 +      if (ret)
 +              return ret;
 +
 +      dsi->mode_flags = st7701->desc->flags;
 +      dsi->format = st7701->desc->format;
 +      dsi->lanes = st7701->desc->lanes;
 +
        mipi_dsi_set_drvdata(dsi, st7701);
        st7701->dsi = dsi;
 -      st7701->desc = desc;
  
-       return mipi_dsi_attach(dsi);
+       ret = mipi_dsi_attach(dsi);
+       if (ret)
+               goto err_attach;
+ 
+       return 0;
+ 
+ err_attach:
+       drm_panel_remove(&st7701->panel);
+       return ret;
  }
  
  static int st7701_dsi_remove(struct mipi_dsi_device *dsi)

diff --cc drivers/hid/hid-ids.h
Simple merge

diff --cc drivers/hwmon/Kconfig
Simple merge

diff --cc drivers/input/joystick/Kconfig
Simple merge

diff --cc drivers/media/v4l2-core/v4l2-ctrls-core.c
Simple merge

diff --cc drivers/mfd/Kconfig
Simple merge

diff --cc drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
Simple merge

diff --cc drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
Simple merge

diff --cc drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
Simple merge

diff --cc drivers/of/overlay.c
Simple merge

diff --cc drivers/rtc/rtc-pcf85063.c
Simple merge

diff --cc drivers/spi/spi-gpio.c
Simple merge

diff --cc drivers/spi/spidev.c
Simple merge

diff --cc drivers/tty/serial/amba-pl011.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

diff --cc drivers/video/fbdev/Kconfig
Simple merge

diff --cc sound/soc/codecs/pcm512x.c
Simple merge