Merge tag 'v5.10.65' into rpi-5.10.y

This is the 5.10.65 stable release

Signed-off-by: Phil Elwell <phil@raspberrypi.com>

diff --cc Makefile
Simple merge

diff --cc drivers/firmware/raspberrypi.c
index 9179d65a1f24605abbaba9ae6f9c483066b81a6a,1d965c1252cac7b9297e153ad6ca8e77f6259727..849e63bb426d4868e52310951e0ae24be5b08e64
--- 1/drivers/firmware/raspberrypi.c
--- 2/drivers/firmware/raspberrypi.c
+++ b/drivers/firmware/raspberrypi.c
@@@ -28,11 -28,10 +29,13 @@@ struct rpi_firmware 
        struct mbox_chan *chan; /* The property channel. */
        struct completion c;
        u32 enabled;
 +      u32 get_throttled;
+ 
+       struct kref consumers;
  };
  
 +static struct platform_device *g_pdev;
 +
  static DEFINE_MUTEX(transaction_lock);
  
  static void response_callback(struct mbox_client *cl, void *msg)
@@@ -361,12 -269,11 +383,13 @@@ static int rpi_firmware_probe(struct pl
        }
  
        init_completion(&fw->c);
+       kref_init(&fw->consumers);
  
        platform_set_drvdata(pdev, fw);
 +      g_pdev = pdev;
  
        rpi_firmware_print_firmware_revision(fw);
 +      rpi_firmware_print_firmware_hash(fw);
        rpi_register_hwmon_driver(dev, fw);
        rpi_register_clk_driver(dev);
  
@@@ -391,9 -298,9 +414,10 @@@ static int rpi_firmware_remove(struct p
        rpi_hwmon = NULL;
        platform_device_unregister(rpi_clk);
        rpi_clk = NULL;
-       mbox_free_channel(fw->chan);
 +      g_pdev = NULL;
  
+       rpi_firmware_put(fw);
+ 
        return 0;
  }
  

diff --cc drivers/gpu/drm/mxsfb/mxsfb_kms.c
Simple merge

diff --cc drivers/mmc/host/sdhci.c
Simple merge

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

diff --cc drivers/video/fbdev/core/fbmem.c
Simple merge

diff --cc include/soc/bcm2835/raspberrypi-firmware.h
Simple merge