diff --git a/.raspberrypi2.metadata b/.raspberrypi2.metadata
index 8315d7d..835fc7f 100644
--- a/.raspberrypi2.metadata
+++ b/.raspberrypi2.metadata
@@ -1,3 +1,3 @@
 98ae49ad49397d5a4dcb3ff9a082223edf7c5bbd  SOURCES/linux-5.4.tar.xz
-7bfff8ba9d9e39c8a06fb0222862f2ea6e47b8fc  SOURCES/c5b3d8e5f432058bfdb8a781393899abadcff50e.tar.gz
-8a73d208095a6fd85822810c2c483d26c6d7e8f1  SOURCES/patch-5.4.125.xz
+c1936ed0a13d8d483a9cc364e931f3fa9d91456a  SOURCES/19272ccd69049aaf42c78a235a0bf37dbabd5ea7.tar.gz
+f2814b234f84309b88fdf22fcf1875fbc9ff7319  SOURCES/patch-5.4.129.xz
diff --git a/SOURCES/rpi-5.4.x.patch b/SOURCES/rpi-5.4.x.patch
index 3814adc..b34bce5 100644
--- a/SOURCES/rpi-5.4.x.patch
+++ b/SOURCES/rpi-5.4.x.patch
@@ -13,7 +13,7 @@ Subject: [PATCH 0001/1225] arm: partially revert
  4 files changed, 28 insertions(+)
 
 diff --git a/arch/arm/include/asm/cacheflush.h b/arch/arm/include/asm/cacheflush.h
-index 7114b9aa46b87..676cf65589441 100644
+index 7114b9aa46b8..676cf6558944 100644
 --- a/arch/arm/include/asm/cacheflush.h
 +++ b/arch/arm/include/asm/cacheflush.h
 @@ -91,6 +91,21 @@
@@ -66,7 +66,7 @@ index 7114b9aa46b87..676cf65589441 100644
  
  #endif
 diff --git a/arch/arm/include/asm/glue-cache.h b/arch/arm/include/asm/glue-cache.h
-index 724f8dac1e5b1..aa74173092dd8 100644
+index 724f8dac1e5b..aa74173092dd 100644
 --- a/arch/arm/include/asm/glue-cache.h
 +++ b/arch/arm/include/asm/glue-cache.h
 @@ -155,6 +155,8 @@ static inline void nop_dma_unmap_area(const void *s, size_t l, int f) { }
@@ -79,7 +79,7 @@ index 724f8dac1e5b1..aa74173092dd8 100644
  #endif
  
 diff --git a/arch/arm/mm/proc-macros.S b/arch/arm/mm/proc-macros.S
-index 60ac7c5999a98..f48f3066abefd 100644
+index 60ac7c5999a9..f48f3066abef 100644
 --- a/arch/arm/mm/proc-macros.S
 +++ b/arch/arm/mm/proc-macros.S
 @@ -336,6 +336,8 @@ ENTRY(\name\()_cache_fns)
@@ -92,7 +92,7 @@ index 60ac7c5999a98..f48f3066abefd 100644
  	.size	\name\()_cache_fns, . - \name\()_cache_fns
  .endm
 diff --git a/arch/arm/mm/proc-syms.c b/arch/arm/mm/proc-syms.c
-index e21249548e9fb..33e4a9b8f1ba3 100644
+index e21249548e9f..33e4a9b8f1ba 100644
 --- a/arch/arm/mm/proc-syms.c
 +++ b/arch/arm/mm/proc-syms.c
 @@ -27,6 +27,9 @@ EXPORT_SYMBOL(__cpuc_flush_user_all);
@@ -125,7 +125,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  1 file changed, 22 insertions(+), 3 deletions(-)
 
 diff --git a/drivers/rtc/rtc-pcf8523.c b/drivers/rtc/rtc-pcf8523.c
-index 2f435e533b10b..c85abf77ab509 100644
+index 2f435e533b10..c85abf77ab50 100644
 --- a/drivers/rtc/rtc-pcf8523.c
 +++ b/drivers/rtc/rtc-pcf8523.c
 @@ -209,8 +209,28 @@ static int pcf8523_rtc_read_time(struct device *dev, struct rtc_time *tm)
@@ -186,7 +186,7 @@ Signed-off-by: Steve Glendinning <steve.glendinning@smsc.com>
  1 file changed, 8 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c
-index bb4ccbda031ab..dedebce4b2d9a 100644
+index bb4ccbda031a..dedebce4b2d9 100644
 --- a/drivers/net/usb/smsc95xx.c
 +++ b/drivers/net/usb/smsc95xx.c
 @@ -70,6 +70,10 @@ static bool turbo_mode = true;
@@ -236,7 +236,7 @@ See: http://forum.kodi.tv/showthread.php?tid=285288
  1 file changed, 9 insertions(+), 5 deletions(-)
 
 diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c
-index dedebce4b2d9a..c5ebcb114309b 100644
+index dedebce4b2d9..c5ebcb114309 100644
 --- a/drivers/net/usb/smsc95xx.c
 +++ b/drivers/net/usb/smsc95xx.c
 @@ -74,6 +74,10 @@ static bool truesize_mode = false;
@@ -284,7 +284,7 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
  1 file changed, 56 insertions(+)
 
 diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c
-index c5ebcb114309b..510f4d410f696 100644
+index c5ebcb114309..510f4d410f69 100644
 --- a/drivers/net/usb/smsc95xx.c
 +++ b/drivers/net/usb/smsc95xx.c
 @@ -48,6 +48,7 @@
@@ -389,7 +389,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  1 file changed, 6 insertions(+)
 
 diff --git a/kernel/resource.c b/kernel/resource.c
-index 841737bbda9e5..6877c789c5f6b 100644
+index 841737bbda9e..6877c789c5f6 100644
 --- a/kernel/resource.c
 +++ b/kernel/resource.c
 @@ -214,6 +214,12 @@ static int __release_resource(struct resource *old, bool release_child)
@@ -427,7 +427,7 @@ though, so trap them early.
  1 file changed, 1 insertion(+)
 
 diff --git a/drivers/irqchip/irq-bcm2836.c b/drivers/irqchip/irq-bcm2836.c
-index 2038693f074cb..597d36ba601ea 100644
+index 2038693f074c..597d36ba601e 100644
 --- a/drivers/irqchip/irq-bcm2836.c
 +++ b/drivers/irqchip/irq-bcm2836.c
 @@ -135,6 +135,7 @@ __exception_irq_entry bcm2836_arm_irqchip_handle_irq(struct pt_regs *regs)
@@ -456,7 +456,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/irqchip/irq-bcm2836.c b/drivers/irqchip/irq-bcm2836.c
-index 597d36ba601ea..c006a8ac10d53 100644
+index 597d36ba601e..c006a8ac10d5 100644
 --- a/drivers/irqchip/irq-bcm2836.c
 +++ b/drivers/irqchip/irq-bcm2836.c
 @@ -115,7 +115,7 @@ static int bcm2836_map(struct irq_domain *d, unsigned int irq,
@@ -493,7 +493,7 @@ Acked-by: Stephen Warren <swarren@wwwdotorg.org>
  2 files changed, 47 insertions(+), 5 deletions(-)
 
 diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig
-index 5e5f1fabc3d40..1feec06357589 100644
+index 5e5f1fabc3d4..1feec0635758 100644
 --- a/arch/arm/mach-bcm/Kconfig
 +++ b/arch/arm/mach-bcm/Kconfig
 @@ -165,6 +165,7 @@ config ARCH_BCM2835
@@ -505,7 +505,7 @@ index 5e5f1fabc3d40..1feec06357589 100644
  	select PINCTRL_BCM2835
  	select MFD_CORE
 diff --git a/drivers/irqchip/irq-bcm2835.c b/drivers/irqchip/irq-bcm2835.c
-index 418245d31921b..64472b25d0b4e 100644
+index 418245d31921..64472b25d0b4 100644
 --- a/drivers/irqchip/irq-bcm2835.c
 +++ b/drivers/irqchip/irq-bcm2835.c
 @@ -45,7 +45,7 @@
@@ -621,7 +621,7 @@ Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
  1 file changed, 41 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/irqchip/irq-bcm2835.c b/drivers/irqchip/irq-bcm2835.c
-index 64472b25d0b4e..2fccc5cfe9f33 100644
+index 64472b25d0b4..2fccc5cfe9f3 100644
 --- a/drivers/irqchip/irq-bcm2835.c
 +++ b/drivers/irqchip/irq-bcm2835.c
 @@ -41,8 +41,11 @@
@@ -726,7 +726,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c
-index be503a0e6ef73..736af270d7a10 100644
+index be503a0e6ef7..736af270d7a1 100644
 --- a/drivers/spi/spidev.c
 +++ b/drivers/spi/spidev.c
 @@ -733,7 +733,7 @@ static int spidev_probe(struct spi_device *spi)
@@ -763,10 +763,10 @@ Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
  2 files changed, 26 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
-index 7af874b69ffb9..112e08cedcd56 100644
+index a32d0d715247..d3e9a2ab6dd0 100644
 --- a/drivers/dma/Kconfig
 +++ b/drivers/dma/Kconfig
-@@ -133,7 +133,7 @@ config COH901318
+@@ -134,7 +134,7 @@ config COH901318
  
  config DMA_BCM2835
  	tristate "BCM2835 DMA engine support"
@@ -776,7 +776,7 @@ index 7af874b69ffb9..112e08cedcd56 100644
  	select DMA_VIRTUAL_CHANNELS
  
 diff --git a/drivers/dma/bcm2835-dma.c b/drivers/dma/bcm2835-dma.c
-index e4c593f48575c..6860131b02d9a 100644
+index e4c593f48575..6860131b02d9 100644
 --- a/drivers/dma/bcm2835-dma.c
 +++ b/drivers/dma/bcm2835-dma.c
 @@ -25,6 +25,7 @@
@@ -861,7 +861,7 @@ Subject: [PATCH 0013/1225] firmware: Updated mailbox header
  1 file changed, 3 insertions(+)
 
 diff --git a/include/soc/bcm2835/raspberrypi-firmware.h b/include/soc/bcm2835/raspberrypi-firmware.h
-index 7800e12ee042c..3f357c05788e8 100644
+index 7800e12ee042..3f357c05788e 100644
 --- a/include/soc/bcm2835/raspberrypi-firmware.h
 +++ b/include/soc/bcm2835/raspberrypi-firmware.h
 @@ -9,6 +9,8 @@
@@ -898,7 +898,7 @@ See: https://github.com/raspberrypi/linux/pull/1510
  1 file changed, 1 insertion(+)
 
 diff --git a/drivers/rtc/rtc-pcf2123.c b/drivers/rtc/rtc-pcf2123.c
-index c3691fa4210e5..ead1fd376d2d8 100644
+index c3691fa4210e..ead1fd376d2d 100644
 --- a/drivers/rtc/rtc-pcf2123.c
 +++ b/drivers/rtc/rtc-pcf2123.c
 @@ -465,3 +465,4 @@ module_spi_driver(pcf2123_driver);
@@ -932,7 +932,7 @@ Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
  1 file changed, 27 insertions(+), 22 deletions(-)
 
 diff --git a/drivers/watchdog/bcm2835_wdt.c b/drivers/watchdog/bcm2835_wdt.c
-index dec6ca019beaa..62937e6f83ca1 100644
+index dec6ca019bea..62937e6f83ca 100644
 --- a/drivers/watchdog/bcm2835_wdt.c
 +++ b/drivers/watchdog/bcm2835_wdt.c
 @@ -32,13 +32,7 @@
@@ -1029,7 +1029,7 @@ Subject: [PATCH 0016/1225] reboot: Use power off rather than busy spinning
  1 file changed, 1 insertion(+), 3 deletions(-)
 
 diff --git a/arch/arm/kernel/reboot.c b/arch/arm/kernel/reboot.c
-index bb18ed0539f49..a8595ab97e5b5 100644
+index bb18ed0539f4..a8595ab97e5b 100644
 --- a/arch/arm/kernel/reboot.c
 +++ b/arch/arm/kernel/reboot.c
 @@ -102,9 +102,7 @@ void machine_shutdown(void)
@@ -1057,7 +1057,7 @@ Subject: [PATCH 0017/1225] bcm: Make RASPBERRYPI_POWER depend on PM
  1 file changed, 1 insertion(+)
 
 diff --git a/drivers/soc/bcm/Kconfig b/drivers/soc/bcm/Kconfig
-index 648e32693b7e3..f204562996e27 100644
+index 648e32693b7e..f204562996e2 100644
 --- a/drivers/soc/bcm/Kconfig
 +++ b/drivers/soc/bcm/Kconfig
 @@ -17,6 +17,7 @@ config RASPBERRYPI_POWER
@@ -1086,7 +1086,7 @@ Signed-off-by: Martin Sperl <kernel@martin.sperl.org>
  1 file changed, 13 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c
-index c5486537b9284..5c2eb7f66887d 100644
+index c5486537b928..5c2eb7f66887 100644
 --- a/drivers/clk/bcm/clk-bcm2835.c
 +++ b/drivers/clk/bcm/clk-bcm2835.c
 @@ -2267,8 +2267,15 @@ static int bcm2835_clk_probe(struct platform_device *pdev)
@@ -1134,7 +1134,7 @@ Avoids the 0x40000 cycles of warmup again if firmware has already used it
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/char/hw_random/bcm2835-rng.c b/drivers/char/hw_random/bcm2835-rng.c
-index f759790c3cdb6..1b85ebcbca803 100644
+index f759790c3cdb..1b85ebcbca80 100644
 --- a/drivers/char/hw_random/bcm2835-rng.c
 +++ b/drivers/char/hw_random/bcm2835-rng.c
 @@ -102,8 +102,10 @@ static int bcm2835_rng_init(struct hwrng *rng)
@@ -1169,7 +1169,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  1 file changed, 5 insertions(+)
 
 diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c
-index 5c2eb7f66887d..7f6e174107d1c 100644
+index 5c2eb7f66887..7f6e174107d1 100644
 --- a/drivers/clk/bcm/clk-bcm2835.c
 +++ b/drivers/clk/bcm/clk-bcm2835.c
 @@ -1381,6 +1381,11 @@ bcm2835_register_pll_divider(struct bcm2835_cprman *cprman,
@@ -1206,7 +1206,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  1 file changed, 32 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c
-index 7f6e174107d1c..70b5456529336 100644
+index 7f6e174107d1..70b545652933 100644
 --- a/drivers/clk/bcm/clk-bcm2835.c
 +++ b/drivers/clk/bcm/clk-bcm2835.c
 @@ -1311,6 +1311,8 @@ static const struct clk_ops bcm2835_vpu_clock_clk_ops = {
@@ -1322,7 +1322,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  1 file changed, 38 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c
-index 70b5456529336..9b9d17e9ad5cd 100644
+index 70b545652933..9b9d17e9ad5c 100644
 --- a/drivers/clk/bcm/clk-bcm2835.c
 +++ b/drivers/clk/bcm/clk-bcm2835.c
 @@ -35,6 +35,7 @@
@@ -1438,7 +1438,7 @@ Signed-off-by: Eric Anholt <eric@anholt.net>
  1 file changed, 9 insertions(+)
 
 diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c
-index 9b9d17e9ad5cd..db1df40271c08 100644
+index 9b9d17e9ad5c..db1df40271c0 100644
 --- a/drivers/clk/bcm/clk-bcm2835.c
 +++ b/drivers/clk/bcm/clk-bcm2835.c
 @@ -1472,6 +1472,15 @@ static struct clk_hw *bcm2835_register_clock(struct bcm2835_cprman *cprman,
@@ -1477,7 +1477,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
-index 9df20768a8f29..0b9f9a06bdb52 100644
+index 9df20768a8f2..0b9f9a06bdb5 100644
 --- a/sound/soc/soc-core.c
 +++ b/sound/soc/soc-core.c
 @@ -898,7 +898,7 @@ static int soc_bind_dai_link(struct snd_soc_card *card,
@@ -1564,7 +1564,7 @@ Signed-off-by: Christopher Alexander Tobias Schulze <cat.schulze@alice-dsl.net>
  1 file changed, 19 insertions(+), 6 deletions(-)
 
 diff --git a/arch/arm/vfp/vfpmodule.c b/arch/arm/vfp/vfpmodule.c
-index 2cb355c1b5b71..1e2dcf81aefad 100644
+index 2cb355c1b5b7..1e2dcf81aefa 100644
 --- a/arch/arm/vfp/vfpmodule.c
 +++ b/arch/arm/vfp/vfpmodule.c
 @@ -176,8 +176,11 @@ static int vfp_notifier(struct notifier_block *self, unsigned long cmd, void *v)
@@ -1683,7 +1683,7 @@ Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
  1 file changed, 98 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/i2c/busses/i2c-bcm2835.c b/drivers/i2c/busses/i2c-bcm2835.c
-index 5ab901ad615dd..beb67afa6a3c6 100644
+index 5ab901ad615d..beb67afa6a3c 100644
 --- a/drivers/i2c/busses/i2c-bcm2835.c
 +++ b/drivers/i2c/busses/i2c-bcm2835.c
 @@ -51,6 +51,18 @@
@@ -1855,7 +1855,7 @@ Signed-off-by: Eric Anholt <eric@anholt.net>
  1 file changed, 2 deletions(-)
 
 diff --git a/mm/page_alloc.c b/mm/page_alloc.c
-index 4357f5475a504..0f49656fc449b 100644
+index 4357f5475a50..0f49656fc449 100644
 --- a/mm/page_alloc.c
 +++ b/mm/page_alloc.c
 @@ -8512,8 +8512,6 @@ int alloc_contig_range(unsigned long start, unsigned long end,
@@ -1886,7 +1886,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
-index 229cc89f8c5a5..080a2cec3fa81 100644
+index 229cc89f8c5a..080a2cec3fa8 100644
 --- a/sound/soc/codecs/Kconfig
 +++ b/sound/soc/codecs/Kconfig
 @@ -710,7 +710,7 @@ config SND_SOC_HDAC_HDA
@@ -1925,7 +1925,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  2 files changed, 17 insertions(+), 20 deletions(-)
 
 diff --git a/drivers/irqchip/irq-bcm2835.c b/drivers/irqchip/irq-bcm2835.c
-index 2fccc5cfe9f33..88abd2e67866b 100644
+index 2fccc5cfe9f3..88abd2e67866 100644
 --- a/drivers/irqchip/irq-bcm2835.c
 +++ b/drivers/irqchip/irq-bcm2835.c
 @@ -41,8 +41,6 @@
@@ -1996,7 +1996,7 @@ index 2fccc5cfe9f33..88abd2e67866b 100644
  
  	/* Make a duplicate irq range which is used to enable FIQ */
 diff --git a/drivers/irqchip/irq-bcm2836.c b/drivers/irqchip/irq-bcm2836.c
-index c006a8ac10d53..49642bcd0b75c 100644
+index c006a8ac10d5..49642bcd0b75 100644
 --- a/drivers/irqchip/irq-bcm2836.c
 +++ b/drivers/irqchip/irq-bcm2836.c
 @@ -21,6 +21,9 @@ struct bcm2836_arm_irqchip_intc {
@@ -2037,7 +2037,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  1 file changed, 11 insertions(+)
 
 diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c
-index 71cc5b63d8ced..ba42568316f1b 100644
+index 71cc5b63d8ce..ba42568316f1 100644
 --- a/drivers/net/usb/lan78xx.c
 +++ b/drivers/net/usb/lan78xx.c
 @@ -2461,6 +2461,11 @@ static int lan78xx_reset(struct lan78xx_net *dev)
@@ -2091,7 +2091,7 @@ use the same logic.
  1 file changed, 5 insertions(+)
 
 diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
-index 16720c97a4dde..35dc702fad87a 100644
+index 16720c97a4dd..35dc702fad87 100644
 --- a/drivers/tty/serial/amba-pl011.c
 +++ b/drivers/tty/serial/amba-pl011.c
 @@ -2578,7 +2578,12 @@ static int pl011_setup_port(struct device *dev, struct uart_amba_port *uap,
@@ -2138,7 +2138,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  1 file changed, 21 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
-index 35dc702fad87a..b3e24efac6d81 100644
+index 35dc702fad87..b3e24efac6d8 100644
 --- a/drivers/tty/serial/amba-pl011.c
 +++ b/drivers/tty/serial/amba-pl011.c
 @@ -1653,6 +1653,23 @@ static void pl011_put_poll_char(struct uart_port *port,
@@ -2221,7 +2221,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  1 file changed, 1 insertion(+)
 
 diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
-index b3e24efac6d81..6d953abd37796 100644
+index b3e24efac6d8..6d953abd3779 100644
 --- a/drivers/tty/serial/amba-pl011.c
 +++ b/drivers/tty/serial/amba-pl011.c
 @@ -1386,6 +1386,7 @@ static bool pl011_tx_char(struct uart_amba_port *uap, unsigned char c,
@@ -2258,7 +2258,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  2 files changed, 11 insertions(+)
 
 diff --git a/Documentation/devicetree/bindings/serial/pl011.yaml b/Documentation/devicetree/bindings/serial/pl011.yaml
-index 1a64d59152aad..a4650389eded8 100644
+index 1a64d59152aa..a4650389eded 100644
 --- a/Documentation/devicetree/bindings/serial/pl011.yaml
 +++ b/Documentation/devicetree/bindings/serial/pl011.yaml
 @@ -100,6 +100,12 @@ properties:
@@ -2275,7 +2275,7 @@ index 1a64d59152aad..a4650389eded8 100644
    - compatible
    - reg
 diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
-index 6d953abd37796..ba2029bf1e639 100644
+index 6d953abd3779..ba2029bf1e63 100644
 --- a/drivers/tty/serial/amba-pl011.c
 +++ b/drivers/tty/serial/amba-pl011.c
 @@ -2665,6 +2665,11 @@ static int pl011_probe(struct amba_device *dev, const struct amba_id *id)
@@ -2306,7 +2306,7 @@ Signed-off-by: Noralf Tronnes <notro@tronnes.org>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/pinctrl/bcm/pinctrl-bcm2835.c b/drivers/pinctrl/bcm/pinctrl-bcm2835.c
-index 0de1a3a96984c..76fad11f2ad82 100644
+index 0de1a3a96984..76fad11f2ad8 100644
 --- a/drivers/pinctrl/bcm/pinctrl-bcm2835.c
 +++ b/drivers/pinctrl/bcm/pinctrl-bcm2835.c
 @@ -350,7 +350,7 @@ static const struct gpio_chip bcm2835_gpio_chip = {
@@ -2357,7 +2357,7 @@ board_bcm2835: Remove coherent dma pool increase - API has gone
  4 files changed, 35 insertions(+), 6 deletions(-)
 
 diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig
-index 1feec06357589..34fb06d1b477c 100644
+index 1feec0635758..34fb06d1b477 100644
 --- a/arch/arm/mach-bcm/Kconfig
 +++ b/arch/arm/mach-bcm/Kconfig
 @@ -169,6 +169,7 @@ config ARCH_BCM2835
@@ -2369,7 +2369,7 @@ index 1feec06357589..34fb06d1b477c 100644
  	  This enables support for the Broadcom BCM2835 and BCM2836 SoCs.
  	  This SoC is used in the Raspberry Pi and Roku 2 devices.
 diff --git a/arch/arm/mm/proc-v6.S b/arch/arm/mm/proc-v6.S
-index c1c85eb3484f3..2758125bf2993 100644
+index c1c85eb3484f..2758125bf299 100644
 --- a/arch/arm/mm/proc-v6.S
 +++ b/arch/arm/mm/proc-v6.S
 @@ -70,10 +70,19 @@ ENDPROC(cpu_v6_reset)
@@ -2396,7 +2396,7 @@ index c1c85eb3484f3..2758125bf2993 100644
  
  ENTRY(cpu_v6_dcache_clean_area)
 diff --git a/drivers/irqchip/irq-bcm2835.c b/drivers/irqchip/irq-bcm2835.c
-index 88abd2e67866b..ff7b998579c1e 100644
+index 88abd2e67866..ff7b998579c1 100644
 --- a/drivers/irqchip/irq-bcm2835.c
 +++ b/drivers/irqchip/irq-bcm2835.c
 @@ -43,7 +43,9 @@
@@ -2432,7 +2432,7 @@ index 88abd2e67866b..ff7b998579c1e 100644
  	return 0;
  }
 diff --git a/drivers/mailbox/bcm2835-mailbox.c b/drivers/mailbox/bcm2835-mailbox.c
-index 39761d1905459..9766d8b50778a 100644
+index 39761d190545..9766d8b50778 100644
 --- a/drivers/mailbox/bcm2835-mailbox.c
 +++ b/drivers/mailbox/bcm2835-mailbox.c
 @@ -45,12 +45,15 @@
@@ -3466,7 +3466,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
  create mode 100644 drivers/usb/host/dwc_otg/test/test_sysfs.pl
 
 diff --git a/arch/arm/include/asm/irqflags.h b/arch/arm/include/asm/irqflags.h
-index aeec7f24eb75b..a3b186608c609 100644
+index aeec7f24eb75..a3b186608c60 100644
 --- a/arch/arm/include/asm/irqflags.h
 +++ b/arch/arm/include/asm/irqflags.h
 @@ -163,13 +163,23 @@ static inline unsigned long arch_local_save_flags(void)
@@ -3497,7 +3497,7 @@ index aeec7f24eb75b..a3b186608c609 100644
  		: "r" (flags)
  		: "memory", "cc");
 diff --git a/arch/arm/kernel/fiqasm.S b/arch/arm/kernel/fiqasm.S
-index 8dd26e1a9bd69..eef484756af21 100644
+index 8dd26e1a9bd6..eef484756af2 100644
 --- a/arch/arm/kernel/fiqasm.S
 +++ b/arch/arm/kernel/fiqasm.S
 @@ -47,3 +47,7 @@ ENTRY(__get_fiq_regs)
@@ -3509,7 +3509,7 @@ index 8dd26e1a9bd69..eef484756af21 100644
 +	mov pc, r8
 +ENDPROC(__FIQ_Branch)
 diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile
-index 1c1c1d659394a..68317e5634e8b 100644
+index 1c1c1d659394..68317e5634e8 100644
 --- a/drivers/usb/Makefile
 +++ b/drivers/usb/Makefile
 @@ -9,6 +9,7 @@ obj-$(CONFIG_USB_COMMON)	+= common/
@@ -3521,7 +3521,7 @@ index 1c1c1d659394a..68317e5634e8b 100644
  obj-$(CONFIG_USB_DWC2)		+= dwc2/
  obj-$(CONFIG_USB_ISP1760)	+= isp1760/
 diff --git a/drivers/usb/core/generic.c b/drivers/usb/core/generic.c
-index 38f8b3e317628..64e41961ffb19 100644
+index 38f8b3e31762..64e41961ffb1 100644
 --- a/drivers/usb/core/generic.c
 +++ b/drivers/usb/core/generic.c
 @@ -190,6 +190,7 @@ int usb_choose_configuration(struct usb_device *udev)
@@ -3533,10 +3533,10 @@ index 38f8b3e317628..64e41961ffb19 100644
  	return i;
  }
 diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
-index 4d3de33885ffa..70780b66d0939 100644
+index 3a2d9318604b..cf9d0137f3a6 100644
 --- a/drivers/usb/core/hub.c
 +++ b/drivers/usb/core/hub.c
-@@ -5319,7 +5319,7 @@ static void port_event(struct usb_hub *hub, int port1)
+@@ -5321,7 +5321,7 @@ static void port_event(struct usb_hub *hub, int port1)
  		port_dev->over_current_count++;
  		port_over_current_notify(port_dev);
  
@@ -3546,7 +3546,7 @@ index 4d3de33885ffa..70780b66d0939 100644
  		usb_clear_port_feature(hdev, port1,
  				USB_PORT_FEAT_C_OVER_CURRENT);
 diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
-index 041c68ea329f4..61d9e2a1a4e5a 100644
+index 041c68ea329f..61d9e2a1a4e5 100644
 --- a/drivers/usb/core/message.c
 +++ b/drivers/usb/core/message.c
 @@ -1993,6 +1993,85 @@ int usb_set_configuration(struct usb_device *dev, int configuration)
@@ -3636,7 +3636,7 @@ index 041c68ea329f4..61d9e2a1a4e5a 100644
  	/* Now that the interfaces are installed, re-enable LPM. */
  	usb_unlocked_enable_lpm(dev);
 diff --git a/drivers/usb/core/otg_whitelist.h b/drivers/usb/core/otg_whitelist.h
-index 2ae90158ded72..150d4fa1e09bc 100644
+index 2ae90158ded7..150d4fa1e09b 100644
 --- a/drivers/usb/core/otg_whitelist.h
 +++ b/drivers/usb/core/otg_whitelist.h
 @@ -15,33 +15,82 @@
@@ -3794,7 +3794,7 @@ index 2ae90158ded72..150d4fa1e09bc 100644
  
 diff --git a/drivers/usb/gadget/file_storage.c b/drivers/usb/gadget/file_storage.c
 new file mode 100644
-index 0000000000000..a896d73f7a933
+index 000000000000..a896d73f7a93
 --- /dev/null
 +++ b/drivers/usb/gadget/file_storage.c
 @@ -0,0 +1,3676 @@
@@ -7475,7 +7475,7 @@ index 0000000000000..a896d73f7a933
 +}
 +module_exit(fsg_cleanup);
 diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
-index 79b2e79dddd06..878682cf1a8d5 100644
+index 79b2e79dddd0..878682cf1a8d 100644
 --- a/drivers/usb/host/Kconfig
 +++ b/drivers/usb/host/Kconfig
 @@ -712,6 +712,16 @@ config USB_RENESAS_USBHS_HCD
@@ -7496,7 +7496,7 @@ index 79b2e79dddd06..878682cf1a8d5 100644
         tristate "i.MX21 HCD support"
         depends on ARM && ARCH_MXC
 diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile
-index b191361257cc5..25dda2f0d37e2 100644
+index b191361257cc..25dda2f0d37e 100644
 --- a/drivers/usb/host/Makefile
 +++ b/drivers/usb/host/Makefile
 @@ -79,6 +79,7 @@ obj-$(CONFIG_USB_SL811_HCD)	+= sl811-hcd.o
@@ -7509,7 +7509,7 @@ index b191361257cc5..25dda2f0d37e2 100644
  obj-$(CONFIG_USB_EHCI_FSL)	+= fsl-mph-dr-of.o
 diff --git a/drivers/usb/host/dwc_common_port/Makefile b/drivers/usb/host/dwc_common_port/Makefile
 new file mode 100644
-index 0000000000000..f10d466d1aea8
+index 000000000000..f10d466d1aea
 --- /dev/null
 +++ b/drivers/usb/host/dwc_common_port/Makefile
 @@ -0,0 +1,58 @@
@@ -7573,7 +7573,7 @@ index 0000000000000..f10d466d1aea8
 +	rm -rf *.o *.ko .*.cmd *.mod.c .*.o.d .*.o.tmp modules.order Module.markers Module.symvers .tmp_versions/
 diff --git a/drivers/usb/host/dwc_common_port/Makefile.fbsd b/drivers/usb/host/dwc_common_port/Makefile.fbsd
 new file mode 100644
-index 0000000000000..45db9915b9d31
+index 000000000000..45db9915b9d3
 --- /dev/null
 +++ b/drivers/usb/host/dwc_common_port/Makefile.fbsd
 @@ -0,0 +1,17 @@
@@ -7596,7 +7596,7 @@ index 0000000000000..45db9915b9d31
 +.include <bsd.kmod.mk>
 diff --git a/drivers/usb/host/dwc_common_port/Makefile.linux b/drivers/usb/host/dwc_common_port/Makefile.linux
 new file mode 100644
-index 0000000000000..0cef7b461bd50
+index 000000000000..0cef7b461bd5
 --- /dev/null
 +++ b/drivers/usb/host/dwc_common_port/Makefile.linux
 @@ -0,0 +1,49 @@
@@ -7651,7 +7651,7 @@ index 0000000000000..0cef7b461bd50
 +	rm -rf *.o *.ko .*.cmd *.mod.c .*.o.d .*.o.tmp modules.order Module.markers Module.symvers .tmp_versions/
 diff --git a/drivers/usb/host/dwc_common_port/changes.txt b/drivers/usb/host/dwc_common_port/changes.txt
 new file mode 100644
-index 0000000000000..f6839f92c2760
+index 000000000000..f6839f92c276
 --- /dev/null
 +++ b/drivers/usb/host/dwc_common_port/changes.txt
 @@ -0,0 +1,174 @@
@@ -7831,7 +7831,7 @@ index 0000000000000..f6839f92c2760
 +library code directly into a driver module, instead of as a standalone module.
 diff --git a/drivers/usb/host/dwc_common_port/doc/doxygen.cfg b/drivers/usb/host/dwc_common_port/doc/doxygen.cfg
 new file mode 100644
-index 0000000000000..89aa887af29df
+index 000000000000..89aa887af29d
 --- /dev/null
 +++ b/drivers/usb/host/dwc_common_port/doc/doxygen.cfg
 @@ -0,0 +1,270 @@
@@ -8107,7 +8107,7 @@ index 0000000000000..89aa887af29df
 +SEARCHENGINE           = NO
 diff --git a/drivers/usb/host/dwc_common_port/dwc_cc.c b/drivers/usb/host/dwc_common_port/dwc_cc.c
 new file mode 100644
-index 0000000000000..5ec2ae28698c1
+index 000000000000..5ec2ae28698c
 --- /dev/null
 +++ b/drivers/usb/host/dwc_common_port/dwc_cc.c
 @@ -0,0 +1,532 @@
@@ -8645,7 +8645,7 @@ index 0000000000000..5ec2ae28698c1
 +#endif	/* DWC_CCLIB */
 diff --git a/drivers/usb/host/dwc_common_port/dwc_cc.h b/drivers/usb/host/dwc_common_port/dwc_cc.h
 new file mode 100644
-index 0000000000000..f86e6f21792b9
+index 000000000000..f86e6f21792b
 --- /dev/null
 +++ b/drivers/usb/host/dwc_common_port/dwc_cc.h
 @@ -0,0 +1,224 @@
@@ -8875,7 +8875,7 @@ index 0000000000000..f86e6f21792b9
 +#endif /* _DWC_CC_H_ */
 diff --git a/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c b/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c
 new file mode 100644
-index 0000000000000..6dd04b58f8f6c
+index 000000000000..6dd04b58f8f6
 --- /dev/null
 +++ b/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c
 @@ -0,0 +1,1308 @@
@@ -10189,7 +10189,7 @@ index 0000000000000..6dd04b58f8f6c
 +}
 diff --git a/drivers/usb/host/dwc_common_port/dwc_common_linux.c b/drivers/usb/host/dwc_common_port/dwc_common_linux.c
 new file mode 100644
-index 0000000000000..1460afaf997d7
+index 000000000000..1460afaf997d
 --- /dev/null
 +++ b/drivers/usb/host/dwc_common_port/dwc_common_linux.c
 @@ -0,0 +1,1409 @@
@@ -11604,7 +11604,7 @@ index 0000000000000..1460afaf997d7
 +#endif	/* DWC_LIBMODULE */
 diff --git a/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c b/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c
 new file mode 100644
-index 0000000000000..49b07e1722645
+index 000000000000..49b07e172264
 --- /dev/null
 +++ b/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c
 @@ -0,0 +1,1275 @@
@@ -12885,7 +12885,7 @@ index 0000000000000..49b07e1722645
 +}
 diff --git a/drivers/usb/host/dwc_common_port/dwc_crypto.c b/drivers/usb/host/dwc_common_port/dwc_crypto.c
 new file mode 100644
-index 0000000000000..3b0353296148f
+index 000000000000..3b0353296148
 --- /dev/null
 +++ b/drivers/usb/host/dwc_common_port/dwc_crypto.c
 @@ -0,0 +1,308 @@
@@ -13199,7 +13199,7 @@ index 0000000000000..3b0353296148f
 +#endif	/* DWC_CRYPTOLIB */
 diff --git a/drivers/usb/host/dwc_common_port/dwc_crypto.h b/drivers/usb/host/dwc_common_port/dwc_crypto.h
 new file mode 100644
-index 0000000000000..26fcddcfe9ba4
+index 000000000000..26fcddcfe9ba
 --- /dev/null
 +++ b/drivers/usb/host/dwc_common_port/dwc_crypto.h
 @@ -0,0 +1,111 @@
@@ -13316,7 +13316,7 @@ index 0000000000000..26fcddcfe9ba4
 +#endif /* _DWC_CRYPTO_H_ */
 diff --git a/drivers/usb/host/dwc_common_port/dwc_dh.c b/drivers/usb/host/dwc_common_port/dwc_dh.c
 new file mode 100644
-index 0000000000000..2b429a32aaf09
+index 000000000000..2b429a32aaf0
 --- /dev/null
 +++ b/drivers/usb/host/dwc_common_port/dwc_dh.c
 @@ -0,0 +1,291 @@
@@ -13613,7 +13613,7 @@ index 0000000000000..2b429a32aaf09
 +#endif /* DWC_CRYPTOLIB */
 diff --git a/drivers/usb/host/dwc_common_port/dwc_dh.h b/drivers/usb/host/dwc_common_port/dwc_dh.h
 new file mode 100644
-index 0000000000000..25c1cc0d588a4
+index 000000000000..25c1cc0d588a
 --- /dev/null
 +++ b/drivers/usb/host/dwc_common_port/dwc_dh.h
 @@ -0,0 +1,106 @@
@@ -13725,7 +13725,7 @@ index 0000000000000..25c1cc0d588a4
 +#endif /* _DWC_DH_H_ */
 diff --git a/drivers/usb/host/dwc_common_port/dwc_list.h b/drivers/usb/host/dwc_common_port/dwc_list.h
 new file mode 100644
-index 0000000000000..4ce560df0cae6
+index 000000000000..4ce560df0cae
 --- /dev/null
 +++ b/drivers/usb/host/dwc_common_port/dwc_list.h
 @@ -0,0 +1,594 @@
@@ -14325,7 +14325,7 @@ index 0000000000000..4ce560df0cae6
 +#endif /* _DWC_LIST_H_ */
 diff --git a/drivers/usb/host/dwc_common_port/dwc_mem.c b/drivers/usb/host/dwc_common_port/dwc_mem.c
 new file mode 100644
-index 0000000000000..ad645ff1ba7e0
+index 000000000000..ad645ff1ba7e
 --- /dev/null
 +++ b/drivers/usb/host/dwc_common_port/dwc_mem.c
 @@ -0,0 +1,245 @@
@@ -14576,7 +14576,7 @@ index 0000000000000..ad645ff1ba7e0
 +#endif /* DWC_DEBUG_MEMORY */
 diff --git a/drivers/usb/host/dwc_common_port/dwc_modpow.c b/drivers/usb/host/dwc_common_port/dwc_modpow.c
 new file mode 100644
-index 0000000000000..20045381208a3
+index 000000000000..20045381208a
 --- /dev/null
 +++ b/drivers/usb/host/dwc_common_port/dwc_modpow.c
 @@ -0,0 +1,636 @@
@@ -15218,7 +15218,7 @@ index 0000000000000..20045381208a3
 +#endif /*DWC_CRYPTOLIB */
 diff --git a/drivers/usb/host/dwc_common_port/dwc_modpow.h b/drivers/usb/host/dwc_common_port/dwc_modpow.h
 new file mode 100644
-index 0000000000000..64f00c276e71b
+index 000000000000..64f00c276e71
 --- /dev/null
 +++ b/drivers/usb/host/dwc_common_port/dwc_modpow.h
 @@ -0,0 +1,34 @@
@@ -15258,7 +15258,7 @@ index 0000000000000..64f00c276e71b
 +#endif /* _LINUX_BIGNUM_H */
 diff --git a/drivers/usb/host/dwc_common_port/dwc_notifier.c b/drivers/usb/host/dwc_common_port/dwc_notifier.c
 new file mode 100644
-index 0000000000000..8b3772afe11d1
+index 000000000000..8b3772afe11d
 --- /dev/null
 +++ b/drivers/usb/host/dwc_common_port/dwc_notifier.c
 @@ -0,0 +1,319 @@
@@ -15583,7 +15583,7 @@ index 0000000000000..8b3772afe11d1
 +#endif	/* DWC_NOTIFYLIB */
 diff --git a/drivers/usb/host/dwc_common_port/dwc_notifier.h b/drivers/usb/host/dwc_common_port/dwc_notifier.h
 new file mode 100644
-index 0000000000000..4a8cdfe565b1f
+index 000000000000..4a8cdfe565b1
 --- /dev/null
 +++ b/drivers/usb/host/dwc_common_port/dwc_notifier.h
 @@ -0,0 +1,122 @@
@@ -15711,7 +15711,7 @@ index 0000000000000..4a8cdfe565b1f
 +#endif /* __DWC_NOTIFIER_H__ */
 diff --git a/drivers/usb/host/dwc_common_port/dwc_os.h b/drivers/usb/host/dwc_common_port/dwc_os.h
 new file mode 100644
-index 0000000000000..9a86d299403bd
+index 000000000000..9a86d299403b
 --- /dev/null
 +++ b/drivers/usb/host/dwc_common_port/dwc_os.h
 @@ -0,0 +1,1276 @@
@@ -16993,7 +16993,7 @@ index 0000000000000..9a86d299403bd
 +#endif /* _DWC_OS_H_ */
 diff --git a/drivers/usb/host/dwc_common_port/usb.h b/drivers/usb/host/dwc_common_port/usb.h
 new file mode 100644
-index 0000000000000..27bda82dac2eb
+index 000000000000..27bda82dac2e
 --- /dev/null
 +++ b/drivers/usb/host/dwc_common_port/usb.h
 @@ -0,0 +1,946 @@
@@ -17945,7 +17945,7 @@ index 0000000000000..27bda82dac2eb
 +#endif /* _USB_H_ */
 diff --git a/drivers/usb/host/dwc_otg/Makefile b/drivers/usb/host/dwc_otg/Makefile
 new file mode 100644
-index 0000000000000..7ea65a6bcdb7a
+index 000000000000..7ea65a6bcdb7
 --- /dev/null
 +++ b/drivers/usb/host/dwc_otg/Makefile
 @@ -0,0 +1,85 @@
@@ -18036,7 +18036,7 @@ index 0000000000000..7ea65a6bcdb7a
 +endif
 diff --git a/drivers/usb/host/dwc_otg/doc/doxygen.cfg b/drivers/usb/host/dwc_otg/doc/doxygen.cfg
 new file mode 100644
-index 0000000000000..712b057ef7c29
+index 000000000000..712b057ef7c2
 --- /dev/null
 +++ b/drivers/usb/host/dwc_otg/doc/doxygen.cfg
 @@ -0,0 +1,224 @@
@@ -18266,7 +18266,7 @@ index 0000000000000..712b057ef7c29
 +SEARCHENGINE           = NO
 diff --git a/drivers/usb/host/dwc_otg/dummy_audio.c b/drivers/usb/host/dwc_otg/dummy_audio.c
 new file mode 100644
-index 0000000000000..f827102fa6441
+index 000000000000..f827102fa644
 --- /dev/null
 +++ b/drivers/usb/host/dwc_otg/dummy_audio.c
 @@ -0,0 +1,1574 @@
@@ -19846,7 +19846,7 @@ index 0000000000000..f827102fa6441
 +module_exit (cleanup);
 diff --git a/drivers/usb/host/dwc_otg/dwc_cfi_common.h b/drivers/usb/host/dwc_otg/dwc_cfi_common.h
 new file mode 100644
-index 0000000000000..7770e201ad3bd
+index 000000000000..7770e201ad3b
 --- /dev/null
 +++ b/drivers/usb/host/dwc_otg/dwc_cfi_common.h
 @@ -0,0 +1,142 @@
@@ -19994,7 +19994,7 @@ index 0000000000000..7770e201ad3bd
 +#endif
 diff --git a/drivers/usb/host/dwc_otg/dwc_otg_adp.c b/drivers/usb/host/dwc_otg/dwc_otg_adp.c
 new file mode 100644
-index 0000000000000..ce0618dd3f4a6
+index 000000000000..ce0618dd3f4a
 --- /dev/null
 +++ b/drivers/usb/host/dwc_otg/dwc_otg_adp.c
 @@ -0,0 +1,854 @@
@@ -20854,7 +20854,7 @@ index 0000000000000..ce0618dd3f4a6
 +}
 diff --git a/drivers/usb/host/dwc_otg/dwc_otg_adp.h b/drivers/usb/host/dwc_otg/dwc_otg_adp.h
 new file mode 100644
-index 0000000000000..4110b25d2002e
+index 000000000000..4110b25d2002
 --- /dev/null
 +++ b/drivers/usb/host/dwc_otg/dwc_otg_adp.h
 @@ -0,0 +1,80 @@
@@ -20940,7 +20940,7 @@ index 0000000000000..4110b25d2002e
 +#endif //__DWC_OTG_ADP_H__
 diff --git a/drivers/usb/host/dwc_otg/dwc_otg_attr.c b/drivers/usb/host/dwc_otg/dwc_otg_attr.c
 new file mode 100644
-index 0000000000000..2f8ea77c3892b
+index 000000000000..2f8ea77c3892
 --- /dev/null
 +++ b/drivers/usb/host/dwc_otg/dwc_otg_attr.c
 @@ -0,0 +1,1212 @@
@@ -22158,7 +22158,7 @@ index 0000000000000..2f8ea77c3892b
 +}
 diff --git a/drivers/usb/host/dwc_otg/dwc_otg_attr.h b/drivers/usb/host/dwc_otg/dwc_otg_attr.h
 new file mode 100644
-index 0000000000000..e10b67f97c522
+index 000000000000..e10b67f97c52
 --- /dev/null
 +++ b/drivers/usb/host/dwc_otg/dwc_otg_attr.h
 @@ -0,0 +1,89 @@
@@ -22253,7 +22253,7 @@ index 0000000000000..e10b67f97c522
 +#endif
 diff --git a/drivers/usb/host/dwc_otg/dwc_otg_cfi.c b/drivers/usb/host/dwc_otg/dwc_otg_cfi.c
 new file mode 100644
-index 0000000000000..bbb3d32093d02
+index 000000000000..bbb3d32093d0
 --- /dev/null
 +++ b/drivers/usb/host/dwc_otg/dwc_otg_cfi.c
 @@ -0,0 +1,1876 @@
@@ -24135,7 +24135,7 @@ index 0000000000000..bbb3d32093d02
 +#endif //DWC_UTE_CFI
 diff --git a/drivers/usb/host/dwc_otg/dwc_otg_cfi.h b/drivers/usb/host/dwc_otg/dwc_otg_cfi.h
 new file mode 100644
-index 0000000000000..55fd337a283c3
+index 000000000000..55fd337a283c
 --- /dev/null
 +++ b/drivers/usb/host/dwc_otg/dwc_otg_cfi.h
 @@ -0,0 +1,320 @@
@@ -24461,7 +24461,7 @@ index 0000000000000..55fd337a283c3
 +#endif /* (__DWC_OTG_CFI_H__) */
 diff --git a/drivers/usb/host/dwc_otg/dwc_otg_cil.c b/drivers/usb/host/dwc_otg/dwc_otg_cil.c
 new file mode 100644
-index 0000000000000..14300ad0f2af7
+index 000000000000..14300ad0f2af
 --- /dev/null
 +++ b/drivers/usb/host/dwc_otg/dwc_otg_cil.c
 @@ -0,0 +1,7146 @@
@@ -31613,7 +31613,7 @@ index 0000000000000..14300ad0f2af7
 +}
 diff --git a/drivers/usb/host/dwc_otg/dwc_otg_cil.h b/drivers/usb/host/dwc_otg/dwc_otg_cil.h
 new file mode 100644
-index 0000000000000..79dbf8374f023
+index 000000000000..79dbf8374f02
 --- /dev/null
 +++ b/drivers/usb/host/dwc_otg/dwc_otg_cil.h
 @@ -0,0 +1,1464 @@
@@ -33083,7 +33083,7 @@ index 0000000000000..79dbf8374f023
 +#endif
 diff --git a/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c b/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c
 new file mode 100644
-index 0000000000000..799ab14b9edad
+index 000000000000..799ab14b9eda
 --- /dev/null
 +++ b/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c
 @@ -0,0 +1,1601 @@
@@ -34690,7 +34690,7 @@ index 0000000000000..799ab14b9edad
 +}
 diff --git a/drivers/usb/host/dwc_otg/dwc_otg_core_if.h b/drivers/usb/host/dwc_otg/dwc_otg_core_if.h
 new file mode 100644
-index 0000000000000..4138fd173337d
+index 000000000000..4138fd173337
 --- /dev/null
 +++ b/drivers/usb/host/dwc_otg/dwc_otg_core_if.h
 @@ -0,0 +1,705 @@
@@ -35401,7 +35401,7 @@ index 0000000000000..4138fd173337d
 +#endif				/* __DWC_CORE_IF_H__ */
 diff --git a/drivers/usb/host/dwc_otg/dwc_otg_dbg.h b/drivers/usb/host/dwc_otg/dwc_otg_dbg.h
 new file mode 100644
-index 0000000000000..ccc24e010e449
+index 000000000000..ccc24e010e44
 --- /dev/null
 +++ b/drivers/usb/host/dwc_otg/dwc_otg_dbg.h
 @@ -0,0 +1,117 @@
@@ -35524,7 +35524,7 @@ index 0000000000000..ccc24e010e449
 +#endif
 diff --git a/drivers/usb/host/dwc_otg/dwc_otg_driver.c b/drivers/usb/host/dwc_otg/dwc_otg_driver.c
 new file mode 100644
-index 0000000000000..fa063804931f3
+index 000000000000..fa063804931f
 --- /dev/null
 +++ b/drivers/usb/host/dwc_otg/dwc_otg_driver.c
 @@ -0,0 +1,1772 @@
@@ -37302,7 +37302,7 @@ index 0000000000000..fa063804931f3
 +*/
 diff --git a/drivers/usb/host/dwc_otg/dwc_otg_driver.h b/drivers/usb/host/dwc_otg/dwc_otg_driver.h
 new file mode 100644
-index 0000000000000..6a8be63a0ab20
+index 000000000000..6a8be63a0ab2
 --- /dev/null
 +++ b/drivers/usb/host/dwc_otg/dwc_otg_driver.h
 @@ -0,0 +1,86 @@
@@ -37394,7 +37394,7 @@ index 0000000000000..6a8be63a0ab20
 +#endif
 diff --git a/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c b/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c
 new file mode 100644
-index 0000000000000..a86d8ed771409
+index 000000000000..a86d8ed77140
 --- /dev/null
 +++ b/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c
 @@ -0,0 +1,1425 @@
@@ -38825,7 +38825,7 @@ index 0000000000000..a86d8ed771409
 +}
 diff --git a/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.h b/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.h
 new file mode 100644
-index 0000000000000..537cc237b4bca
+index 000000000000..537cc237b4bc
 --- /dev/null
 +++ b/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.h
 @@ -0,0 +1,399 @@
@@ -39230,7 +39230,7 @@ index 0000000000000..537cc237b4bca
 +#endif /* DWC_OTG_FIQ_FSM_H_ */
 diff --git a/drivers/usb/host/dwc_otg/dwc_otg_fiq_stub.S b/drivers/usb/host/dwc_otg/dwc_otg_fiq_stub.S
 new file mode 100644
-index 0000000000000..ffa8d21bc61e8
+index 000000000000..ffa8d21bc61e
 --- /dev/null
 +++ b/drivers/usb/host/dwc_otg/dwc_otg_fiq_stub.S
 @@ -0,0 +1,80 @@
@@ -39316,7 +39316,7 @@ index 0000000000000..ffa8d21bc61e8
 +END(_dwc_otg_fiq_stub)
 diff --git a/drivers/usb/host/dwc_otg/dwc_otg_hcd.c b/drivers/usb/host/dwc_otg/dwc_otg_hcd.c
 new file mode 100644
-index 0000000000000..9f2cd510c3015
+index 000000000000..9f2cd510c301
 --- /dev/null
 +++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd.c
 @@ -0,0 +1,4327 @@
@@ -43649,7 +43649,7 @@ index 0000000000000..9f2cd510c3015
 +#endif /* DWC_DEVICE_ONLY */
 diff --git a/drivers/usb/host/dwc_otg/dwc_otg_hcd.h b/drivers/usb/host/dwc_otg/dwc_otg_hcd.h
 new file mode 100644
-index 0000000000000..5ed8dccf03959
+index 000000000000..5ed8dccf0395
 --- /dev/null
 +++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd.h
 @@ -0,0 +1,870 @@
@@ -44525,7 +44525,7 @@ index 0000000000000..5ed8dccf03959
 +#endif /* DWC_DEVICE_ONLY */
 diff --git a/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c b/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c
 new file mode 100644
-index 0000000000000..bd8a204037134
+index 000000000000..bd8a20403713
 --- /dev/null
 +++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c
 @@ -0,0 +1,1134 @@
@@ -45665,7 +45665,7 @@ index 0000000000000..bd8a204037134
 +#endif /* DWC_DEVICE_ONLY */
 diff --git a/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h b/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h
 new file mode 100644
-index 0000000000000..a384db5e7ac21
+index 000000000000..a384db5e7ac2
 --- /dev/null
 +++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h
 @@ -0,0 +1,421 @@
@@ -46092,7 +46092,7 @@ index 0000000000000..a384db5e7ac21
 +#endif /* DWC_DEVICE_ONLY */
 diff --git a/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c b/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c
 new file mode 100644
-index 0000000000000..d3097ef3728ca
+index 000000000000..d3097ef3728c
 --- /dev/null
 +++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c
 @@ -0,0 +1,2757 @@
@@ -48855,7 +48855,7 @@ index 0000000000000..d3097ef3728ca
 +#endif /* DWC_DEVICE_ONLY */
 diff --git a/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c b/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c
 new file mode 100644
-index 0000000000000..9a150d6fdeb43
+index 000000000000..9a150d6fdeb4
 --- /dev/null
 +++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c
 @@ -0,0 +1,1083 @@
@@ -49944,7 +49944,7 @@ index 0000000000000..9a150d6fdeb43
 +#endif /* DWC_DEVICE_ONLY */
 diff --git a/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c b/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c
 new file mode 100644
-index 0000000000000..2823dc9af63f1
+index 000000000000..2823dc9af63f
 --- /dev/null
 +++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c
 @@ -0,0 +1,970 @@
@@ -50920,7 +50920,7 @@ index 0000000000000..2823dc9af63f1
 +#endif /* DWC_DEVICE_ONLY */
 diff --git a/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h b/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h
 new file mode 100644
-index 0000000000000..0e9a34fe3a5c8
+index 000000000000..0e9a34fe3a5c
 --- /dev/null
 +++ b/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h
 @@ -0,0 +1,199 @@
@@ -51125,7 +51125,7 @@ index 0000000000000..0e9a34fe3a5c8
 +#endif /* _DWC_OS_DEP_H_ */
 diff --git a/drivers/usb/host/dwc_otg/dwc_otg_pcd.c b/drivers/usb/host/dwc_otg/dwc_otg_pcd.c
 new file mode 100644
-index 0000000000000..9dabbe5c9791c
+index 000000000000..9dabbe5c9791
 --- /dev/null
 +++ b/drivers/usb/host/dwc_otg/dwc_otg_pcd.c
 @@ -0,0 +1,2725 @@
@@ -53856,7 +53856,7 @@ index 0000000000000..9dabbe5c9791c
 +#endif /* DWC_HOST_ONLY */
 diff --git a/drivers/usb/host/dwc_otg/dwc_otg_pcd.h b/drivers/usb/host/dwc_otg/dwc_otg_pcd.h
 new file mode 100644
-index 0000000000000..a70ebd049d2cc
+index 000000000000..a70ebd049d2c
 --- /dev/null
 +++ b/drivers/usb/host/dwc_otg/dwc_otg_pcd.h
 @@ -0,0 +1,273 @@
@@ -54135,7 +54135,7 @@ index 0000000000000..a70ebd049d2cc
 +#endif /* DWC_HOST_ONLY */
 diff --git a/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h b/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h
 new file mode 100644
-index 0000000000000..4c1d591fbc098
+index 000000000000..4c1d591fbc09
 --- /dev/null
 +++ b/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h
 @@ -0,0 +1,361 @@
@@ -54502,7 +54502,7 @@ index 0000000000000..4c1d591fbc098
 +#endif				/* DWC_HOST_ONLY */
 diff --git a/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c b/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c
 new file mode 100644
-index 0000000000000..e55ea9c74be46
+index 000000000000..e55ea9c74be4
 --- /dev/null
 +++ b/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c
 @@ -0,0 +1,5148 @@
@@ -59656,7 +59656,7 @@ index 0000000000000..e55ea9c74be46
 +#endif /* DWC_HOST_ONLY */
 diff --git a/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c b/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c
 new file mode 100644
-index 0000000000000..a5ed8e83711db
+index 000000000000..a5ed8e83711d
 --- /dev/null
 +++ b/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c
 @@ -0,0 +1,1262 @@
@@ -60924,7 +60924,7 @@ index 0000000000000..a5ed8e83711db
 +#endif /* DWC_HOST_ONLY */
 diff --git a/drivers/usb/host/dwc_otg/dwc_otg_regs.h b/drivers/usb/host/dwc_otg/dwc_otg_regs.h
 new file mode 100644
-index 0000000000000..8e0e7b569f1ac
+index 000000000000..8e0e7b569f1a
 --- /dev/null
 +++ b/drivers/usb/host/dwc_otg/dwc_otg_regs.h
 @@ -0,0 +1,2550 @@
@@ -63480,7 +63480,7 @@ index 0000000000000..8e0e7b569f1ac
 +#endif
 diff --git a/drivers/usb/host/dwc_otg/test/Makefile b/drivers/usb/host/dwc_otg/test/Makefile
 new file mode 100644
-index 0000000000000..fc453759dea3e
+index 000000000000..fc453759dea3
 --- /dev/null
 +++ b/drivers/usb/host/dwc_otg/test/Makefile
 @@ -0,0 +1,16 @@
@@ -63502,7 +63502,7 @@ index 0000000000000..fc453759dea3e
 +	done
 diff --git a/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm b/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm
 new file mode 100644
-index 0000000000000..85e55fd6ddbc7
+index 000000000000..85e55fd6ddbc
 --- /dev/null
 +++ b/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm
 @@ -0,0 +1,337 @@
@@ -63845,7 +63845,7 @@ index 0000000000000..85e55fd6ddbc7
 +1;
 diff --git a/drivers/usb/host/dwc_otg/test/test_mod_param.pl b/drivers/usb/host/dwc_otg/test/test_mod_param.pl
 new file mode 100644
-index 0000000000000..dc3820df577ba
+index 000000000000..dc3820df577b
 --- /dev/null
 +++ b/drivers/usb/host/dwc_otg/test/test_mod_param.pl
 @@ -0,0 +1,133 @@
@@ -63984,7 +63984,7 @@ index 0000000000000..dc3820df577ba
 +0;
 diff --git a/drivers/usb/host/dwc_otg/test/test_sysfs.pl b/drivers/usb/host/dwc_otg/test/test_sysfs.pl
 new file mode 100644
-index 0000000000000..cdc9963176e5a
+index 000000000000..cdc9963176e5
 --- /dev/null
 +++ b/drivers/usb/host/dwc_otg/test/test_sysfs.pl
 @@ -0,0 +1,193 @@
@@ -64291,7 +64291,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  create mode 100644 drivers/video/fbdev/bcm2708_fb.c
 
 diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig
-index a7e5f12687b70..148521ffe8c65 100644
+index a7e5f12687b7..148521ffe8c6 100644
 --- a/drivers/video/fbdev/Kconfig
 +++ b/drivers/video/fbdev/Kconfig
 @@ -219,6 +219,20 @@ config FB_TILEBLITTING
@@ -64316,7 +64316,7 @@ index a7e5f12687b70..148521ffe8c65 100644
  	tristate "Aeroflex Gaisler framebuffer support"
  	depends on FB && SPARC
 diff --git a/drivers/video/fbdev/Makefile b/drivers/video/fbdev/Makefile
-index aa6352798cf4e..9f4d79be632bb 100644
+index aa6352798cf4..9f4d79be632b 100644
 --- a/drivers/video/fbdev/Makefile
 +++ b/drivers/video/fbdev/Makefile
 @@ -11,6 +11,7 @@ obj-$(CONFIG_FB_MACMODES)      += macmodes.o
@@ -64329,7 +64329,7 @@ index aa6352798cf4e..9f4d79be632bb 100644
  obj-$(CONFIG_FB_CLPS711X)	  += clps711x-fb.o
 diff --git a/drivers/video/fbdev/bcm2708_fb.c b/drivers/video/fbdev/bcm2708_fb.c
 new file mode 100644
-index 0000000000000..fc49714a47c79
+index 000000000000..fc49714a47c7
 --- /dev/null
 +++ b/drivers/video/fbdev/bcm2708_fb.c
 @@ -0,0 +1,928 @@
@@ -65262,7 +65262,7 @@ index 0000000000000..fc49714a47c79
 +MODULE_PARM_DESC(fbdepth, "Bit depth of ARM Framebuffer");
 +MODULE_PARM_DESC(fbswap, "Swap order of red and blue in 24 and 32 bit modes");
 diff --git a/drivers/video/logo/logo_linux_clut224.ppm b/drivers/video/logo/logo_linux_clut224.ppm
-index 3c14e43b82fef..7626beb6a5bb8 100644
+index 3c14e43b82fe..7626beb6a5bb 100644
 --- a/drivers/video/logo/logo_linux_clut224.ppm
 +++ b/drivers/video/logo/logo_linux_clut224.ppm
 @@ -1,1604 +1,883 @@
@@ -67752,7 +67752,7 @@ index 3c14e43b82fef..7626beb6a5bb8 100644
 +0 0 0  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
 +0 0 0  0 0 0  0 0 0
 diff --git a/include/soc/bcm2835/raspberrypi-firmware.h b/include/soc/bcm2835/raspberrypi-firmware.h
-index 3f357c05788e8..a5f3fff6773e6 100644
+index 3f357c05788e..a5f3fff6773e 100644
 --- a/include/soc/bcm2835/raspberrypi-firmware.h
 +++ b/include/soc/bcm2835/raspberrypi-firmware.h
 @@ -123,6 +123,7 @@ enum rpi_firmware_property_tag {
@@ -67779,7 +67779,7 @@ Subject: [PATCH 0039/1225] Pulled in the multi frame buffer support from the
  2 files changed, 343 insertions(+), 137 deletions(-)
 
 diff --git a/drivers/video/fbdev/bcm2708_fb.c b/drivers/video/fbdev/bcm2708_fb.c
-index fc49714a47c79..a6d0ca46f28b1 100644
+index fc49714a47c7..a6d0ca46f28b 100644
 --- a/drivers/video/fbdev/bcm2708_fb.c
 +++ b/drivers/video/fbdev/bcm2708_fb.c
 @@ -2,6 +2,7 @@
@@ -68562,7 +68562,7 @@ index fc49714a47c79..a6d0ca46f28b1 100644
  
  static int __init bcm2708_fb_init(void)
 diff --git a/include/soc/bcm2835/raspberrypi-firmware.h b/include/soc/bcm2835/raspberrypi-firmware.h
-index a5f3fff6773e6..25fca695f9039 100644
+index a5f3fff6773e..25fca695f903 100644
 --- a/include/soc/bcm2835/raspberrypi-firmware.h
 +++ b/include/soc/bcm2835/raspberrypi-firmware.h
 @@ -106,9 +106,15 @@ enum rpi_firmware_property_tag {
@@ -68645,7 +68645,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  3 files changed, 213 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/video/fbdev/bcm2708_fb.c b/drivers/video/fbdev/bcm2708_fb.c
-index a6d0ca46f28b1..8234207b1914b 100644
+index a6d0ca46f28b..8234207b1914 100644
 --- a/drivers/video/fbdev/bcm2708_fb.c
 +++ b/drivers/video/fbdev/bcm2708_fb.c
 @@ -32,8 +32,10 @@
@@ -68853,7 +68853,7 @@ index a6d0ca46f28b1..8234207b1914b 100644
  
  static int bcm2708_fb_register(struct bcm2708_fb *fb)
 diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c
-index bf76dadbed87f..b30252ec67224 100644
+index bf76dadbed87..b30252ec6722 100644
 --- a/drivers/video/fbdev/core/fbmem.c
 +++ b/drivers/video/fbdev/core/fbmem.c
 @@ -1076,6 +1076,30 @@ fb_blank(struct fb_info *info, int blank)
@@ -68920,7 +68920,7 @@ index bf76dadbed87f..b30252ec67224 100644
  		/* fall through */
  	case FBIOBLANK:
 diff --git a/include/uapi/linux/fb.h b/include/uapi/linux/fb.h
-index b6aac7ee1f670..212b7d5cb94c1 100644
+index b6aac7ee1f67..212b7d5cb94c 100644
 --- a/include/uapi/linux/fb.h
 +++ b/include/uapi/linux/fb.h
 @@ -35,6 +35,12 @@
@@ -68988,7 +68988,7 @@ Signed-off-by: Harm Hanemaaijer <fgenfb@yahoo.com>
  1 file changed, 147 insertions(+), 5 deletions(-)
 
 diff --git a/drivers/video/fbdev/core/cfbimgblt.c b/drivers/video/fbdev/core/cfbimgblt.c
-index a2bb276a8b246..436494fba15ab 100644
+index a2bb276a8b24..436494fba15a 100644
 --- a/drivers/video/fbdev/core/cfbimgblt.c
 +++ b/drivers/video/fbdev/core/cfbimgblt.c
 @@ -28,6 +28,11 @@
@@ -69347,10 +69347,10 @@ Signed-off-by: Andrei Gherzan <andrei@gherzan.com>
  create mode 100644 include/linux/platform_data/dma-bcm2708.h
 
 diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
-index 112e08cedcd56..20731f4e5f7b5 100644
+index d3e9a2ab6dd0..b91825aaf3d8 100644
 --- a/drivers/dma/Kconfig
 +++ b/drivers/dma/Kconfig
-@@ -133,7 +133,7 @@ config COH901318
+@@ -134,7 +134,7 @@ config COH901318
  
  config DMA_BCM2835
  	tristate "BCM2835 DMA engine support"
@@ -69359,7 +69359,7 @@ index 112e08cedcd56..20731f4e5f7b5 100644
  	select DMA_ENGINE
  	select DMA_VIRTUAL_CHANNELS
  
-@@ -608,6 +608,10 @@ config UNIPHIER_MDMAC
+@@ -609,6 +609,10 @@ config UNIPHIER_MDMAC
  	  UniPhier platform.  This DMA controller is used as the external
  	  DMA engine of the SD/eMMC controllers of the LD4, Pro4, sLD8 SoCs.
  
@@ -69371,7 +69371,7 @@ index 112e08cedcd56..20731f4e5f7b5 100644
  	tristate "APM X-Gene DMA support"
  	depends on ARCH_XGENE || COMPILE_TEST
 diff --git a/drivers/dma/Makefile b/drivers/dma/Makefile
-index f5ce8665e944e..b27ea1ae6e099 100644
+index f5ce8665e944..b27ea1ae6e09 100644
 --- a/drivers/dma/Makefile
 +++ b/drivers/dma/Makefile
 @@ -21,6 +21,7 @@ obj-$(CONFIG_AT_XDMAC) += at_xdmac.o
@@ -69384,7 +69384,7 @@ index f5ce8665e944e..b27ea1ae6e099 100644
  obj-$(CONFIG_DMA_SA11X0) += sa11x0-dma.o
 diff --git a/drivers/dma/bcm2708-dmaengine.c b/drivers/dma/bcm2708-dmaengine.c
 new file mode 100644
-index 0000000000000..075da9aadf6d6
+index 000000000000..075da9aadf6d
 --- /dev/null
 +++ b/drivers/dma/bcm2708-dmaengine.c
 @@ -0,0 +1,281 @@
@@ -69671,7 +69671,7 @@ index 0000000000000..075da9aadf6d6
 +MODULE_LICENSE("GPL");
 diff --git a/include/linux/platform_data/dma-bcm2708.h b/include/linux/platform_data/dma-bcm2708.h
 new file mode 100644
-index 0000000000000..6ca874d332a8b
+index 000000000000..6ca874d332a8
 --- /dev/null
 +++ b/include/linux/platform_data/dma-bcm2708.h
 @@ -0,0 +1,143 @@
@@ -70031,7 +70031,7 @@ Signed-off-by: Yaroslav Rosomakho <yaroslavros@gmail.com>
  create mode 100644 drivers/mmc/host/bcm2835-mmc.c
 
 diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c
-index 63e838ec8af84..91f718cf24cb2 100644
+index 39f2864455a6..a656608b306e 100644
 --- a/drivers/mmc/core/block.c
 +++ b/drivers/mmc/core/block.c
 @@ -166,6 +166,13 @@ static DEFINE_MUTEX(open_lock);
@@ -70048,7 +70048,7 @@ index 63e838ec8af84..91f718cf24cb2 100644
  static inline int mmc_blk_part_switch(struct mmc_card *card,
  				      unsigned int part_type);
  
-@@ -2868,6 +2875,7 @@ static int mmc_blk_probe(struct mmc_card *card)
+@@ -2884,6 +2891,7 @@ static int mmc_blk_probe(struct mmc_card *card)
  {
  	struct mmc_blk_data *md, *part_md;
  	char cap_str[10];
@@ -70056,7 +70056,7 @@ index 63e838ec8af84..91f718cf24cb2 100644
  
  	/*
  	 * Check that the card supports the command class(es) we need.
-@@ -2875,7 +2883,16 @@ static int mmc_blk_probe(struct mmc_card *card)
+@@ -2891,7 +2899,16 @@ static int mmc_blk_probe(struct mmc_card *card)
  	if (!(card->csd.cmdclass & CCC_BLOCK_READ))
  		return -ENODEV;
  
@@ -70074,7 +70074,7 @@ index 63e838ec8af84..91f718cf24cb2 100644
  
  	card->complete_wq = alloc_workqueue("mmc_complete",
  					WQ_MEM_RECLAIM | WQ_HIGHPRI, 0);
-@@ -2890,9 +2907,14 @@ static int mmc_blk_probe(struct mmc_card *card)
+@@ -2906,9 +2923,14 @@ static int mmc_blk_probe(struct mmc_card *card)
  
  	string_get_size((u64)get_capacity(md->disk), 512, STRING_UNITS_2,
  			cap_str, sizeof(cap_str));
@@ -70092,7 +70092,7 @@ index 63e838ec8af84..91f718cf24cb2 100644
  	if (mmc_blk_alloc_parts(card, md))
  		goto out;
 diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
-index 26644b7ec13e3..331a4e6b9f04d 100644
+index 460a456bcdd2..861d6e1cf720 100644
 --- a/drivers/mmc/core/core.c
 +++ b/drivers/mmc/core/core.c
 @@ -1922,7 +1922,8 @@ EXPORT_SYMBOL(mmc_erase);
@@ -70106,10 +70106,10 @@ index 26644b7ec13e3..331a4e6b9f04d 100644
  	return 0;
  }
 diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c
-index b3484def0a8b0..8e67114e846bd 100644
+index f7339590a84c..7dbe27ace29b 100644
 --- a/drivers/mmc/core/host.c
 +++ b/drivers/mmc/core/host.c
-@@ -397,15 +397,30 @@ struct mmc_host *mmc_alloc_host(int extra, struct device *dev)
+@@ -434,15 +434,30 @@ struct mmc_host *mmc_alloc_host(int extra, struct device *dev)
  {
  	int err;
  	struct mmc_host *host;
@@ -70142,7 +70142,7 @@ index b3484def0a8b0..8e67114e846bd 100644
  		kfree(host);
  		return NULL;
 diff --git a/drivers/mmc/core/quirks.h b/drivers/mmc/core/quirks.h
-index 3dba15bccce25..37b80e1a7ed4c 100644
+index 3dba15bccce2..37b80e1a7ed4 100644
 --- a/drivers/mmc/core/quirks.h
 +++ b/drivers/mmc/core/quirks.h
 @@ -99,6 +99,14 @@ static const struct mmc_fixup mmc_blk_fixups[] = {
@@ -70161,7 +70161,7 @@ index 3dba15bccce25..37b80e1a7ed4c 100644
  };
  
 diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
-index 49ea02c467bf1..cc4907051e81b 100644
+index 49ea02c467bf..cc4907051e81 100644
 --- a/drivers/mmc/host/Kconfig
 +++ b/drivers/mmc/host/Kconfig
 @@ -5,6 +5,35 @@
@@ -70201,7 +70201,7 @@ index 49ea02c467bf1..cc4907051e81b 100644
  	bool "MMC host drivers debugging"
  	depends on MMC != n
 diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile
-index 11c4598e91d93..5691eacd8988a 100644
+index 11c4598e91d9..5691eacd8988 100644
 --- a/drivers/mmc/host/Makefile
 +++ b/drivers/mmc/host/Makefile
 @@ -23,6 +23,7 @@ obj-$(CONFIG_MMC_SDHCI_SIRF)   	+= sdhci-sirf.o
@@ -70214,7 +70214,7 @@ index 11c4598e91d93..5691eacd8988a 100644
  obj-$(CONFIG_MMC_ALCOR)	+= alcor.o
 diff --git a/drivers/mmc/host/bcm2835-mmc.c b/drivers/mmc/host/bcm2835-mmc.c
 new file mode 100644
-index 0000000000000..ba30cc4b26535
+index 000000000000..ba30cc4b2653
 --- /dev/null
 +++ b/drivers/mmc/host/bcm2835-mmc.c
 @@ -0,0 +1,1576 @@
@@ -71795,7 +71795,7 @@ index 0000000000000..ba30cc4b26535
 +MODULE_LICENSE("GPL v2");
 +MODULE_AUTHOR("Gellert Weisz");
 diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h
-index cf3780a6ccc4b..dc3fedec75d7b 100644
+index cf3780a6ccc4..dc3fedec75d7 100644
 --- a/include/linux/mmc/card.h
 +++ b/include/linux/mmc/card.h
 @@ -270,6 +270,8 @@ struct mmc_card {
@@ -72058,7 +72058,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  create mode 100644 drivers/mmc/host/bcm2835-sdhost.c
 
 diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
-index cc4907051e81b..fe56ca6722652 100644
+index cc4907051e81..fe56ca672265 100644
 --- a/drivers/mmc/host/Kconfig
 +++ b/drivers/mmc/host/Kconfig
 @@ -34,6 +34,16 @@ config MMC_BCM2835_PIO_DMA_BARRIER
@@ -72079,7 +72079,7 @@ index cc4907051e81b..fe56ca6722652 100644
  	bool "MMC host drivers debugging"
  	depends on MMC != n
 diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile
-index 5691eacd8988a..2dafa906f48c6 100644
+index 5691eacd8988..2dafa906f48c 100644
 --- a/drivers/mmc/host/Makefile
 +++ b/drivers/mmc/host/Makefile
 @@ -24,6 +24,7 @@ obj-$(CONFIG_MMC_SDHCI_F_SDH30)	+= sdhci_f_sdh30.o
@@ -72092,7 +72092,7 @@ index 5691eacd8988a..2dafa906f48c6 100644
  obj-$(CONFIG_MMC_ALCOR)	+= alcor.o
 diff --git a/drivers/mmc/host/bcm2835-sdhost.c b/drivers/mmc/host/bcm2835-sdhost.c
 new file mode 100644
-index 0000000000000..ba2dd8345fd44
+index 000000000000..ba2dd8345fd4
 --- /dev/null
 +++ b/drivers/mmc/host/bcm2835-sdhost.c
 @@ -0,0 +1,2204 @@
@@ -74349,7 +74349,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
 
 diff --git a/drivers/char/broadcom/Kconfig b/drivers/char/broadcom/Kconfig
 new file mode 100644
-index 0000000000000..fc1315209dab9
+index 000000000000..fc1315209dab
 --- /dev/null
 +++ b/drivers/char/broadcom/Kconfig
 @@ -0,0 +1,18 @@
@@ -74373,14 +74373,14 @@ index 0000000000000..fc1315209dab9
 +endif
 diff --git a/drivers/char/broadcom/Makefile b/drivers/char/broadcom/Makefile
 new file mode 100644
-index 0000000000000..06c5c8ad00e75
+index 000000000000..06c5c8ad00e7
 --- /dev/null
 +++ b/drivers/char/broadcom/Makefile
 @@ -0,0 +1 @@
 +obj-$(CONFIG_BCM2708_VCMEM)	+= vc_mem.o
 diff --git a/drivers/char/broadcom/vc_mem.c b/drivers/char/broadcom/vc_mem.c
 new file mode 100644
-index 0000000000000..230692e84a58c
+index 000000000000..230692e84a58
 --- /dev/null
 +++ b/drivers/char/broadcom/vc_mem.c
 @@ -0,0 +1,393 @@
@@ -74779,7 +74779,7 @@ index 0000000000000..230692e84a58c
 +module_param(mem_base, uint, 0644);
 diff --git a/include/linux/broadcom/vc_mem.h b/include/linux/broadcom/vc_mem.h
 new file mode 100644
-index 0000000000000..3c70792374964
+index 000000000000..3c7079237496
 --- /dev/null
 +++ b/include/linux/broadcom/vc_mem.h
 @@ -0,0 +1,39 @@
@@ -75028,7 +75028,7 @@ Signed-off-by: Hui Wang <hui.wang@canonical.com>
  create mode 100644 include/linux/broadcom/vmcs_sm_ioctl.h
 
 diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
-index df0fc997dc3e3..55f6a70b61cdd 100644
+index df0fc997dc3e..55f6a70b61cd 100644
 --- a/drivers/char/Kconfig
 +++ b/drivers/char/Kconfig
 @@ -5,6 +5,8 @@
@@ -75041,7 +75041,7 @@ index df0fc997dc3e3..55f6a70b61cdd 100644
  
  config DEVMEM
 diff --git a/drivers/char/Makefile b/drivers/char/Makefile
-index 7c5ea6f9df145..0ff37301f721b 100644
+index 7c5ea6f9df14..0ff37301f721 100644
 --- a/drivers/char/Makefile
 +++ b/drivers/char/Makefile
 @@ -52,3 +52,4 @@ js-rtc-y = rtc.o
@@ -75050,7 +75050,7 @@ index 7c5ea6f9df145..0ff37301f721b 100644
  obj-$(CONFIG_ADI)		+= adi.o
 +obj-$(CONFIG_BRCM_CHAR_DRIVERS) += broadcom/
 diff --git a/drivers/char/broadcom/Kconfig b/drivers/char/broadcom/Kconfig
-index fc1315209dab9..2b6132d12b13d 100644
+index fc1315209dab..2b6132d12b13 100644
 --- a/drivers/char/broadcom/Kconfig
 +++ b/drivers/char/broadcom/Kconfig
 @@ -16,3 +16,13 @@ config BCM2708_VCMEM
@@ -75068,7 +75068,7 @@ index fc1315209dab9..2b6132d12b13d 100644
 +	Support for the VC shared memory on the Broadcom reference
 +	design. Uses the VCHIQ stack.
 diff --git a/drivers/char/broadcom/Makefile b/drivers/char/broadcom/Makefile
-index 06c5c8ad00e75..419af4180deb0 100644
+index 06c5c8ad00e7..419af4180deb 100644
 --- a/drivers/char/broadcom/Makefile
 +++ b/drivers/char/broadcom/Makefile
 @@ -1 +1,2 @@
@@ -75076,7 +75076,7 @@ index 06c5c8ad00e75..419af4180deb0 100644
 +obj-$(CONFIG_BCM_VC_SM)         += vc_sm/
 diff --git a/drivers/char/broadcom/vc_sm/Makefile b/drivers/char/broadcom/vc_sm/Makefile
 new file mode 100644
-index 0000000000000..f73393ef0fdd3
+index 000000000000..f73393ef0fdd
 --- /dev/null
 +++ b/drivers/char/broadcom/vc_sm/Makefile
 @@ -0,0 +1,9 @@
@@ -75091,7 +75091,7 @@ index 0000000000000..f73393ef0fdd3
 +    vc_vchi_sm.o
 diff --git a/drivers/char/broadcom/vc_sm/vc_sm_defs.h b/drivers/char/broadcom/vc_sm/vc_sm_defs.h
 new file mode 100644
-index 0000000000000..de6afe9f65af4
+index 000000000000..de6afe9f65af
 --- /dev/null
 +++ b/drivers/char/broadcom/vc_sm/vc_sm_defs.h
 @@ -0,0 +1,237 @@
@@ -75334,7 +75334,7 @@ index 0000000000000..de6afe9f65af4
 +#endif /* __VC_SM_DEFS_H__INCLUDED__ */
 diff --git a/drivers/char/broadcom/vc_sm/vc_sm_knl.h b/drivers/char/broadcom/vc_sm/vc_sm_knl.h
 new file mode 100644
-index 0000000000000..f7f74750d8358
+index 000000000000..f7f74750d835
 --- /dev/null
 +++ b/drivers/char/broadcom/vc_sm/vc_sm_knl.h
 @@ -0,0 +1,53 @@
@@ -75393,7 +75393,7 @@ index 0000000000000..f7f74750d8358
 +#endif /* __VC_SM_KNL_H__INCLUDED__ */
 diff --git a/drivers/char/broadcom/vc_sm/vc_vchi_sm.c b/drivers/char/broadcom/vc_sm/vc_vchi_sm.c
 new file mode 100644
-index 0000000000000..fda7e378652e7
+index 000000000000..fda7e378652e
 --- /dev/null
 +++ b/drivers/char/broadcom/vc_sm/vc_vchi_sm.c
 @@ -0,0 +1,500 @@
@@ -75899,7 +75899,7 @@ index 0000000000000..fda7e378652e7
 +}
 diff --git a/drivers/char/broadcom/vc_sm/vc_vchi_sm.h b/drivers/char/broadcom/vc_sm/vc_vchi_sm.h
 new file mode 100644
-index 0000000000000..9f849d2f40dec
+index 000000000000..9f849d2f40de
 --- /dev/null
 +++ b/drivers/char/broadcom/vc_sm/vc_vchi_sm.h
 @@ -0,0 +1,100 @@
@@ -76005,7 +76005,7 @@ index 0000000000000..9f849d2f40dec
 +#endif /* __VC_VCHI_SM_H__INCLUDED__ */
 diff --git a/drivers/char/broadcom/vc_sm/vmcs_sm.c b/drivers/char/broadcom/vc_sm/vmcs_sm.c
 new file mode 100644
-index 0000000000000..99a5e0d121a1d
+index 000000000000..99a5e0d121a1
 --- /dev/null
 +++ b/drivers/char/broadcom/vc_sm/vmcs_sm.c
 @@ -0,0 +1,3526 @@
@@ -79537,7 +79537,7 @@ index 0000000000000..99a5e0d121a1d
 +MODULE_LICENSE("GPL v2");
 diff --git a/include/linux/broadcom/vmcs_sm_ioctl.h b/include/linux/broadcom/vmcs_sm_ioctl.h
 new file mode 100644
-index 0000000000000..2395ff08c5cee
+index 000000000000..2395ff08c5ce
 --- /dev/null
 +++ b/include/linux/broadcom/vmcs_sm_ioctl.h
 @@ -0,0 +1,294 @@
@@ -79860,7 +79860,7 @@ See: https://github.com/raspberrypi/linux/issues/1154
  create mode 100644 drivers/char/broadcom/bcm2835-gpiomem.c
 
 diff --git a/drivers/char/broadcom/Kconfig b/drivers/char/broadcom/Kconfig
-index 2b6132d12b13d..235704f2d916b 100644
+index 2b6132d12b13..235704f2d916 100644
 --- a/drivers/char/broadcom/Kconfig
 +++ b/drivers/char/broadcom/Kconfig
 @@ -26,3 +26,12 @@ config BCM_VC_SM
@@ -79877,7 +79877,7 @@ index 2b6132d12b13d..235704f2d916b 100644
 +		register page to the user's pointer.
 +
 diff --git a/drivers/char/broadcom/Makefile b/drivers/char/broadcom/Makefile
-index 419af4180deb0..187a0b02f1896 100644
+index 419af4180deb..187a0b02f189 100644
 --- a/drivers/char/broadcom/Makefile
 +++ b/drivers/char/broadcom/Makefile
 @@ -1,2 +1,5 @@
@@ -79888,7 +79888,7 @@ index 419af4180deb0..187a0b02f1896 100644
 +
 diff --git a/drivers/char/broadcom/bcm2835-gpiomem.c b/drivers/char/broadcom/bcm2835-gpiomem.c
 new file mode 100644
-index 0000000000000..f5e7f1ba8fb6f
+index 000000000000..f5e7f1ba8fb6
 --- /dev/null
 +++ b/drivers/char/broadcom/bcm2835-gpiomem.c
 @@ -0,0 +1,258 @@
@@ -80190,7 +80190,7 @@ bcm2835_smi: re-add dereference to fix DMA transfers
 
 diff --git a/Documentation/devicetree/bindings/misc/brcm,bcm2835-smi-dev.txt b/Documentation/devicetree/bindings/misc/brcm,bcm2835-smi-dev.txt
 new file mode 100644
-index 0000000000000..68cc8ebc3392d
+index 000000000000..68cc8ebc3392
 --- /dev/null
 +++ b/Documentation/devicetree/bindings/misc/brcm,bcm2835-smi-dev.txt
 @@ -0,0 +1,17 @@
@@ -80213,7 +80213,7 @@ index 0000000000000..68cc8ebc3392d
 +
 diff --git a/Documentation/devicetree/bindings/misc/brcm,bcm2835-smi.txt b/Documentation/devicetree/bindings/misc/brcm,bcm2835-smi.txt
 new file mode 100644
-index 0000000000000..b76dc694f1ac0
+index 000000000000..b76dc694f1ac
 --- /dev/null
 +++ b/Documentation/devicetree/bindings/misc/brcm,bcm2835-smi.txt
 @@ -0,0 +1,48 @@
@@ -80266,7 +80266,7 @@ index 0000000000000..b76dc694f1ac0
 +};
 +
 diff --git a/drivers/char/broadcom/Kconfig b/drivers/char/broadcom/Kconfig
-index 235704f2d916b..4ef0d7af2bc72 100644
+index 235704f2d916..4ef0d7af2bc7 100644
 --- a/drivers/char/broadcom/Kconfig
 +++ b/drivers/char/broadcom/Kconfig
 @@ -35,3 +35,11 @@ config BCM2835_DEVGPIOMEM
@@ -80282,7 +80282,7 @@ index 235704f2d916b..4ef0d7af2bc72 100644
 +		Broadcom's Secondary Memory interface. The low-level functionality is provided
 +		by the SMI driver itself.
 diff --git a/drivers/char/broadcom/Makefile b/drivers/char/broadcom/Makefile
-index 187a0b02f1896..d0ad04f8e4981 100644
+index 187a0b02f189..d0ad04f8e498 100644
 --- a/drivers/char/broadcom/Makefile
 +++ b/drivers/char/broadcom/Makefile
 @@ -2,4 +2,4 @@ obj-$(CONFIG_BCM2708_VCMEM)	+= vc_mem.o
@@ -80293,7 +80293,7 @@ index 187a0b02f1896..d0ad04f8e4981 100644
 +obj-$(CONFIG_BCM2835_SMI_DEV)	+= bcm2835_smi_dev.o
 diff --git a/drivers/char/broadcom/bcm2835_smi_dev.c b/drivers/char/broadcom/bcm2835_smi_dev.c
 new file mode 100644
-index 0000000000000..9db8f1e3db0fc
+index 000000000000..9db8f1e3db0f
 --- /dev/null
 +++ b/drivers/char/broadcom/bcm2835_smi_dev.c
 @@ -0,0 +1,402 @@
@@ -80700,7 +80700,7 @@ index 0000000000000..9db8f1e3db0fc
 +	"Character device driver for BCM2835's secondary memory interface");
 +MODULE_AUTHOR("Luke Wren <luke@raspberrypi.org>");
 diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
-index c55b63750757d..62c3ec2853939 100644
+index c55b63750757..62c3ec285393 100644
 --- a/drivers/misc/Kconfig
 +++ b/drivers/misc/Kconfig
 @@ -10,6 +10,14 @@ config SENSORS_LIS3LV02D
@@ -80719,7 +80719,7 @@ index c55b63750757d..62c3ec2853939 100644
  	tristate "Analog Devices Digital Potentiometers"
  	depends on (I2C || SPI) && SYSFS
 diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
-index c1860d35dc7e2..dbca246199f3d 100644
+index c1860d35dc7e..dbca246199f3 100644
 --- a/drivers/misc/Makefile
 +++ b/drivers/misc/Makefile
 @@ -11,6 +11,7 @@ obj-$(CONFIG_AD525X_DPOT_SPI)	+= ad525x_dpot-spi.o
@@ -80732,7 +80732,7 @@ index c1860d35dc7e2..dbca246199f3d 100644
  obj-$(CONFIG_LKDTM)		+= lkdtm/
 diff --git a/drivers/misc/bcm2835_smi.c b/drivers/misc/bcm2835_smi.c
 new file mode 100644
-index 0000000000000..f1a7f6a3e966b
+index 000000000000..f1a7f6a3e966
 --- /dev/null
 +++ b/drivers/misc/bcm2835_smi.c
 @@ -0,0 +1,955 @@
@@ -81693,7 +81693,7 @@ index 0000000000000..f1a7f6a3e966b
 +MODULE_AUTHOR("Luke Wren <luke@raspberrypi.org>");
 diff --git a/include/linux/broadcom/bcm2835_smi.h b/include/linux/broadcom/bcm2835_smi.h
 new file mode 100644
-index 0000000000000..ee3a75edfc033
+index 000000000000..ee3a75edfc03
 --- /dev/null
 +++ b/include/linux/broadcom/bcm2835_smi.h
 @@ -0,0 +1,391 @@
@@ -82111,7 +82111,7 @@ Signed-off-by: Dom Cobley <dom@raspberrypi.com>
  create mode 100644 drivers/cpufreq/bcm2835-cpufreq.c
 
 diff --git a/drivers/cpufreq/Kconfig.arm b/drivers/cpufreq/Kconfig.arm
-index 25f11e9ec3587..adf8fd20ef5be 100644
+index 25f11e9ec358..adf8fd20ef5b 100644
 --- a/drivers/cpufreq/Kconfig.arm
 +++ b/drivers/cpufreq/Kconfig.arm
 @@ -301,6 +301,15 @@ config ARM_TANGO_CPUFREQ
@@ -82131,7 +82131,7 @@ index 25f11e9ec3587..adf8fd20ef5be 100644
  	tristate "Tegra20 CPUFreq support"
  	depends on ARCH_TEGRA
 diff --git a/drivers/cpufreq/Makefile b/drivers/cpufreq/Makefile
-index 9a9f5ccd13d98..33349d1f6cfa6 100644
+index 9a9f5ccd13d9..33349d1f6cfa 100644
 --- a/drivers/cpufreq/Makefile
 +++ b/drivers/cpufreq/Makefile
 @@ -82,6 +82,7 @@ obj-$(CONFIG_ARM_SPEAR_CPUFREQ)		+= spear-cpufreq.o
@@ -82144,7 +82144,7 @@ index 9a9f5ccd13d98..33349d1f6cfa6 100644
  obj-$(CONFIG_ARM_TEGRA186_CPUFREQ)	+= tegra186-cpufreq.o
 diff --git a/drivers/cpufreq/bcm2835-cpufreq.c b/drivers/cpufreq/bcm2835-cpufreq.c
 new file mode 100644
-index 0000000000000..66184acdae491
+index 000000000000..66184acdae49
 --- /dev/null
 +++ b/drivers/cpufreq/bcm2835-cpufreq.c
 @@ -0,0 +1,211 @@
@@ -82470,7 +82470,7 @@ both bcm2708_bsc_fifo_fill and ~drain are changed as well.
  create mode 100644 drivers/i2c/busses/i2c-bcm2708.c
 
 diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
-index 2d08a8719506c..539f9309f6e67 100644
+index 2d08a8719506..539f9309f6e6 100644
 --- a/drivers/i2c/busses/Kconfig
 +++ b/drivers/i2c/busses/Kconfig
 @@ -9,6 +9,25 @@ menu "I2C Hardware Bus support"
@@ -82500,7 +82500,7 @@ index 2d08a8719506c..539f9309f6e67 100644
  	tristate "ALI 1535"
  	depends on PCI
 diff --git a/drivers/i2c/busses/Makefile b/drivers/i2c/busses/Makefile
-index 3ab8aebc39c90..15eab02361f1b 100644
+index 3ab8aebc39c9..15eab02361f1 100644
 --- a/drivers/i2c/busses/Makefile
 +++ b/drivers/i2c/busses/Makefile
 @@ -3,6 +3,8 @@
@@ -82514,7 +82514,7 @@ index 3ab8aebc39c90..15eab02361f1b 100644
  
 diff --git a/drivers/i2c/busses/i2c-bcm2708.c b/drivers/i2c/busses/i2c-bcm2708.c
 new file mode 100644
-index 0000000000000..962f2e5c7455d
+index 000000000000..962f2e5c7455
 --- /dev/null
 +++ b/drivers/i2c/busses/i2c-bcm2708.c
 @@ -0,0 +1,512 @@
@@ -83070,7 +83070,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  create mode 100644 drivers/char/broadcom/vcio.c
 
 diff --git a/drivers/char/broadcom/Kconfig b/drivers/char/broadcom/Kconfig
-index 4ef0d7af2bc72..cffd17df6a1b6 100644
+index 4ef0d7af2bc7..cffd17df6a1b 100644
 --- a/drivers/char/broadcom/Kconfig
 +++ b/drivers/char/broadcom/Kconfig
 @@ -15,6 +15,12 @@ config BCM2708_VCMEM
@@ -83087,7 +83087,7 @@ index 4ef0d7af2bc72..cffd17df6a1b6 100644
  
  config BCM_VC_SM
 diff --git a/drivers/char/broadcom/Makefile b/drivers/char/broadcom/Makefile
-index d0ad04f8e4981..7d9cb3e0b1c3c 100644
+index d0ad04f8e498..7d9cb3e0b1c3 100644
 --- a/drivers/char/broadcom/Makefile
 +++ b/drivers/char/broadcom/Makefile
 @@ -1,4 +1,5 @@
@@ -83098,7 +83098,7 @@ index d0ad04f8e4981..7d9cb3e0b1c3c 100644
  obj-$(CONFIG_BCM2835_DEVGPIOMEM)+= bcm2835-gpiomem.o
 diff --git a/drivers/char/broadcom/vcio.c b/drivers/char/broadcom/vcio.c
 new file mode 100644
-index 0000000000000..d2598663a2b5d
+index 000000000000..d2598663a2b5
 --- /dev/null
 +++ b/drivers/char/broadcom/vcio.c
 @@ -0,0 +1,194 @@
@@ -83328,7 +83328,7 @@ Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
  1 file changed, 17 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/firmware/raspberrypi.c b/drivers/firmware/raspberrypi.c
-index da26a584dca06..7162f6d6649c6 100644
+index da26a584dca0..7162f6d6649c 100644
 --- a/drivers/firmware/raspberrypi.c
 +++ b/drivers/firmware/raspberrypi.c
 @@ -29,6 +29,8 @@ struct rpi_firmware {
@@ -84062,7 +84062,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  create mode 120000 arch/arm64/boot/dts/overlays
 
 diff --git a/.gitignore b/.gitignore
-index 70580bdd352cc..a0cf56d7d0d2e 100644
+index 70580bdd352c..a0cf56d7d0d2 100644
 --- a/.gitignore
 +++ b/.gitignore
 @@ -17,6 +17,7 @@
@@ -84074,7 +84074,7 @@ index 70580bdd352cc..a0cf56d7d0d2e 100644
  *.dwo
  *.elf
 diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
-index b21b3a64641a7..e6832866849dd 100644
+index b21b3a64641a..e6832866849d 100644
 --- a/arch/arm/boot/dts/Makefile
 +++ b/arch/arm/boot/dts/Makefile
 @@ -1,4 +1,18 @@
@@ -84120,7 +84120,7 @@ index b21b3a64641a7..e6832866849dd 100644
 +endif
 diff --git a/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts b/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts
 new file mode 100644
-index 0000000000000..b800699a03fbd
+index 000000000000..b800699a03fb
 --- /dev/null
 +++ b/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts
 @@ -0,0 +1,125 @@
@@ -84251,7 +84251,7 @@ index 0000000000000..b800699a03fbd
 +};
 diff --git a/arch/arm/boot/dts/bcm2708-rpi-b.dts b/arch/arm/boot/dts/bcm2708-rpi-b.dts
 new file mode 100644
-index 0000000000000..ef47775692cea
+index 000000000000..ef47775692ce
 --- /dev/null
 +++ b/arch/arm/boot/dts/bcm2708-rpi-b.dts
 @@ -0,0 +1,115 @@
@@ -84372,7 +84372,7 @@ index 0000000000000..ef47775692cea
 +};
 diff --git a/arch/arm/boot/dts/bcm2708-rpi-cm.dts b/arch/arm/boot/dts/bcm2708-rpi-cm.dts
 new file mode 100644
-index 0000000000000..64809aee5c0ca
+index 000000000000..64809aee5c0c
 --- /dev/null
 +++ b/arch/arm/boot/dts/bcm2708-rpi-cm.dts
 @@ -0,0 +1,98 @@
@@ -84476,7 +84476,7 @@ index 0000000000000..64809aee5c0ca
 +};
 diff --git a/arch/arm/boot/dts/bcm2708-rpi-cm.dtsi b/arch/arm/boot/dts/bcm2708-rpi-cm.dtsi
 new file mode 100644
-index 0000000000000..dce160f420fdc
+index 000000000000..dce160f420fd
 --- /dev/null
 +++ b/arch/arm/boot/dts/bcm2708-rpi-cm.dtsi
 @@ -0,0 +1,18 @@
@@ -84500,7 +84500,7 @@ index 0000000000000..dce160f420fdc
 +};
 diff --git a/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts b/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts
 new file mode 100644
-index 0000000000000..92f780a3e5577
+index 000000000000..92f780a3e557
 --- /dev/null
 +++ b/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts
 @@ -0,0 +1,163 @@
@@ -84669,7 +84669,7 @@ index 0000000000000..92f780a3e5577
 +};
 diff --git a/arch/arm/boot/dts/bcm2708-rpi-zero.dts b/arch/arm/boot/dts/bcm2708-rpi-zero.dts
 new file mode 100644
-index 0000000000000..2909ddeafc833
+index 000000000000..2909ddeafc83
 --- /dev/null
 +++ b/arch/arm/boot/dts/bcm2708-rpi-zero.dts
 @@ -0,0 +1,118 @@
@@ -84793,7 +84793,7 @@ index 0000000000000..2909ddeafc833
 +};
 diff --git a/arch/arm/boot/dts/bcm2708-rpi.dtsi b/arch/arm/boot/dts/bcm2708-rpi.dtsi
 new file mode 100644
-index 0000000000000..ce9795dad99f3
+index 000000000000..ce9795dad99f
 --- /dev/null
 +++ b/arch/arm/boot/dts/bcm2708-rpi.dtsi
 @@ -0,0 +1,154 @@
@@ -84953,7 +84953,7 @@ index 0000000000000..ce9795dad99f3
 +};
 diff --git a/arch/arm/boot/dts/bcm2708.dtsi b/arch/arm/boot/dts/bcm2708.dtsi
 new file mode 100644
-index 0000000000000..16a637363b5df
+index 000000000000..16a637363b5d
 --- /dev/null
 +++ b/arch/arm/boot/dts/bcm2708.dtsi
 @@ -0,0 +1,10 @@
@@ -84969,7 +84969,7 @@ index 0000000000000..16a637363b5df
 +};
 diff --git a/arch/arm/boot/dts/bcm2709-rpi-2-b.dts b/arch/arm/boot/dts/bcm2709-rpi-2-b.dts
 new file mode 100644
-index 0000000000000..4d2262f8d376b
+index 000000000000..4d2262f8d376
 --- /dev/null
 +++ b/arch/arm/boot/dts/bcm2709-rpi-2-b.dts
 @@ -0,0 +1,125 @@
@@ -85100,7 +85100,7 @@ index 0000000000000..4d2262f8d376b
 +};
 diff --git a/arch/arm/boot/dts/bcm2709-rpi.dtsi b/arch/arm/boot/dts/bcm2709-rpi.dtsi
 new file mode 100644
-index 0000000000000..babfa41cd9f78
+index 000000000000..babfa41cd9f7
 --- /dev/null
 +++ b/arch/arm/boot/dts/bcm2709-rpi.dtsi
 @@ -0,0 +1,5 @@
@@ -85111,7 +85111,7 @@ index 0000000000000..babfa41cd9f78
 +};
 diff --git a/arch/arm/boot/dts/bcm2709.dtsi b/arch/arm/boot/dts/bcm2709.dtsi
 new file mode 100644
-index 0000000000000..8bc67c0aaff17
+index 000000000000..8bc67c0aaff1
 --- /dev/null
 +++ b/arch/arm/boot/dts/bcm2709.dtsi
 @@ -0,0 +1,18 @@
@@ -85135,7 +85135,7 @@ index 0000000000000..8bc67c0aaff17
 +};
 diff --git a/arch/arm/boot/dts/bcm270x.dtsi b/arch/arm/boot/dts/bcm270x.dtsi
 new file mode 100644
-index 0000000000000..9eb6becfbe411
+index 000000000000..9eb6becfbe41
 --- /dev/null
 +++ b/arch/arm/boot/dts/bcm270x.dtsi
 @@ -0,0 +1,165 @@
@@ -85306,7 +85306,7 @@ index 0000000000000..9eb6becfbe411
 +};
 diff --git a/arch/arm/boot/dts/bcm2710-rpi-2-b.dts b/arch/arm/boot/dts/bcm2710-rpi-2-b.dts
 new file mode 100644
-index 0000000000000..65a6f4d06866f
+index 000000000000..65a6f4d06866
 --- /dev/null
 +++ b/arch/arm/boot/dts/bcm2710-rpi-2-b.dts
 @@ -0,0 +1,125 @@
@@ -85437,7 +85437,7 @@ index 0000000000000..65a6f4d06866f
 +};
 diff --git a/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts b/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts
 new file mode 100644
-index 0000000000000..55420ac94dcfa
+index 000000000000..55420ac94dcf
 --- /dev/null
 +++ b/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts
 @@ -0,0 +1,183 @@
@@ -85626,7 +85626,7 @@ index 0000000000000..55420ac94dcfa
 +};
 diff --git a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
 new file mode 100644
-index 0000000000000..261827cdb957c
+index 000000000000..261827cdb957
 --- /dev/null
 +++ b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
 @@ -0,0 +1,194 @@
@@ -85826,7 +85826,7 @@ index 0000000000000..261827cdb957c
 +};
 diff --git a/arch/arm/boot/dts/bcm2710-rpi-cm3.dts b/arch/arm/boot/dts/bcm2710-rpi-cm3.dts
 new file mode 100644
-index 0000000000000..addebe448e32c
+index 000000000000..addebe448e32
 --- /dev/null
 +++ b/arch/arm/boot/dts/bcm2710-rpi-cm3.dts
 @@ -0,0 +1,135 @@
@@ -85967,7 +85967,7 @@ index 0000000000000..addebe448e32c
 +};
 diff --git a/arch/arm/boot/dts/bcm2710.dtsi b/arch/arm/boot/dts/bcm2710.dtsi
 new file mode 100644
-index 0000000000000..5c45ded273fe3
+index 000000000000..5c45ded273fe
 --- /dev/null
 +++ b/arch/arm/boot/dts/bcm2710.dtsi
 @@ -0,0 +1,25 @@
@@ -85998,7 +85998,7 @@ index 0000000000000..5c45ded273fe3
 +};
 diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
 new file mode 100644
-index 0000000000000..ccdc274665c09
+index 000000000000..ccdc274665c0
 --- /dev/null
 +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
 @@ -0,0 +1,338 @@
@@ -86342,7 +86342,7 @@ index 0000000000000..ccdc274665c09
 +};
 diff --git a/arch/arm/boot/dts/bcm2711-rpi.dtsi b/arch/arm/boot/dts/bcm2711-rpi.dtsi
 new file mode 100644
-index 0000000000000..d8ffaab8e86aa
+index 000000000000..d8ffaab8e86a
 --- /dev/null
 +++ b/arch/arm/boot/dts/bcm2711-rpi.dtsi
 @@ -0,0 +1,7 @@
@@ -86355,7 +86355,7 @@ index 0000000000000..d8ffaab8e86aa
 +};
 diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi
 new file mode 100644
-index 0000000000000..f134aba2badbc
+index 000000000000..f134aba2badb
 --- /dev/null
 +++ b/arch/arm/boot/dts/bcm2711.dtsi
 @@ -0,0 +1,44 @@
@@ -86405,7 +86405,7 @@ index 0000000000000..f134aba2badbc
 +};
 diff --git a/arch/arm/boot/dts/bcm2835-common.dtsi b/arch/arm/boot/dts/bcm2835-common.dtsi
 new file mode 100644
-index 0000000000000..eceb170fd5b7b
+index 000000000000..eceb170fd5b7
 --- /dev/null
 +++ b/arch/arm/boot/dts/bcm2835-common.dtsi
 @@ -0,0 +1,54 @@
@@ -86464,7 +86464,7 @@ index 0000000000000..eceb170fd5b7b
 +	};
 +};
 diff --git a/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts b/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
-index 6c8ce39833bf6..0cc6355a8c06e 100644
+index 6c8ce39833bf..0cc6355a8c06 100644
 --- a/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
 +++ b/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
 @@ -3,6 +3,7 @@
@@ -86476,7 +86476,7 @@ index 6c8ce39833bf6..0cc6355a8c06e 100644
  / {
  	compatible = "raspberrypi,model-a-plus", "brcm,bcm2835";
 diff --git a/arch/arm/boot/dts/bcm2835-rpi-a.dts b/arch/arm/boot/dts/bcm2835-rpi-a.dts
-index 17fdd48346ffb..21593978e8513 100644
+index 17fdd48346ff..21593978e851 100644
 --- a/arch/arm/boot/dts/bcm2835-rpi-a.dts
 +++ b/arch/arm/boot/dts/bcm2835-rpi-a.dts
 @@ -3,6 +3,7 @@
@@ -86488,7 +86488,7 @@ index 17fdd48346ffb..21593978e8513 100644
  / {
  	compatible = "raspberrypi,model-a", "brcm,bcm2835";
 diff --git a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
-index b0355c229cdc2..7c63ba90b827c 100644
+index b0355c229cdc..7c63ba90b827 100644
 --- a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
 +++ b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
 @@ -4,6 +4,7 @@
@@ -86500,7 +86500,7 @@ index b0355c229cdc2..7c63ba90b827c 100644
  / {
  	compatible = "raspberrypi,model-b-plus", "brcm,bcm2835";
 diff --git a/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts b/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts
-index 33b3b5c025219..83e54a5fa3b40 100644
+index 33b3b5c02521..83e54a5fa3b4 100644
 --- a/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts
 +++ b/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts
 @@ -4,6 +4,7 @@
@@ -86512,7 +86512,7 @@ index 33b3b5c025219..83e54a5fa3b40 100644
  / {
  	compatible = "raspberrypi,model-b-rev2", "brcm,bcm2835";
 diff --git a/arch/arm/boot/dts/bcm2835-rpi-b.dts b/arch/arm/boot/dts/bcm2835-rpi-b.dts
-index 2b69957e0113e..c9d04b1f14fd1 100644
+index 2b69957e0113..c9d04b1f14fd 100644
 --- a/arch/arm/boot/dts/bcm2835-rpi-b.dts
 +++ b/arch/arm/boot/dts/bcm2835-rpi-b.dts
 @@ -4,6 +4,7 @@
@@ -86524,7 +86524,7 @@ index 2b69957e0113e..c9d04b1f14fd1 100644
  / {
  	compatible = "raspberrypi,model-b", "brcm,bcm2835";
 diff --git a/arch/arm/boot/dts/bcm2835-rpi-zero.dts b/arch/arm/boot/dts/bcm2835-rpi-zero.dts
-index 6dd93c6f49666..42ce8b6063547 100644
+index 6dd93c6f4966..42ce8b606354 100644
 --- a/arch/arm/boot/dts/bcm2835-rpi-zero.dts
 +++ b/arch/arm/boot/dts/bcm2835-rpi-zero.dts
 @@ -7,6 +7,7 @@
@@ -86536,7 +86536,7 @@ index 6dd93c6f49666..42ce8b6063547 100644
  / {
  	compatible = "raspberrypi,model-zero", "brcm,bcm2835";
 diff --git a/arch/arm/boot/dts/bcm2835-rpi.dtsi b/arch/arm/boot/dts/bcm2835-rpi.dtsi
-index 6c6a7f620d8b7..c77971e27175a 100644
+index 6c6a7f620d8b..c77971e27175 100644
 --- a/arch/arm/boot/dts/bcm2835-rpi.dtsi
 +++ b/arch/arm/boot/dts/bcm2835-rpi.dtsi
 @@ -29,6 +29,22 @@
@@ -86591,7 +86591,7 @@ index 6c6a7f620d8b7..c77971e27175a 100644
 +	power-domains = <&power RPI_POWER_DOMAIN_UNICAM1>;
 +};
 diff --git a/arch/arm/boot/dts/bcm2835.dtsi b/arch/arm/boot/dts/bcm2835.dtsi
-index a5c3824c80563..53bf4579cc224 100644
+index a5c3824c8056..53bf4579cc22 100644
 --- a/arch/arm/boot/dts/bcm2835.dtsi
 +++ b/arch/arm/boot/dts/bcm2835.dtsi
 @@ -1,5 +1,6 @@
@@ -86602,7 +86602,7 @@ index a5c3824c80563..53bf4579cc224 100644
  / {
  	compatible = "brcm,bcm2835";
 diff --git a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
-index 0455a680394a2..6b0a6d5d5ca42 100644
+index 0455a680394a..6b0a6d5d5ca4 100644
 --- a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
 +++ b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
 @@ -4,6 +4,7 @@
@@ -86614,7 +86614,7 @@ index 0455a680394a2..6b0a6d5d5ca42 100644
  / {
  	compatible = "raspberrypi,2-model-b", "brcm,bcm2836";
 diff --git a/arch/arm/boot/dts/bcm2836.dtsi b/arch/arm/boot/dts/bcm2836.dtsi
-index c933e84138842..82d6c4662ae49 100644
+index c933e8413884..82d6c4662ae4 100644
 --- a/arch/arm/boot/dts/bcm2836.dtsi
 +++ b/arch/arm/boot/dts/bcm2836.dtsi
 @@ -1,5 +1,6 @@
@@ -86625,7 +86625,7 @@ index c933e84138842..82d6c4662ae49 100644
  / {
  	compatible = "brcm,bcm2836";
 diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
-index 054ecaa355c9a..3d03e7d0fbf0d 100644
+index 054ecaa355c9..3d03e7d0fbf0 100644
 --- a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
 +++ b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
 @@ -4,6 +4,7 @@
@@ -86637,7 +86637,7 @@ index 054ecaa355c9a..3d03e7d0fbf0d 100644
  / {
  	compatible = "raspberrypi,3-model-b", "brcm,bcm2837";
 diff --git a/arch/arm/boot/dts/bcm2837.dtsi b/arch/arm/boot/dts/bcm2837.dtsi
-index beb6c502dadc7..9e95fee78e192 100644
+index beb6c502dadc..9e95fee78e19 100644
 --- a/arch/arm/boot/dts/bcm2837.dtsi
 +++ b/arch/arm/boot/dts/bcm2837.dtsi
 @@ -1,4 +1,5 @@
@@ -86648,7 +86648,7 @@ index beb6c502dadc7..9e95fee78e192 100644
  	compatible = "brcm,bcm2837";
 diff --git a/arch/arm/boot/dts/bcm2838-rpi-4-b.dts b/arch/arm/boot/dts/bcm2838-rpi-4-b.dts
 new file mode 100644
-index 0000000000000..7170a97bd3e4f
+index 000000000000..7170a97bd3e4
 --- /dev/null
 +++ b/arch/arm/boot/dts/bcm2838-rpi-4-b.dts
 @@ -0,0 +1,118 @@
@@ -86772,7 +86772,7 @@ index 0000000000000..7170a97bd3e4f
 +};
 diff --git a/arch/arm/boot/dts/bcm2838-rpi.dtsi b/arch/arm/boot/dts/bcm2838-rpi.dtsi
 new file mode 100644
-index 0000000000000..140cfa312d1ae
+index 000000000000..140cfa312d1a
 --- /dev/null
 +++ b/arch/arm/boot/dts/bcm2838-rpi.dtsi
 @@ -0,0 +1,25 @@
@@ -86803,7 +86803,7 @@ index 0000000000000..140cfa312d1ae
 +};
 diff --git a/arch/arm/boot/dts/bcm2838.dtsi b/arch/arm/boot/dts/bcm2838.dtsi
 new file mode 100644
-index 0000000000000..a8614cc3ad6ae
+index 000000000000..a8614cc3ad6a
 --- /dev/null
 +++ b/arch/arm/boot/dts/bcm2838.dtsi
 @@ -0,0 +1,746 @@
@@ -87555,7 +87555,7 @@ index 0000000000000..a8614cc3ad6ae
 +};
 diff --git a/arch/arm/boot/dts/bcm283x-rpi-csi0-2lane.dtsi b/arch/arm/boot/dts/bcm283x-rpi-csi0-2lane.dtsi
 new file mode 100644
-index 0000000000000..952a28eaf6163
+index 000000000000..952a28eaf616
 --- /dev/null
 +++ b/arch/arm/boot/dts/bcm283x-rpi-csi0-2lane.dtsi
 @@ -0,0 +1,8 @@
@@ -87569,7 +87569,7 @@ index 0000000000000..952a28eaf6163
 +};
 diff --git a/arch/arm/boot/dts/bcm283x-rpi-csi1-2lane.dtsi b/arch/arm/boot/dts/bcm283x-rpi-csi1-2lane.dtsi
 new file mode 100644
-index 0000000000000..451fb4bb4ab81
+index 000000000000..451fb4bb4ab8
 --- /dev/null
 +++ b/arch/arm/boot/dts/bcm283x-rpi-csi1-2lane.dtsi
 @@ -0,0 +1,8 @@
@@ -87583,7 +87583,7 @@ index 0000000000000..451fb4bb4ab81
 +};
 diff --git a/arch/arm/boot/dts/bcm283x-rpi-csi1-4lane.dtsi b/arch/arm/boot/dts/bcm283x-rpi-csi1-4lane.dtsi
 new file mode 100644
-index 0000000000000..9279d4b0bfae2
+index 000000000000..9279d4b0bfae
 --- /dev/null
 +++ b/arch/arm/boot/dts/bcm283x-rpi-csi1-4lane.dtsi
 @@ -0,0 +1,8 @@
@@ -87596,7 +87596,7 @@ index 0000000000000..9279d4b0bfae2
 +	};
 +};
 diff --git a/arch/arm/boot/dts/bcm283x-rpi-lan7515.dtsi b/arch/arm/boot/dts/bcm283x-rpi-lan7515.dtsi
-index 70bece63f9a74..7c6c054459b72 100644
+index 70bece63f9a7..7c6c054459b7 100644
 --- a/arch/arm/boot/dts/bcm283x-rpi-lan7515.dtsi
 +++ b/arch/arm/boot/dts/bcm283x-rpi-lan7515.dtsi
 @@ -29,6 +29,9 @@
@@ -87626,7 +87626,7 @@ index 70bece63f9a74..7c6c054459b72 100644
 +	};
 +};
 diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi
-index 50c64146d4926..f0dbd6af90fae 100644
+index 50c64146d492..f0dbd6af90fa 100644
 --- a/arch/arm/boot/dts/bcm283x.dtsi
 +++ b/arch/arm/boot/dts/bcm283x.dtsi
 @@ -56,18 +56,7 @@
@@ -87771,7 +87771,7 @@ index 50c64146d4926..f0dbd6af90fae 100644
  		};
 diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile
 new file mode 100644
-index 0000000000000..e9cd9722bb94b
+index 000000000000..e9cd9722bb94
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/Makefile
 @@ -0,0 +1,194 @@
@@ -87971,7 +87971,7 @@ index 0000000000000..e9cd9722bb94b
 +clean-files	:= *.dtbo
 diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
 new file mode 100644
-index 0000000000000..8ce8cf05a2c86
+index 000000000000..8ce8cf05a2c8
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/README
 @@ -0,0 +1,2591 @@
@@ -90568,7 +90568,7 @@ index 0000000000000..8ce8cf05a2c86
 +http://www.raspberrypi.org/documentation/configuration/device-tree.md
 diff --git a/arch/arm/boot/dts/overlays/act-led-overlay.dts b/arch/arm/boot/dts/overlays/act-led-overlay.dts
 new file mode 100644
-index 0000000000000..2f4bbb407f896
+index 000000000000..2f4bbb407f89
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/act-led-overlay.dts
 @@ -0,0 +1,27 @@
@@ -90601,7 +90601,7 @@ index 0000000000000..2f4bbb407f896
 +};
 diff --git a/arch/arm/boot/dts/overlays/adau1977-adc-overlay.dts b/arch/arm/boot/dts/overlays/adau1977-adc-overlay.dts
 new file mode 100644
-index 0000000000000..298488e191565
+index 000000000000..298488e19156
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/adau1977-adc-overlay.dts
 @@ -0,0 +1,40 @@
@@ -90647,7 +90647,7 @@ index 0000000000000..298488e191565
 +};
 diff --git a/arch/arm/boot/dts/overlays/adau7002-simple-overlay.dts b/arch/arm/boot/dts/overlays/adau7002-simple-overlay.dts
 new file mode 100644
-index 0000000000000..5fed769d25260
+index 000000000000..5fed769d2526
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/adau7002-simple-overlay.dts
 @@ -0,0 +1,52 @@
@@ -90705,7 +90705,7 @@ index 0000000000000..5fed769d25260
 +};
 diff --git a/arch/arm/boot/dts/overlays/ads1015-overlay.dts b/arch/arm/boot/dts/overlays/ads1015-overlay.dts
 new file mode 100644
-index 0000000000000..26d68fccc6a85
+index 000000000000..26d68fccc6a8
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/ads1015-overlay.dts
 @@ -0,0 +1,98 @@
@@ -90809,7 +90809,7 @@ index 0000000000000..26d68fccc6a85
 +};
 diff --git a/arch/arm/boot/dts/overlays/ads1115-overlay.dts b/arch/arm/boot/dts/overlays/ads1115-overlay.dts
 new file mode 100644
-index 0000000000000..b380d925f0a51
+index 000000000000..b380d925f0a5
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/ads1115-overlay.dts
 @@ -0,0 +1,103 @@
@@ -90918,7 +90918,7 @@ index 0000000000000..b380d925f0a51
 +};
 diff --git a/arch/arm/boot/dts/overlays/ads7846-overlay.dts b/arch/arm/boot/dts/overlays/ads7846-overlay.dts
 new file mode 100644
-index 0000000000000..1c5c9b6bb6ffd
+index 000000000000..1c5c9b6bb6ff
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/ads7846-overlay.dts
 @@ -0,0 +1,89 @@
@@ -91013,7 +91013,7 @@ index 0000000000000..1c5c9b6bb6ffd
 +};
 diff --git a/arch/arm/boot/dts/overlays/adv7282m-overlay.dts b/arch/arm/boot/dts/overlays/adv7282m-overlay.dts
 new file mode 100644
-index 0000000000000..197c8f41a2658
+index 000000000000..197c8f41a265
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/adv7282m-overlay.dts
 @@ -0,0 +1,81 @@
@@ -91100,7 +91100,7 @@ index 0000000000000..197c8f41a2658
 +};
 diff --git a/arch/arm/boot/dts/overlays/adv728x-m-overlay.dts b/arch/arm/boot/dts/overlays/adv728x-m-overlay.dts
 new file mode 100644
-index 0000000000000..ea392e886984b
+index 000000000000..ea392e886984
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/adv728x-m-overlay.dts
 @@ -0,0 +1,37 @@
@@ -91143,7 +91143,7 @@ index 0000000000000..ea392e886984b
 +};
 diff --git a/arch/arm/boot/dts/overlays/akkordion-iqdacplus-overlay.dts b/arch/arm/boot/dts/overlays/akkordion-iqdacplus-overlay.dts
 new file mode 100644
-index 0000000000000..82f9b3734fb12
+index 000000000000..82f9b3734fb1
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/akkordion-iqdacplus-overlay.dts
 @@ -0,0 +1,49 @@
@@ -91198,7 +91198,7 @@ index 0000000000000..82f9b3734fb12
 +};
 diff --git a/arch/arm/boot/dts/overlays/allo-boss-dac-pcm512x-audio-overlay.dts b/arch/arm/boot/dts/overlays/allo-boss-dac-pcm512x-audio-overlay.dts
 new file mode 100644
-index 0000000000000..dd69916fcb3c1
+index 000000000000..dd69916fcb3c
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/allo-boss-dac-pcm512x-audio-overlay.dts
 @@ -0,0 +1,59 @@
@@ -91263,7 +91263,7 @@ index 0000000000000..dd69916fcb3c1
 +};
 diff --git a/arch/arm/boot/dts/overlays/allo-digione-overlay.dts b/arch/arm/boot/dts/overlays/allo-digione-overlay.dts
 new file mode 100644
-index 0000000000000..ea018ace34d4f
+index 000000000000..ea018ace34d4
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/allo-digione-overlay.dts
 @@ -0,0 +1,44 @@
@@ -91313,7 +91313,7 @@ index 0000000000000..ea018ace34d4f
 +};
 diff --git a/arch/arm/boot/dts/overlays/allo-katana-dac-audio-overlay.dts b/arch/arm/boot/dts/overlays/allo-katana-dac-audio-overlay.dts
 new file mode 100644
-index 0000000000000..b25fd681f09f3
+index 000000000000..b25fd681f09f
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/allo-katana-dac-audio-overlay.dts
 @@ -0,0 +1,57 @@
@@ -91376,7 +91376,7 @@ index 0000000000000..b25fd681f09f3
 +
 diff --git a/arch/arm/boot/dts/overlays/allo-piano-dac-pcm512x-audio-overlay.dts b/arch/arm/boot/dts/overlays/allo-piano-dac-pcm512x-audio-overlay.dts
 new file mode 100644
-index 0000000000000..bfc66da6295a8
+index 000000000000..bfc66da6295a
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/allo-piano-dac-pcm512x-audio-overlay.dts
 @@ -0,0 +1,54 @@
@@ -91436,7 +91436,7 @@ index 0000000000000..bfc66da6295a8
 +};
 diff --git a/arch/arm/boot/dts/overlays/allo-piano-dac-plus-pcm512x-audio-overlay.dts b/arch/arm/boot/dts/overlays/allo-piano-dac-plus-pcm512x-audio-overlay.dts
 new file mode 100644
-index 0000000000000..374c553db062e
+index 000000000000..374c553db062
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/allo-piano-dac-plus-pcm512x-audio-overlay.dts
 @@ -0,0 +1,55 @@
@@ -91497,7 +91497,7 @@ index 0000000000000..374c553db062e
 +};
 diff --git a/arch/arm/boot/dts/overlays/applepi-dac-overlay.dts b/arch/arm/boot/dts/overlays/applepi-dac-overlay.dts
 new file mode 100644
-index 0000000000000..4769296ec9d6f
+index 000000000000..4769296ec9d6
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/applepi-dac-overlay.dts
 @@ -0,0 +1,57 @@
@@ -91560,7 +91560,7 @@ index 0000000000000..4769296ec9d6f
 +*/
 diff --git a/arch/arm/boot/dts/overlays/at86rf233-overlay.dts b/arch/arm/boot/dts/overlays/at86rf233-overlay.dts
 new file mode 100644
-index 0000000000000..5a3f4571ee789
+index 000000000000..5a3f4571ee78
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/at86rf233-overlay.dts
 @@ -0,0 +1,57 @@
@@ -91623,7 +91623,7 @@ index 0000000000000..5a3f4571ee789
 +};
 diff --git a/arch/arm/boot/dts/overlays/audioinjector-addons-overlay.dts b/arch/arm/boot/dts/overlays/audioinjector-addons-overlay.dts
 new file mode 100644
-index 0000000000000..57a66eac8e9b2
+index 000000000000..57a66eac8e9b
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/audioinjector-addons-overlay.dts
 @@ -0,0 +1,60 @@
@@ -91689,7 +91689,7 @@ index 0000000000000..57a66eac8e9b2
 +};
 diff --git a/arch/arm/boot/dts/overlays/audioinjector-ultra-overlay.dts b/arch/arm/boot/dts/overlays/audioinjector-ultra-overlay.dts
 new file mode 100644
-index 0000000000000..fb4a4678a17ab
+index 000000000000..fb4a4678a17a
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/audioinjector-ultra-overlay.dts
 @@ -0,0 +1,71 @@
@@ -91766,7 +91766,7 @@ index 0000000000000..fb4a4678a17ab
 +};
 diff --git a/arch/arm/boot/dts/overlays/audioinjector-wm8731-audio-overlay.dts b/arch/arm/boot/dts/overlays/audioinjector-wm8731-audio-overlay.dts
 new file mode 100644
-index 0000000000000..68f4427d86c35
+index 000000000000..68f4427d86c3
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/audioinjector-wm8731-audio-overlay.dts
 @@ -0,0 +1,39 @@
@@ -91811,7 +91811,7 @@ index 0000000000000..68f4427d86c35
 +};
 diff --git a/arch/arm/boot/dts/overlays/audiosense-pi-overlay.dts b/arch/arm/boot/dts/overlays/audiosense-pi-overlay.dts
 new file mode 100644
-index 0000000000000..4b96a3a8a14a2
+index 000000000000..4b96a3a8a14a
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/audiosense-pi-overlay.dts
 @@ -0,0 +1,82 @@
@@ -91899,7 +91899,7 @@ index 0000000000000..4b96a3a8a14a2
 +};
 diff --git a/arch/arm/boot/dts/overlays/audremap-overlay.dts b/arch/arm/boot/dts/overlays/audremap-overlay.dts
 new file mode 100644
-index 0000000000000..d624bb3a3feaf
+index 000000000000..d624bb3a3fea
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/audremap-overlay.dts
 @@ -0,0 +1,35 @@
@@ -91940,7 +91940,7 @@ index 0000000000000..d624bb3a3feaf
 +};
 diff --git a/arch/arm/boot/dts/overlays/balena-fin-overlay.dts b/arch/arm/boot/dts/overlays/balena-fin-overlay.dts
 new file mode 100644
-index 0000000000000..249c8202b2ed4
+index 000000000000..249c8202b2ed
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/balena-fin-overlay.dts
 @@ -0,0 +1,122 @@
@@ -92068,7 +92068,7 @@ index 0000000000000..249c8202b2ed4
 +};
 diff --git a/arch/arm/boot/dts/overlays/bmp085_i2c-sensor-overlay.dts b/arch/arm/boot/dts/overlays/bmp085_i2c-sensor-overlay.dts
 new file mode 100644
-index 0000000000000..26dbbdd03ce5a
+index 000000000000..26dbbdd03ce5
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/bmp085_i2c-sensor-overlay.dts
 @@ -0,0 +1,23 @@
@@ -92097,7 +92097,7 @@ index 0000000000000..26dbbdd03ce5a
 +};
 diff --git a/arch/arm/boot/dts/overlays/dht11-overlay.dts b/arch/arm/boot/dts/overlays/dht11-overlay.dts
 new file mode 100644
-index 0000000000000..8de67527e3179
+index 000000000000..8de67527e317
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/dht11-overlay.dts
 @@ -0,0 +1,39 @@
@@ -92142,7 +92142,7 @@ index 0000000000000..8de67527e3179
 +};
 diff --git a/arch/arm/boot/dts/overlays/dionaudio-loco-overlay.dts b/arch/arm/boot/dts/overlays/dionaudio-loco-overlay.dts
 new file mode 100644
-index 0000000000000..d863e5c167cc9
+index 000000000000..d863e5c167cc
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/dionaudio-loco-overlay.dts
 @@ -0,0 +1,39 @@
@@ -92187,7 +92187,7 @@ index 0000000000000..d863e5c167cc9
 +};
 diff --git a/arch/arm/boot/dts/overlays/dionaudio-loco-v2-overlay.dts b/arch/arm/boot/dts/overlays/dionaudio-loco-v2-overlay.dts
 new file mode 100644
-index 0000000000000..dfb8922a654bb
+index 000000000000..dfb8922a654b
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/dionaudio-loco-v2-overlay.dts
 @@ -0,0 +1,49 @@
@@ -92242,7 +92242,7 @@ index 0000000000000..dfb8922a654bb
 +};
 diff --git a/arch/arm/boot/dts/overlays/disable-bt-overlay.dts b/arch/arm/boot/dts/overlays/disable-bt-overlay.dts
 new file mode 100644
-index 0000000000000..2f1b655a133c3
+index 000000000000..2f1b655a133c
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/disable-bt-overlay.dts
 @@ -0,0 +1,55 @@
@@ -92303,7 +92303,7 @@ index 0000000000000..2f1b655a133c3
 +};
 diff --git a/arch/arm/boot/dts/overlays/disable-wifi-overlay.dts b/arch/arm/boot/dts/overlays/disable-wifi-overlay.dts
 new file mode 100644
-index 0000000000000..75e0464639000
+index 000000000000..75e046463900
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/disable-wifi-overlay.dts
 @@ -0,0 +1,20 @@
@@ -92329,7 +92329,7 @@ index 0000000000000..75e0464639000
 +};
 diff --git a/arch/arm/boot/dts/overlays/dpi18-overlay.dts b/arch/arm/boot/dts/overlays/dpi18-overlay.dts
 new file mode 100644
-index 0000000000000..4abe5be744db7
+index 000000000000..4abe5be744db
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/dpi18-overlay.dts
 @@ -0,0 +1,39 @@
@@ -92374,7 +92374,7 @@ index 0000000000000..4abe5be744db7
 +};
 diff --git a/arch/arm/boot/dts/overlays/dpi24-overlay.dts b/arch/arm/boot/dts/overlays/dpi24-overlay.dts
 new file mode 100644
-index 0000000000000..44335cc812770
+index 000000000000..44335cc81277
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/dpi24-overlay.dts
 @@ -0,0 +1,39 @@
@@ -92419,7 +92419,7 @@ index 0000000000000..44335cc812770
 +};
 diff --git a/arch/arm/boot/dts/overlays/draws-overlay.dts b/arch/arm/boot/dts/overlays/draws-overlay.dts
 new file mode 100644
-index 0000000000000..32b665c3934b7
+index 000000000000..32b665c3934b
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/draws-overlay.dts
 @@ -0,0 +1,200 @@
@@ -92625,7 +92625,7 @@ index 0000000000000..32b665c3934b7
 +};
 diff --git a/arch/arm/boot/dts/overlays/dwc-otg-overlay.dts b/arch/arm/boot/dts/overlays/dwc-otg-overlay.dts
 new file mode 100644
-index 0000000000000..78c5e9f850484
+index 000000000000..78c5e9f85048
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/dwc-otg-overlay.dts
 @@ -0,0 +1,14 @@
@@ -92645,7 +92645,7 @@ index 0000000000000..78c5e9f850484
 +};
 diff --git a/arch/arm/boot/dts/overlays/dwc2-overlay.dts b/arch/arm/boot/dts/overlays/dwc2-overlay.dts
 new file mode 100644
-index 0000000000000..732adbe3faaf9
+index 000000000000..732adbe3faaf
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/dwc2-overlay.dts
 @@ -0,0 +1,26 @@
@@ -92677,7 +92677,7 @@ index 0000000000000..732adbe3faaf9
 +};
 diff --git a/arch/arm/boot/dts/overlays/enc28j60-overlay.dts b/arch/arm/boot/dts/overlays/enc28j60-overlay.dts
 new file mode 100644
-index 0000000000000..7af5c2e607ea0
+index 000000000000..7af5c2e607ea
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/enc28j60-overlay.dts
 @@ -0,0 +1,53 @@
@@ -92736,7 +92736,7 @@ index 0000000000000..7af5c2e607ea0
 +};
 diff --git a/arch/arm/boot/dts/overlays/enc28j60-spi2-overlay.dts b/arch/arm/boot/dts/overlays/enc28j60-spi2-overlay.dts
 new file mode 100644
-index 0000000000000..17cb5b8fa4852
+index 000000000000..17cb5b8fa485
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/enc28j60-spi2-overlay.dts
 @@ -0,0 +1,47 @@
@@ -92789,7 +92789,7 @@ index 0000000000000..17cb5b8fa4852
 +};
 diff --git a/arch/arm/boot/dts/overlays/exc3000-overlay.dts b/arch/arm/boot/dts/overlays/exc3000-overlay.dts
 new file mode 100644
-index 0000000000000..6f087fb206618
+index 000000000000..6f087fb20661
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/exc3000-overlay.dts
 @@ -0,0 +1,48 @@
@@ -92843,7 +92843,7 @@ index 0000000000000..6f087fb206618
 +};
 diff --git a/arch/arm/boot/dts/overlays/fe-pi-audio-overlay.dts b/arch/arm/boot/dts/overlays/fe-pi-audio-overlay.dts
 new file mode 100644
-index 0000000000000..1c3ec3e21a184
+index 000000000000..1c3ec3e21a18
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/fe-pi-audio-overlay.dts
 @@ -0,0 +1,70 @@
@@ -92919,7 +92919,7 @@ index 0000000000000..1c3ec3e21a184
 +};
 diff --git a/arch/arm/boot/dts/overlays/goodix-overlay.dts b/arch/arm/boot/dts/overlays/goodix-overlay.dts
 new file mode 100644
-index 0000000000000..8571527de49a6
+index 000000000000..8571527de49a
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/goodix-overlay.dts
 @@ -0,0 +1,46 @@
@@ -92971,7 +92971,7 @@ index 0000000000000..8571527de49a6
 +};
 diff --git a/arch/arm/boot/dts/overlays/googlevoicehat-soundcard-overlay.dts b/arch/arm/boot/dts/overlays/googlevoicehat-soundcard-overlay.dts
 new file mode 100644
-index 0000000000000..e443be1f9a0e7
+index 000000000000..e443be1f9a0e
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/googlevoicehat-soundcard-overlay.dts
 @@ -0,0 +1,49 @@
@@ -93026,7 +93026,7 @@ index 0000000000000..e443be1f9a0e7
 +};
 diff --git a/arch/arm/boot/dts/overlays/gpio-fan-overlay.dts b/arch/arm/boot/dts/overlays/gpio-fan-overlay.dts
 new file mode 100644
-index 0000000000000..0b14981b4824e
+index 000000000000..0b14981b4824
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/gpio-fan-overlay.dts
 @@ -0,0 +1,79 @@
@@ -93111,7 +93111,7 @@ index 0000000000000..0b14981b4824e
 +};
 diff --git a/arch/arm/boot/dts/overlays/gpio-ir-overlay.dts b/arch/arm/boot/dts/overlays/gpio-ir-overlay.dts
 new file mode 100644
-index 0000000000000..58f588498d68e
+index 000000000000..58f588498d68
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/gpio-ir-overlay.dts
 @@ -0,0 +1,48 @@
@@ -93165,7 +93165,7 @@ index 0000000000000..58f588498d68e
 +};
 diff --git a/arch/arm/boot/dts/overlays/gpio-ir-tx-overlay.dts b/arch/arm/boot/dts/overlays/gpio-ir-tx-overlay.dts
 new file mode 100644
-index 0000000000000..3625431b75604
+index 000000000000..3625431b7560
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/gpio-ir-tx-overlay.dts
 @@ -0,0 +1,36 @@
@@ -93207,7 +93207,7 @@ index 0000000000000..3625431b75604
 +};
 diff --git a/arch/arm/boot/dts/overlays/gpio-key-overlay.dts b/arch/arm/boot/dts/overlays/gpio-key-overlay.dts
 new file mode 100644
-index 0000000000000..2e7253d1d0abf
+index 000000000000..2e7253d1d0ab
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/gpio-key-overlay.dts
 @@ -0,0 +1,48 @@
@@ -93261,7 +93261,7 @@ index 0000000000000..2e7253d1d0abf
 +};
 diff --git a/arch/arm/boot/dts/overlays/gpio-no-bank0-irq-overlay.dts b/arch/arm/boot/dts/overlays/gpio-no-bank0-irq-overlay.dts
 new file mode 100755
-index 0000000000000..96cbe80820b72
+index 000000000000..96cbe80820b7
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/gpio-no-bank0-irq-overlay.dts
 @@ -0,0 +1,14 @@
@@ -93281,7 +93281,7 @@ index 0000000000000..96cbe80820b72
 +};
 diff --git a/arch/arm/boot/dts/overlays/gpio-no-irq-overlay.dts b/arch/arm/boot/dts/overlays/gpio-no-irq-overlay.dts
 new file mode 100644
-index 0000000000000..55f9bff3a8f62
+index 000000000000..55f9bff3a8f6
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/gpio-no-irq-overlay.dts
 @@ -0,0 +1,14 @@
@@ -93301,7 +93301,7 @@ index 0000000000000..55f9bff3a8f62
 +};
 diff --git a/arch/arm/boot/dts/overlays/gpio-poweroff-overlay.dts b/arch/arm/boot/dts/overlays/gpio-poweroff-overlay.dts
 new file mode 100644
-index 0000000000000..bb8cd3bf264d1
+index 000000000000..bb8cd3bf264d
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/gpio-poweroff-overlay.dts
 @@ -0,0 +1,36 @@
@@ -93343,7 +93343,7 @@ index 0000000000000..bb8cd3bf264d1
 +};
 diff --git a/arch/arm/boot/dts/overlays/gpio-shutdown-overlay.dts b/arch/arm/boot/dts/overlays/gpio-shutdown-overlay.dts
 new file mode 100644
-index 0000000000000..db07ba67781d7
+index 000000000000..db07ba67781d
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/gpio-shutdown-overlay.dts
 @@ -0,0 +1,82 @@
@@ -93431,7 +93431,7 @@ index 0000000000000..db07ba67781d7
 +};
 diff --git a/arch/arm/boot/dts/overlays/hd44780-lcd-overlay.dts b/arch/arm/boot/dts/overlays/hd44780-lcd-overlay.dts
 new file mode 100644
-index 0000000000000..ee726669ff511
+index 000000000000..ee726669ff51
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/hd44780-lcd-overlay.dts
 @@ -0,0 +1,46 @@
@@ -93483,7 +93483,7 @@ index 0000000000000..ee726669ff511
 +};
 diff --git a/arch/arm/boot/dts/overlays/hifiberry-amp-overlay.dts b/arch/arm/boot/dts/overlays/hifiberry-amp-overlay.dts
 new file mode 100644
-index 0000000000000..142518ab348b1
+index 000000000000..142518ab348b
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/hifiberry-amp-overlay.dts
 @@ -0,0 +1,39 @@
@@ -93528,7 +93528,7 @@ index 0000000000000..142518ab348b1
 +};
 diff --git a/arch/arm/boot/dts/overlays/hifiberry-dac-overlay.dts b/arch/arm/boot/dts/overlays/hifiberry-dac-overlay.dts
 new file mode 100644
-index 0000000000000..ea8a6c8f36c0a
+index 000000000000..ea8a6c8f36c0
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/hifiberry-dac-overlay.dts
 @@ -0,0 +1,34 @@
@@ -93568,7 +93568,7 @@ index 0000000000000..ea8a6c8f36c0a
 +};
 diff --git a/arch/arm/boot/dts/overlays/hifiberry-dacplus-overlay.dts b/arch/arm/boot/dts/overlays/hifiberry-dacplus-overlay.dts
 new file mode 100644
-index 0000000000000..5cd14aac3e45f
+index 000000000000..5cd14aac3e45
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/hifiberry-dacplus-overlay.dts
 @@ -0,0 +1,59 @@
@@ -93633,7 +93633,7 @@ index 0000000000000..5cd14aac3e45f
 +};
 diff --git a/arch/arm/boot/dts/overlays/hifiberry-dacplusadc-overlay.dts b/arch/arm/boot/dts/overlays/hifiberry-dacplusadc-overlay.dts
 new file mode 100644
-index 0000000000000..09adcea8fd377
+index 000000000000..09adcea8fd37
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/hifiberry-dacplusadc-overlay.dts
 @@ -0,0 +1,71 @@
@@ -93710,7 +93710,7 @@ index 0000000000000..09adcea8fd377
 +};
 diff --git a/arch/arm/boot/dts/overlays/hifiberry-dacplusadcpro-overlay.dts b/arch/arm/boot/dts/overlays/hifiberry-dacplusadcpro-overlay.dts
 new file mode 100644
-index 0000000000000..00e5d450a88b1
+index 000000000000..00e5d450a88b
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/hifiberry-dacplusadcpro-overlay.dts
 @@ -0,0 +1,64 @@
@@ -93780,7 +93780,7 @@ index 0000000000000..00e5d450a88b1
 +};
 diff --git a/arch/arm/boot/dts/overlays/hifiberry-dacplusdsp-overlay.dts b/arch/arm/boot/dts/overlays/hifiberry-dacplusdsp-overlay.dts
 new file mode 100644
-index 0000000000000..63432e8b983fe
+index 000000000000..63432e8b983f
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/hifiberry-dacplusdsp-overlay.dts
 @@ -0,0 +1,34 @@
@@ -93820,7 +93820,7 @@ index 0000000000000..63432e8b983fe
 +};
 diff --git a/arch/arm/boot/dts/overlays/hifiberry-digi-overlay.dts b/arch/arm/boot/dts/overlays/hifiberry-digi-overlay.dts
 new file mode 100644
-index 0000000000000..a2309a50e8d86
+index 000000000000..a2309a50e8d8
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/hifiberry-digi-overlay.dts
 @@ -0,0 +1,41 @@
@@ -93867,7 +93867,7 @@ index 0000000000000..a2309a50e8d86
 +};
 diff --git a/arch/arm/boot/dts/overlays/hifiberry-digi-pro-overlay.dts b/arch/arm/boot/dts/overlays/hifiberry-digi-pro-overlay.dts
 new file mode 100644
-index 0000000000000..83de602e76ba1
+index 000000000000..83de602e76ba
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/hifiberry-digi-pro-overlay.dts
 @@ -0,0 +1,43 @@
@@ -93916,7 +93916,7 @@ index 0000000000000..83de602e76ba1
 +};
 diff --git a/arch/arm/boot/dts/overlays/hy28a-overlay.dts b/arch/arm/boot/dts/overlays/hy28a-overlay.dts
 new file mode 100644
-index 0000000000000..aa6463e6e7497
+index 000000000000..aa6463e6e749
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/hy28a-overlay.dts
 @@ -0,0 +1,93 @@
@@ -94015,7 +94015,7 @@ index 0000000000000..aa6463e6e7497
 +};
 diff --git a/arch/arm/boot/dts/overlays/hy28b-2017-overlay.dts b/arch/arm/boot/dts/overlays/hy28b-2017-overlay.dts
 new file mode 100644
-index 0000000000000..42b68b684bd0a
+index 000000000000..42b68b684bd0
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/hy28b-2017-overlay.dts
 @@ -0,0 +1,152 @@
@@ -94173,7 +94173,7 @@ index 0000000000000..42b68b684bd0a
 +};
 diff --git a/arch/arm/boot/dts/overlays/hy28b-overlay.dts b/arch/arm/boot/dts/overlays/hy28b-overlay.dts
 new file mode 100644
-index 0000000000000..2e5e20f327a3c
+index 000000000000..2e5e20f327a3
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/hy28b-overlay.dts
 @@ -0,0 +1,148 @@
@@ -94327,7 +94327,7 @@ index 0000000000000..2e5e20f327a3c
 +};
 diff --git a/arch/arm/boot/dts/overlays/i-sabre-q2m-overlay.dts b/arch/arm/boot/dts/overlays/i-sabre-q2m-overlay.dts
 new file mode 100644
-index 0000000000000..0c4cff354674b
+index 000000000000..0c4cff354674
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/i-sabre-q2m-overlay.dts
 @@ -0,0 +1,39 @@
@@ -94372,7 +94372,7 @@ index 0000000000000..0c4cff354674b
 +};
 diff --git a/arch/arm/boot/dts/overlays/i2c-bcm2708-overlay.dts b/arch/arm/boot/dts/overlays/i2c-bcm2708-overlay.dts
 new file mode 100644
-index 0000000000000..8204b6b3aef83
+index 000000000000..8204b6b3aef8
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/i2c-bcm2708-overlay.dts
 @@ -0,0 +1,13 @@
@@ -94391,7 +94391,7 @@ index 0000000000000..8204b6b3aef83
 +};
 diff --git a/arch/arm/boot/dts/overlays/i2c-gpio-overlay.dts b/arch/arm/boot/dts/overlays/i2c-gpio-overlay.dts
 new file mode 100644
-index 0000000000000..39e7bc5fa9d88
+index 000000000000..39e7bc5fa9d8
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/i2c-gpio-overlay.dts
 @@ -0,0 +1,45 @@
@@ -94442,7 +94442,7 @@ index 0000000000000..39e7bc5fa9d88
 +};
 diff --git a/arch/arm/boot/dts/overlays/i2c-mux-overlay.dts b/arch/arm/boot/dts/overlays/i2c-mux-overlay.dts
 new file mode 100644
-index 0000000000000..112aed91ecb24
+index 000000000000..112aed91ecb2
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/i2c-mux-overlay.dts
 @@ -0,0 +1,139 @@
@@ -94587,7 +94587,7 @@ index 0000000000000..112aed91ecb24
 +};
 diff --git a/arch/arm/boot/dts/overlays/i2c-pwm-pca9685a-overlay.dts b/arch/arm/boot/dts/overlays/i2c-pwm-pca9685a-overlay.dts
 new file mode 100644
-index 0000000000000..108165df165ef
+index 000000000000..108165df165e
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/i2c-pwm-pca9685a-overlay.dts
 @@ -0,0 +1,26 @@
@@ -94619,7 +94619,7 @@ index 0000000000000..108165df165ef
 +};
 diff --git a/arch/arm/boot/dts/overlays/i2c-rtc-gpio-overlay.dts b/arch/arm/boot/dts/overlays/i2c-rtc-gpio-overlay.dts
 new file mode 100644
-index 0000000000000..44df77459520b
+index 000000000000..44df77459520
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/i2c-rtc-gpio-overlay.dts
 @@ -0,0 +1,244 @@
@@ -94869,7 +94869,7 @@ index 0000000000000..44df77459520b
 +};
 diff --git a/arch/arm/boot/dts/overlays/i2c-rtc-overlay.dts b/arch/arm/boot/dts/overlays/i2c-rtc-overlay.dts
 new file mode 100644
-index 0000000000000..af5ca042de75a
+index 000000000000..af5ca042de75
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/i2c-rtc-overlay.dts
 @@ -0,0 +1,225 @@
@@ -95100,7 +95100,7 @@ index 0000000000000..af5ca042de75a
 +};
 diff --git a/arch/arm/boot/dts/overlays/i2c-sensor-overlay.dts b/arch/arm/boot/dts/overlays/i2c-sensor-overlay.dts
 new file mode 100644
-index 0000000000000..777e4a68190a4
+index 000000000000..777e4a68190a
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/i2c-sensor-overlay.dts
 @@ -0,0 +1,239 @@
@@ -95345,7 +95345,7 @@ index 0000000000000..777e4a68190a4
 +};
 diff --git a/arch/arm/boot/dts/overlays/i2c0-bcm2708-overlay.dts b/arch/arm/boot/dts/overlays/i2c0-bcm2708-overlay.dts
 new file mode 100644
-index 0000000000000..02f7dca9b71e6
+index 000000000000..02f7dca9b71e
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/i2c0-bcm2708-overlay.dts
 @@ -0,0 +1,14 @@
@@ -95365,7 +95365,7 @@ index 0000000000000..02f7dca9b71e6
 +};
 diff --git a/arch/arm/boot/dts/overlays/i2c0-overlay.dts b/arch/arm/boot/dts/overlays/i2c0-overlay.dts
 new file mode 100644
-index 0000000000000..6b1f9ec6c8782
+index 000000000000..6b1f9ec6c878
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/i2c0-overlay.dts
 @@ -0,0 +1,61 @@
@@ -95432,7 +95432,7 @@ index 0000000000000..6b1f9ec6c8782
 +};
 diff --git a/arch/arm/boot/dts/overlays/i2c1-bcm2708-overlay.dts b/arch/arm/boot/dts/overlays/i2c1-bcm2708-overlay.dts
 new file mode 100644
-index 0000000000000..09d8b16a6256d
+index 000000000000..09d8b16a6256
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/i2c1-bcm2708-overlay.dts
 @@ -0,0 +1,9 @@
@@ -95447,7 +95447,7 @@ index 0000000000000..09d8b16a6256d
 +};
 diff --git a/arch/arm/boot/dts/overlays/i2c1-overlay.dts b/arch/arm/boot/dts/overlays/i2c1-overlay.dts
 new file mode 100644
-index 0000000000000..addaed73e6656
+index 000000000000..addaed73e665
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/i2c1-overlay.dts
 @@ -0,0 +1,44 @@
@@ -95497,7 +95497,7 @@ index 0000000000000..addaed73e6656
 +};
 diff --git a/arch/arm/boot/dts/overlays/i2c3-overlay.dts b/arch/arm/boot/dts/overlays/i2c3-overlay.dts
 new file mode 100644
-index 0000000000000..e24a1df21f991
+index 000000000000..e24a1df21f99
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/i2c3-overlay.dts
 @@ -0,0 +1,36 @@
@@ -95539,7 +95539,7 @@ index 0000000000000..e24a1df21f991
 +};
 diff --git a/arch/arm/boot/dts/overlays/i2c4-overlay.dts b/arch/arm/boot/dts/overlays/i2c4-overlay.dts
 new file mode 100644
-index 0000000000000..14c7f4d1da4c7
+index 000000000000..14c7f4d1da4c
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/i2c4-overlay.dts
 @@ -0,0 +1,36 @@
@@ -95581,7 +95581,7 @@ index 0000000000000..14c7f4d1da4c7
 +};
 diff --git a/arch/arm/boot/dts/overlays/i2c5-overlay.dts b/arch/arm/boot/dts/overlays/i2c5-overlay.dts
 new file mode 100644
-index 0000000000000..7953621112ded
+index 000000000000..7953621112de
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/i2c5-overlay.dts
 @@ -0,0 +1,36 @@
@@ -95623,7 +95623,7 @@ index 0000000000000..7953621112ded
 +};
 diff --git a/arch/arm/boot/dts/overlays/i2c6-overlay.dts b/arch/arm/boot/dts/overlays/i2c6-overlay.dts
 new file mode 100644
-index 0000000000000..555305a7ee1fd
+index 000000000000..555305a7ee1f
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/i2c6-overlay.dts
 @@ -0,0 +1,36 @@
@@ -95665,7 +95665,7 @@ index 0000000000000..555305a7ee1fd
 +};
 diff --git a/arch/arm/boot/dts/overlays/i2s-gpio28-31-overlay.dts b/arch/arm/boot/dts/overlays/i2s-gpio28-31-overlay.dts
 new file mode 100644
-index 0000000000000..cf43094c6ff45
+index 000000000000..cf43094c6ff4
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/i2s-gpio28-31-overlay.dts
 @@ -0,0 +1,18 @@
@@ -95689,7 +95689,7 @@ index 0000000000000..cf43094c6ff45
 +};
 diff --git a/arch/arm/boot/dts/overlays/ilitek251x-overlay.dts b/arch/arm/boot/dts/overlays/ilitek251x-overlay.dts
 new file mode 100644
-index 0000000000000..551aba591d263
+index 000000000000..551aba591d26
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/ilitek251x-overlay.dts
 @@ -0,0 +1,45 @@
@@ -95740,7 +95740,7 @@ index 0000000000000..551aba591d263
 +};
 diff --git a/arch/arm/boot/dts/overlays/imx219-overlay.dts b/arch/arm/boot/dts/overlays/imx219-overlay.dts
 new file mode 100644
-index 0000000000000..2a1500d07b680
+index 000000000000..2a1500d07b68
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/imx219-overlay.dts
 @@ -0,0 +1,129 @@
@@ -95875,7 +95875,7 @@ index 0000000000000..2a1500d07b680
 +};
 diff --git a/arch/arm/boot/dts/overlays/iqaudio-codec-overlay.dts b/arch/arm/boot/dts/overlays/iqaudio-codec-overlay.dts
 new file mode 100644
-index 0000000000000..ff3ef3942c6c0
+index 000000000000..ff3ef3942c6c
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/iqaudio-codec-overlay.dts
 @@ -0,0 +1,42 @@
@@ -95923,7 +95923,7 @@ index 0000000000000..ff3ef3942c6c0
 +};
 diff --git a/arch/arm/boot/dts/overlays/iqaudio-dac-overlay.dts b/arch/arm/boot/dts/overlays/iqaudio-dac-overlay.dts
 new file mode 100644
-index 0000000000000..24073cadd0eff
+index 000000000000..24073cadd0ef
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/iqaudio-dac-overlay.dts
 @@ -0,0 +1,46 @@
@@ -95975,7 +95975,7 @@ index 0000000000000..24073cadd0eff
 +};
 diff --git a/arch/arm/boot/dts/overlays/iqaudio-dacplus-overlay.dts b/arch/arm/boot/dts/overlays/iqaudio-dacplus-overlay.dts
 new file mode 100644
-index 0000000000000..7c70b25e58d75
+index 000000000000..7c70b25e58d7
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/iqaudio-dacplus-overlay.dts
 @@ -0,0 +1,49 @@
@@ -96030,7 +96030,7 @@ index 0000000000000..7c70b25e58d75
 +};
 diff --git a/arch/arm/boot/dts/overlays/iqaudio-digi-wm8804-audio-overlay.dts b/arch/arm/boot/dts/overlays/iqaudio-digi-wm8804-audio-overlay.dts
 new file mode 100644
-index 0000000000000..ee54095c869be
+index 000000000000..ee54095c869b
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/iqaudio-digi-wm8804-audio-overlay.dts
 @@ -0,0 +1,47 @@
@@ -96083,7 +96083,7 @@ index 0000000000000..ee54095c869be
 +};
 diff --git a/arch/arm/boot/dts/overlays/irs1125-overlay.dts b/arch/arm/boot/dts/overlays/irs1125-overlay.dts
 new file mode 100644
-index 0000000000000..b9006715a5397
+index 000000000000..b9006715a539
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/irs1125-overlay.dts
 @@ -0,0 +1,97 @@
@@ -96186,7 +96186,7 @@ index 0000000000000..b9006715a5397
 +};
 diff --git a/arch/arm/boot/dts/overlays/jedec-spi-nor-overlay.dts b/arch/arm/boot/dts/overlays/jedec-spi-nor-overlay.dts
 new file mode 100644
-index 0000000000000..585c7dbcdf7f5
+index 000000000000..585c7dbcdf7f
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/jedec-spi-nor-overlay.dts
 @@ -0,0 +1,309 @@
@@ -96501,7 +96501,7 @@ index 0000000000000..585c7dbcdf7f5
 +
 diff --git a/arch/arm/boot/dts/overlays/justboom-dac-overlay.dts b/arch/arm/boot/dts/overlays/justboom-dac-overlay.dts
 new file mode 100644
-index 0000000000000..d00515dca4193
+index 000000000000..d00515dca419
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/justboom-dac-overlay.dts
 @@ -0,0 +1,46 @@
@@ -96553,7 +96553,7 @@ index 0000000000000..d00515dca4193
 +};
 diff --git a/arch/arm/boot/dts/overlays/justboom-digi-overlay.dts b/arch/arm/boot/dts/overlays/justboom-digi-overlay.dts
 new file mode 100644
-index 0000000000000..e73336029c544
+index 000000000000..e73336029c54
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/justboom-digi-overlay.dts
 @@ -0,0 +1,41 @@
@@ -96600,7 +96600,7 @@ index 0000000000000..e73336029c544
 +};
 diff --git a/arch/arm/boot/dts/overlays/ltc294x-overlay.dts b/arch/arm/boot/dts/overlays/ltc294x-overlay.dts
 new file mode 100644
-index 0000000000000..6d971f3649ca5
+index 000000000000..6d971f3649ca
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/ltc294x-overlay.dts
 @@ -0,0 +1,86 @@
@@ -96692,7 +96692,7 @@ index 0000000000000..6d971f3649ca5
 +};
 diff --git a/arch/arm/boot/dts/overlays/max98357a-overlay.dts b/arch/arm/boot/dts/overlays/max98357a-overlay.dts
 new file mode 100644
-index 0000000000000..9e2afb05b7cb5
+index 000000000000..9e2afb05b7cb
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/max98357a-overlay.dts
 @@ -0,0 +1,84 @@
@@ -96782,7 +96782,7 @@ index 0000000000000..9e2afb05b7cb5
 +};
 diff --git a/arch/arm/boot/dts/overlays/mbed-dac-overlay.dts b/arch/arm/boot/dts/overlays/mbed-dac-overlay.dts
 new file mode 100644
-index 0000000000000..840dd9b31db41
+index 000000000000..840dd9b31db4
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/mbed-dac-overlay.dts
 @@ -0,0 +1,64 @@
@@ -96852,7 +96852,7 @@ index 0000000000000..840dd9b31db41
 +};
 diff --git a/arch/arm/boot/dts/overlays/mcp23017-overlay.dts b/arch/arm/boot/dts/overlays/mcp23017-overlay.dts
 new file mode 100644
-index 0000000000000..16af971c3bdb7
+index 000000000000..16af971c3bdb
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/mcp23017-overlay.dts
 @@ -0,0 +1,71 @@
@@ -96929,7 +96929,7 @@ index 0000000000000..16af971c3bdb7
 +
 diff --git a/arch/arm/boot/dts/overlays/mcp23s17-overlay.dts b/arch/arm/boot/dts/overlays/mcp23s17-overlay.dts
 new file mode 100644
-index 0000000000000..484d64b225fb8
+index 000000000000..484d64b225fb
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/mcp23s17-overlay.dts
 @@ -0,0 +1,732 @@
@@ -97667,7 +97667,7 @@ index 0000000000000..484d64b225fb8
 +
 diff --git a/arch/arm/boot/dts/overlays/mcp2515-can0-overlay.dts b/arch/arm/boot/dts/overlays/mcp2515-can0-overlay.dts
 new file mode 100755
-index 0000000000000..0dae8053a9a91
+index 000000000000..0dae8053a9a9
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/mcp2515-can0-overlay.dts
 @@ -0,0 +1,73 @@
@@ -97746,7 +97746,7 @@ index 0000000000000..0dae8053a9a91
 +};
 diff --git a/arch/arm/boot/dts/overlays/mcp2515-can1-overlay.dts b/arch/arm/boot/dts/overlays/mcp2515-can1-overlay.dts
 new file mode 100644
-index 0000000000000..c70dc3d05ebfe
+index 000000000000..c70dc3d05ebf
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/mcp2515-can1-overlay.dts
 @@ -0,0 +1,73 @@
@@ -97825,7 +97825,7 @@ index 0000000000000..c70dc3d05ebfe
 +};
 diff --git a/arch/arm/boot/dts/overlays/mcp3008-overlay.dts b/arch/arm/boot/dts/overlays/mcp3008-overlay.dts
 new file mode 100755
-index 0000000000000..0b7d9f75546ef
+index 000000000000..0b7d9f75546e
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/mcp3008-overlay.dts
 @@ -0,0 +1,205 @@
@@ -98036,7 +98036,7 @@ index 0000000000000..0b7d9f75546ef
 +};
 diff --git a/arch/arm/boot/dts/overlays/mcp3202-overlay.dts b/arch/arm/boot/dts/overlays/mcp3202-overlay.dts
 new file mode 100755
-index 0000000000000..8e4e9f60f285f
+index 000000000000..8e4e9f60f285
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/mcp3202-overlay.dts
 @@ -0,0 +1,205 @@
@@ -98247,7 +98247,7 @@ index 0000000000000..8e4e9f60f285f
 +};
 diff --git a/arch/arm/boot/dts/overlays/mcp342x-overlay.dts b/arch/arm/boot/dts/overlays/mcp342x-overlay.dts
 new file mode 100644
-index 0000000000000..7bbb528f804f5
+index 000000000000..7bbb528f804f
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/mcp342x-overlay.dts
 @@ -0,0 +1,93 @@
@@ -98346,7 +98346,7 @@ index 0000000000000..7bbb528f804f5
 +
 diff --git a/arch/arm/boot/dts/overlays/media-center-overlay.dts b/arch/arm/boot/dts/overlays/media-center-overlay.dts
 new file mode 100644
-index 0000000000000..0fcdcfa18eb3b
+index 000000000000..0fcdcfa18eb3
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/media-center-overlay.dts
 @@ -0,0 +1,134 @@
@@ -98486,7 +98486,7 @@ index 0000000000000..0fcdcfa18eb3b
 +};
 diff --git a/arch/arm/boot/dts/overlays/midi-uart0-overlay.dts b/arch/arm/boot/dts/overlays/midi-uart0-overlay.dts
 new file mode 100644
-index 0000000000000..565af7cf79d76
+index 000000000000..565af7cf79d7
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/midi-uart0-overlay.dts
 @@ -0,0 +1,36 @@
@@ -98528,7 +98528,7 @@ index 0000000000000..565af7cf79d76
 +};
 diff --git a/arch/arm/boot/dts/overlays/midi-uart1-overlay.dts b/arch/arm/boot/dts/overlays/midi-uart1-overlay.dts
 new file mode 100644
-index 0000000000000..e0bc410acbff3
+index 000000000000..e0bc410acbff
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/midi-uart1-overlay.dts
 @@ -0,0 +1,43 @@
@@ -98577,7 +98577,7 @@ index 0000000000000..e0bc410acbff3
 +};
 diff --git a/arch/arm/boot/dts/overlays/miniuart-bt-overlay.dts b/arch/arm/boot/dts/overlays/miniuart-bt-overlay.dts
 new file mode 100644
-index 0000000000000..30d3d8549da0a
+index 000000000000..30d3d8549da0
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/miniuart-bt-overlay.dts
 @@ -0,0 +1,74 @@
@@ -98657,7 +98657,7 @@ index 0000000000000..30d3d8549da0a
 +};
 diff --git a/arch/arm/boot/dts/overlays/mmc-overlay.dts b/arch/arm/boot/dts/overlays/mmc-overlay.dts
 new file mode 100644
-index 0000000000000..c1a2f691aa1e7
+index 000000000000..c1a2f691aa1e
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/mmc-overlay.dts
 @@ -0,0 +1,46 @@
@@ -98709,7 +98709,7 @@ index 0000000000000..c1a2f691aa1e7
 +};
 diff --git a/arch/arm/boot/dts/overlays/mpu6050-overlay.dts b/arch/arm/boot/dts/overlays/mpu6050-overlay.dts
 new file mode 100644
-index 0000000000000..3109d90562aee
+index 000000000000..3109d90562ae
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/mpu6050-overlay.dts
 @@ -0,0 +1,28 @@
@@ -98743,7 +98743,7 @@ index 0000000000000..3109d90562aee
 +};
 diff --git a/arch/arm/boot/dts/overlays/mz61581-overlay.dts b/arch/arm/boot/dts/overlays/mz61581-overlay.dts
 new file mode 100644
-index 0000000000000..32686968c0d65
+index 000000000000..32686968c0d6
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/mz61581-overlay.dts
 @@ -0,0 +1,117 @@
@@ -98866,7 +98866,7 @@ index 0000000000000..32686968c0d65
 +};
 diff --git a/arch/arm/boot/dts/overlays/ov5647-overlay.dts b/arch/arm/boot/dts/overlays/ov5647-overlay.dts
 new file mode 100644
-index 0000000000000..5266d4b8758d3
+index 000000000000..5266d4b8758d
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/ov5647-overlay.dts
 @@ -0,0 +1,99 @@
@@ -98971,7 +98971,7 @@ index 0000000000000..5266d4b8758d3
 +};
 diff --git a/arch/arm/boot/dts/overlays/papirus-overlay.dts b/arch/arm/boot/dts/overlays/papirus-overlay.dts
 new file mode 100644
-index 0000000000000..7b6bcfd49c86e
+index 000000000000..7b6bcfd49c86
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/papirus-overlay.dts
 @@ -0,0 +1,89 @@
@@ -99066,35 +99066,35 @@ index 0000000000000..7b6bcfd49c86e
 +};
 diff --git a/arch/arm/boot/dts/overlays/pi3-act-led-overlay.dts b/arch/arm/boot/dts/overlays/pi3-act-led-overlay.dts
 new file mode 100644
-index 0000000000000..aedfc90e8a31d
+index 000000000000..aedfc90e8a31
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/pi3-act-led-overlay.dts
 @@ -0,0 +1 @@
 +#include "act-led-overlay.dts"
 diff --git a/arch/arm/boot/dts/overlays/pi3-disable-bt-overlay.dts b/arch/arm/boot/dts/overlays/pi3-disable-bt-overlay.dts
 new file mode 100644
-index 0000000000000..e09a49295236b
+index 000000000000..e09a49295236
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/pi3-disable-bt-overlay.dts
 @@ -0,0 +1 @@
 +#include "disable-bt-overlay.dts"
 diff --git a/arch/arm/boot/dts/overlays/pi3-disable-wifi-overlay.dts b/arch/arm/boot/dts/overlays/pi3-disable-wifi-overlay.dts
 new file mode 100644
-index 0000000000000..b61b69c14f37c
+index 000000000000..b61b69c14f37
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/pi3-disable-wifi-overlay.dts
 @@ -0,0 +1 @@
 +#include "disable-wifi-overlay.dts"
 diff --git a/arch/arm/boot/dts/overlays/pi3-miniuart-bt-overlay.dts b/arch/arm/boot/dts/overlays/pi3-miniuart-bt-overlay.dts
 new file mode 100644
-index 0000000000000..94c14267716eb
+index 000000000000..94c14267716e
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/pi3-miniuart-bt-overlay.dts
 @@ -0,0 +1 @@
 +#include "miniuart-bt-overlay.dts"
 diff --git a/arch/arm/boot/dts/overlays/pibell-overlay.dts b/arch/arm/boot/dts/overlays/pibell-overlay.dts
 new file mode 100644
-index 0000000000000..9333a9b09772f
+index 000000000000..9333a9b09772
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/pibell-overlay.dts
 @@ -0,0 +1,81 @@
@@ -99181,7 +99181,7 @@ index 0000000000000..9333a9b09772f
 +};
 diff --git a/arch/arm/boot/dts/overlays/piglow-overlay.dts b/arch/arm/boot/dts/overlays/piglow-overlay.dts
 new file mode 100644
-index 0000000000000..075bceef158c8
+index 000000000000..075bceef158c
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/piglow-overlay.dts
 @@ -0,0 +1,97 @@
@@ -99284,7 +99284,7 @@ index 0000000000000..075bceef158c8
 +};
 diff --git a/arch/arm/boot/dts/overlays/piscreen-overlay.dts b/arch/arm/boot/dts/overlays/piscreen-overlay.dts
 new file mode 100644
-index 0000000000000..ae1af76d3923f
+index 000000000000..ae1af76d3923
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/piscreen-overlay.dts
 @@ -0,0 +1,102 @@
@@ -99392,7 +99392,7 @@ index 0000000000000..ae1af76d3923f
 +};
 diff --git a/arch/arm/boot/dts/overlays/piscreen2r-overlay.dts b/arch/arm/boot/dts/overlays/piscreen2r-overlay.dts
 new file mode 100644
-index 0000000000000..93b85be3f7c15
+index 000000000000..93b85be3f7c1
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/piscreen2r-overlay.dts
 @@ -0,0 +1,106 @@
@@ -99504,7 +99504,7 @@ index 0000000000000..93b85be3f7c15
 +
 diff --git a/arch/arm/boot/dts/overlays/pisound-overlay.dts b/arch/arm/boot/dts/overlays/pisound-overlay.dts
 new file mode 100644
-index 0000000000000..49efb2b768fbc
+index 000000000000..49efb2b768fb
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/pisound-overlay.dts
 @@ -0,0 +1,120 @@
@@ -99630,7 +99630,7 @@ index 0000000000000..49efb2b768fbc
 +};
 diff --git a/arch/arm/boot/dts/overlays/pitft22-overlay.dts b/arch/arm/boot/dts/overlays/pitft22-overlay.dts
 new file mode 100644
-index 0000000000000..589ad13795b18
+index 000000000000..589ad13795b1
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/pitft22-overlay.dts
 @@ -0,0 +1,69 @@
@@ -99705,7 +99705,7 @@ index 0000000000000..589ad13795b18
 +};
 diff --git a/arch/arm/boot/dts/overlays/pitft28-capacitive-overlay.dts b/arch/arm/boot/dts/overlays/pitft28-capacitive-overlay.dts
 new file mode 100644
-index 0000000000000..33901ee1db7a7
+index 000000000000..33901ee1db7a
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/pitft28-capacitive-overlay.dts
 @@ -0,0 +1,91 @@
@@ -99802,7 +99802,7 @@ index 0000000000000..33901ee1db7a7
 +};
 diff --git a/arch/arm/boot/dts/overlays/pitft28-resistive-overlay.dts b/arch/arm/boot/dts/overlays/pitft28-resistive-overlay.dts
 new file mode 100644
-index 0000000000000..4a4a3f44c29d5
+index 000000000000..4a4a3f44c29d
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/pitft28-resistive-overlay.dts
 @@ -0,0 +1,119 @@
@@ -99927,7 +99927,7 @@ index 0000000000000..4a4a3f44c29d5
 +};
 diff --git a/arch/arm/boot/dts/overlays/pitft35-resistive-overlay.dts b/arch/arm/boot/dts/overlays/pitft35-resistive-overlay.dts
 new file mode 100644
-index 0000000000000..a69b6c2c76081
+index 000000000000..a69b6c2c7608
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/pitft35-resistive-overlay.dts
 @@ -0,0 +1,119 @@
@@ -100052,7 +100052,7 @@ index 0000000000000..a69b6c2c76081
 +};
 diff --git a/arch/arm/boot/dts/overlays/pps-gpio-overlay.dts b/arch/arm/boot/dts/overlays/pps-gpio-overlay.dts
 new file mode 100644
-index 0000000000000..524a1c1d36700
+index 000000000000..524a1c1d3670
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/pps-gpio-overlay.dts
 @@ -0,0 +1,38 @@
@@ -100096,7 +100096,7 @@ index 0000000000000..524a1c1d36700
 +};
 diff --git a/arch/arm/boot/dts/overlays/pwm-2chan-overlay.dts b/arch/arm/boot/dts/overlays/pwm-2chan-overlay.dts
 new file mode 100644
-index 0000000000000..abdeddd0f2c87
+index 000000000000..abdeddd0f2c8
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/pwm-2chan-overlay.dts
 @@ -0,0 +1,47 @@
@@ -100149,7 +100149,7 @@ index 0000000000000..abdeddd0f2c87
 +};
 diff --git a/arch/arm/boot/dts/overlays/pwm-ir-tx-overlay.dts b/arch/arm/boot/dts/overlays/pwm-ir-tx-overlay.dts
 new file mode 100644
-index 0000000000000..119caf746b3b3
+index 000000000000..119caf746b3b
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/pwm-ir-tx-overlay.dts
 @@ -0,0 +1,40 @@
@@ -100195,7 +100195,7 @@ index 0000000000000..119caf746b3b3
 +};
 diff --git a/arch/arm/boot/dts/overlays/pwm-overlay.dts b/arch/arm/boot/dts/overlays/pwm-overlay.dts
 new file mode 100644
-index 0000000000000..27809e8dc7466
+index 000000000000..27809e8dc746
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/pwm-overlay.dts
 @@ -0,0 +1,43 @@
@@ -100244,7 +100244,7 @@ index 0000000000000..27809e8dc7466
 +};
 diff --git a/arch/arm/boot/dts/overlays/qca7000-overlay.dts b/arch/arm/boot/dts/overlays/qca7000-overlay.dts
 new file mode 100644
-index 0000000000000..9a451202a2eb7
+index 000000000000..9a451202a2eb
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/qca7000-overlay.dts
 @@ -0,0 +1,55 @@
@@ -100305,7 +100305,7 @@ index 0000000000000..9a451202a2eb7
 +};
 diff --git a/arch/arm/boot/dts/overlays/rotary-encoder-overlay.dts b/arch/arm/boot/dts/overlays/rotary-encoder-overlay.dts
 new file mode 100644
-index 0000000000000..ea1d952734e9f
+index 000000000000..ea1d952734e9
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/rotary-encoder-overlay.dts
 @@ -0,0 +1,59 @@
@@ -100370,7 +100370,7 @@ index 0000000000000..ea1d952734e9f
 +};
 diff --git a/arch/arm/boot/dts/overlays/rpi-backlight-overlay.dts b/arch/arm/boot/dts/overlays/rpi-backlight-overlay.dts
 new file mode 100644
-index 0000000000000..cac5e44c6ec54
+index 000000000000..cac5e44c6ec5
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/rpi-backlight-overlay.dts
 @@ -0,0 +1,21 @@
@@ -100397,7 +100397,7 @@ index 0000000000000..cac5e44c6ec54
 +};
 diff --git a/arch/arm/boot/dts/overlays/rpi-cirrus-wm5102-overlay.dts b/arch/arm/boot/dts/overlays/rpi-cirrus-wm5102-overlay.dts
 new file mode 100644
-index 0000000000000..e2c25a0535e68
+index 000000000000..e2c25a0535e6
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/rpi-cirrus-wm5102-overlay.dts
 @@ -0,0 +1,152 @@
@@ -100555,7 +100555,7 @@ index 0000000000000..e2c25a0535e68
 +};
 diff --git a/arch/arm/boot/dts/overlays/rpi-dac-overlay.dts b/arch/arm/boot/dts/overlays/rpi-dac-overlay.dts
 new file mode 100644
-index 0000000000000..07a915342702f
+index 000000000000..07a915342702
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/rpi-dac-overlay.dts
 @@ -0,0 +1,34 @@
@@ -100595,7 +100595,7 @@ index 0000000000000..07a915342702f
 +};
 diff --git a/arch/arm/boot/dts/overlays/rpi-display-overlay.dts b/arch/arm/boot/dts/overlays/rpi-display-overlay.dts
 new file mode 100644
-index 0000000000000..a5eed07d6a4b4
+index 000000000000..a5eed07d6a4b
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/rpi-display-overlay.dts
 @@ -0,0 +1,91 @@
@@ -100692,7 +100692,7 @@ index 0000000000000..a5eed07d6a4b4
 +};
 diff --git a/arch/arm/boot/dts/overlays/rpi-ft5406-overlay.dts b/arch/arm/boot/dts/overlays/rpi-ft5406-overlay.dts
 new file mode 100644
-index 0000000000000..4dcb490f04b6f
+index 000000000000..4dcb490f04b6
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/rpi-ft5406-overlay.dts
 @@ -0,0 +1,25 @@
@@ -100723,7 +100723,7 @@ index 0000000000000..4dcb490f04b6f
 +};
 diff --git a/arch/arm/boot/dts/overlays/rpi-poe-overlay.dts b/arch/arm/boot/dts/overlays/rpi-poe-overlay.dts
 new file mode 100644
-index 0000000000000..21f8fe6f12295
+index 000000000000..21f8fe6f1229
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/rpi-poe-overlay.dts
 @@ -0,0 +1,70 @@
@@ -100799,7 +100799,7 @@ index 0000000000000..21f8fe6f12295
 +};
 diff --git a/arch/arm/boot/dts/overlays/rpi-proto-overlay.dts b/arch/arm/boot/dts/overlays/rpi-proto-overlay.dts
 new file mode 100644
-index 0000000000000..9cda044a0f62a
+index 000000000000..9cda044a0f62
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/rpi-proto-overlay.dts
 @@ -0,0 +1,39 @@
@@ -100844,7 +100844,7 @@ index 0000000000000..9cda044a0f62a
 +};
 diff --git a/arch/arm/boot/dts/overlays/rpi-sense-overlay.dts b/arch/arm/boot/dts/overlays/rpi-sense-overlay.dts
 new file mode 100644
-index 0000000000000..89d8d2ea6b2e7
+index 000000000000..89d8d2ea6b2e
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/rpi-sense-overlay.dts
 @@ -0,0 +1,47 @@
@@ -100897,7 +100897,7 @@ index 0000000000000..89d8d2ea6b2e7
 +};
 diff --git a/arch/arm/boot/dts/overlays/rpi-tv-overlay.dts b/arch/arm/boot/dts/overlays/rpi-tv-overlay.dts
 new file mode 100644
-index 0000000000000..3c97a545d8207
+index 000000000000..3c97a545d820
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/rpi-tv-overlay.dts
 @@ -0,0 +1,34 @@
@@ -100937,7 +100937,7 @@ index 0000000000000..3c97a545d8207
 +};
 diff --git a/arch/arm/boot/dts/overlays/rra-digidac1-wm8741-audio-overlay.dts b/arch/arm/boot/dts/overlays/rra-digidac1-wm8741-audio-overlay.dts
 new file mode 100644
-index 0000000000000..87e9a326eff1f
+index 000000000000..87e9a326eff1
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/rra-digidac1-wm8741-audio-overlay.dts
 @@ -0,0 +1,49 @@
@@ -100992,7 +100992,7 @@ index 0000000000000..87e9a326eff1f
 +};
 diff --git a/arch/arm/boot/dts/overlays/sc16is750-i2c-overlay.dts b/arch/arm/boot/dts/overlays/sc16is750-i2c-overlay.dts
 new file mode 100644
-index 0000000000000..5fbff2e6c02df
+index 000000000000..5fbff2e6c02d
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/sc16is750-i2c-overlay.dts
 @@ -0,0 +1,38 @@
@@ -101036,7 +101036,7 @@ index 0000000000000..5fbff2e6c02df
 +};
 diff --git a/arch/arm/boot/dts/overlays/sc16is752-i2c-overlay.dts b/arch/arm/boot/dts/overlays/sc16is752-i2c-overlay.dts
 new file mode 100644
-index 0000000000000..57ae35c384425
+index 000000000000..57ae35c38442
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/sc16is752-i2c-overlay.dts
 @@ -0,0 +1,40 @@
@@ -101082,7 +101082,7 @@ index 0000000000000..57ae35c384425
 +};
 diff --git a/arch/arm/boot/dts/overlays/sc16is752-spi1-overlay.dts b/arch/arm/boot/dts/overlays/sc16is752-spi1-overlay.dts
 new file mode 100644
-index 0000000000000..4e33b14afc784
+index 000000000000..4e33b14afc78
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/sc16is752-spi1-overlay.dts
 @@ -0,0 +1,61 @@
@@ -101149,7 +101149,7 @@ index 0000000000000..4e33b14afc784
 +};
 diff --git a/arch/arm/boot/dts/overlays/sdhost-overlay.dts b/arch/arm/boot/dts/overlays/sdhost-overlay.dts
 new file mode 100644
-index 0000000000000..0b72b4eeac887
+index 000000000000..0b72b4eeac88
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/sdhost-overlay.dts
 @@ -0,0 +1,38 @@
@@ -101193,7 +101193,7 @@ index 0000000000000..0b72b4eeac887
 +};
 diff --git a/arch/arm/boot/dts/overlays/sdio-overlay.dts b/arch/arm/boot/dts/overlays/sdio-overlay.dts
 new file mode 100644
-index 0000000000000..873e490563797
+index 000000000000..873e49056379
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/sdio-overlay.dts
 @@ -0,0 +1,77 @@
@@ -101276,7 +101276,7 @@ index 0000000000000..873e490563797
 +};
 diff --git a/arch/arm/boot/dts/overlays/sdtweak-overlay.dts b/arch/arm/boot/dts/overlays/sdtweak-overlay.dts
 new file mode 100644
-index 0000000000000..38157d2f9bf3b
+index 000000000000..38157d2f9bf3
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/sdtweak-overlay.dts
 @@ -0,0 +1,25 @@
@@ -101307,7 +101307,7 @@ index 0000000000000..38157d2f9bf3b
 +};
 diff --git a/arch/arm/boot/dts/overlays/smi-dev-overlay.dts b/arch/arm/boot/dts/overlays/smi-dev-overlay.dts
 new file mode 100644
-index 0000000000000..b610d82836081
+index 000000000000..b610d8283608
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/smi-dev-overlay.dts
 @@ -0,0 +1,18 @@
@@ -101331,7 +101331,7 @@ index 0000000000000..b610d82836081
 +};
 diff --git a/arch/arm/boot/dts/overlays/smi-nand-overlay.dts b/arch/arm/boot/dts/overlays/smi-nand-overlay.dts
 new file mode 100644
-index 0000000000000..ae1e50329d660
+index 000000000000..ae1e50329d66
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/smi-nand-overlay.dts
 @@ -0,0 +1,66 @@
@@ -101403,7 +101403,7 @@ index 0000000000000..ae1e50329d660
 +};
 diff --git a/arch/arm/boot/dts/overlays/smi-overlay.dts b/arch/arm/boot/dts/overlays/smi-overlay.dts
 new file mode 100644
-index 0000000000000..70104c11627cf
+index 000000000000..70104c11627c
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/smi-overlay.dts
 @@ -0,0 +1,37 @@
@@ -101446,7 +101446,7 @@ index 0000000000000..70104c11627cf
 +};
 diff --git a/arch/arm/boot/dts/overlays/spi-gpio35-39-overlay.dts b/arch/arm/boot/dts/overlays/spi-gpio35-39-overlay.dts
 new file mode 100644
-index 0000000000000..a132b8637c313
+index 000000000000..a132b8637c31
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/spi-gpio35-39-overlay.dts
 @@ -0,0 +1,31 @@
@@ -101483,7 +101483,7 @@ index 0000000000000..a132b8637c313
 +};
 diff --git a/arch/arm/boot/dts/overlays/spi-gpio40-45-overlay.dts b/arch/arm/boot/dts/overlays/spi-gpio40-45-overlay.dts
 new file mode 100644
-index 0000000000000..9ebcaf1b5ea07
+index 000000000000..9ebcaf1b5ea0
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/spi-gpio40-45-overlay.dts
 @@ -0,0 +1,36 @@
@@ -101525,7 +101525,7 @@ index 0000000000000..9ebcaf1b5ea07
 +};
 diff --git a/arch/arm/boot/dts/overlays/spi-rtc-overlay.dts b/arch/arm/boot/dts/overlays/spi-rtc-overlay.dts
 new file mode 100644
-index 0000000000000..9664afc9845c9
+index 000000000000..9664afc9845c
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/spi-rtc-overlay.dts
 @@ -0,0 +1,33 @@
@@ -101564,7 +101564,7 @@ index 0000000000000..9664afc9845c9
 +};
 diff --git a/arch/arm/boot/dts/overlays/spi0-cs-overlay.dts b/arch/arm/boot/dts/overlays/spi0-cs-overlay.dts
 new file mode 100644
-index 0000000000000..ff41439a483af
+index 000000000000..ff41439a483a
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/spi0-cs-overlay.dts
 @@ -0,0 +1,29 @@
@@ -101599,7 +101599,7 @@ index 0000000000000..ff41439a483af
 +};
 diff --git a/arch/arm/boot/dts/overlays/spi0-hw-cs-overlay.dts b/arch/arm/boot/dts/overlays/spi0-hw-cs-overlay.dts
 new file mode 100644
-index 0000000000000..168a0dc80ad1a
+index 000000000000..168a0dc80ad1
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/spi0-hw-cs-overlay.dts
 @@ -0,0 +1,26 @@
@@ -101631,7 +101631,7 @@ index 0000000000000..168a0dc80ad1a
 +};
 diff --git a/arch/arm/boot/dts/overlays/spi1-1cs-overlay.dts b/arch/arm/boot/dts/overlays/spi1-1cs-overlay.dts
 new file mode 100644
-index 0000000000000..ea2794bc5fd5d
+index 000000000000..ea2794bc5fd5
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/spi1-1cs-overlay.dts
 @@ -0,0 +1,57 @@
@@ -101694,7 +101694,7 @@ index 0000000000000..ea2794bc5fd5d
 +};
 diff --git a/arch/arm/boot/dts/overlays/spi1-2cs-overlay.dts b/arch/arm/boot/dts/overlays/spi1-2cs-overlay.dts
 new file mode 100644
-index 0000000000000..dab34ee79ae28
+index 000000000000..dab34ee79ae2
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/spi1-2cs-overlay.dts
 @@ -0,0 +1,69 @@
@@ -101769,7 +101769,7 @@ index 0000000000000..dab34ee79ae28
 +};
 diff --git a/arch/arm/boot/dts/overlays/spi1-3cs-overlay.dts b/arch/arm/boot/dts/overlays/spi1-3cs-overlay.dts
 new file mode 100644
-index 0000000000000..bc7e7d04324bd
+index 000000000000..bc7e7d04324b
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/spi1-3cs-overlay.dts
 @@ -0,0 +1,81 @@
@@ -101856,7 +101856,7 @@ index 0000000000000..bc7e7d04324bd
 +};
 diff --git a/arch/arm/boot/dts/overlays/spi2-1cs-overlay.dts b/arch/arm/boot/dts/overlays/spi2-1cs-overlay.dts
 new file mode 100644
-index 0000000000000..2a29750462af8
+index 000000000000..2a29750462af
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/spi2-1cs-overlay.dts
 @@ -0,0 +1,57 @@
@@ -101919,7 +101919,7 @@ index 0000000000000..2a29750462af8
 +};
 diff --git a/arch/arm/boot/dts/overlays/spi2-2cs-overlay.dts b/arch/arm/boot/dts/overlays/spi2-2cs-overlay.dts
 new file mode 100644
-index 0000000000000..642678fc9ddd5
+index 000000000000..642678fc9ddd
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/spi2-2cs-overlay.dts
 @@ -0,0 +1,69 @@
@@ -101994,7 +101994,7 @@ index 0000000000000..642678fc9ddd5
 +};
 diff --git a/arch/arm/boot/dts/overlays/spi2-3cs-overlay.dts b/arch/arm/boot/dts/overlays/spi2-3cs-overlay.dts
 new file mode 100644
-index 0000000000000..28d40c6c3c379
+index 000000000000..28d40c6c3c37
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/spi2-3cs-overlay.dts
 @@ -0,0 +1,81 @@
@@ -102081,7 +102081,7 @@ index 0000000000000..28d40c6c3c379
 +};
 diff --git a/arch/arm/boot/dts/overlays/spi3-1cs-overlay.dts b/arch/arm/boot/dts/overlays/spi3-1cs-overlay.dts
 new file mode 100644
-index 0000000000000..335af8637051b
+index 000000000000..335af8637051
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/spi3-1cs-overlay.dts
 @@ -0,0 +1,44 @@
@@ -102131,7 +102131,7 @@ index 0000000000000..335af8637051b
 +};
 diff --git a/arch/arm/boot/dts/overlays/spi3-2cs-overlay.dts b/arch/arm/boot/dts/overlays/spi3-2cs-overlay.dts
 new file mode 100644
-index 0000000000000..ce65da27f7670
+index 000000000000..ce65da27f767
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/spi3-2cs-overlay.dts
 @@ -0,0 +1,56 @@
@@ -102193,7 +102193,7 @@ index 0000000000000..ce65da27f7670
 +};
 diff --git a/arch/arm/boot/dts/overlays/spi4-1cs-overlay.dts b/arch/arm/boot/dts/overlays/spi4-1cs-overlay.dts
 new file mode 100644
-index 0000000000000..85d70b40352b1
+index 000000000000..85d70b40352b
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/spi4-1cs-overlay.dts
 @@ -0,0 +1,44 @@
@@ -102243,7 +102243,7 @@ index 0000000000000..85d70b40352b1
 +};
 diff --git a/arch/arm/boot/dts/overlays/spi4-2cs-overlay.dts b/arch/arm/boot/dts/overlays/spi4-2cs-overlay.dts
 new file mode 100644
-index 0000000000000..8bc2215a6a7e9
+index 000000000000..8bc2215a6a7e
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/spi4-2cs-overlay.dts
 @@ -0,0 +1,56 @@
@@ -102305,7 +102305,7 @@ index 0000000000000..8bc2215a6a7e9
 +};
 diff --git a/arch/arm/boot/dts/overlays/spi5-1cs-overlay.dts b/arch/arm/boot/dts/overlays/spi5-1cs-overlay.dts
 new file mode 100644
-index 0000000000000..c0f8cb8510eee
+index 000000000000..c0f8cb8510ee
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/spi5-1cs-overlay.dts
 @@ -0,0 +1,44 @@
@@ -102355,7 +102355,7 @@ index 0000000000000..c0f8cb8510eee
 +};
 diff --git a/arch/arm/boot/dts/overlays/spi5-2cs-overlay.dts b/arch/arm/boot/dts/overlays/spi5-2cs-overlay.dts
 new file mode 100644
-index 0000000000000..7758b9c00b4e9
+index 000000000000..7758b9c00b4e
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/spi5-2cs-overlay.dts
 @@ -0,0 +1,56 @@
@@ -102417,7 +102417,7 @@ index 0000000000000..7758b9c00b4e9
 +};
 diff --git a/arch/arm/boot/dts/overlays/spi6-1cs-overlay.dts b/arch/arm/boot/dts/overlays/spi6-1cs-overlay.dts
 new file mode 100644
-index 0000000000000..8c8a953eca01f
+index 000000000000..8c8a953eca01
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/spi6-1cs-overlay.dts
 @@ -0,0 +1,44 @@
@@ -102467,7 +102467,7 @@ index 0000000000000..8c8a953eca01f
 +};
 diff --git a/arch/arm/boot/dts/overlays/spi6-2cs-overlay.dts b/arch/arm/boot/dts/overlays/spi6-2cs-overlay.dts
 new file mode 100644
-index 0000000000000..2ff897f21aedb
+index 000000000000..2ff897f21aed
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/spi6-2cs-overlay.dts
 @@ -0,0 +1,56 @@
@@ -102529,7 +102529,7 @@ index 0000000000000..2ff897f21aedb
 +};
 diff --git a/arch/arm/boot/dts/overlays/ssd1306-overlay.dts b/arch/arm/boot/dts/overlays/ssd1306-overlay.dts
 new file mode 100644
-index 0000000000000..84cf10e489d3c
+index 000000000000..84cf10e489d3
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/ssd1306-overlay.dts
 @@ -0,0 +1,36 @@
@@ -102571,7 +102571,7 @@ index 0000000000000..84cf10e489d3c
 +};
 diff --git a/arch/arm/boot/dts/overlays/superaudioboard-overlay.dts b/arch/arm/boot/dts/overlays/superaudioboard-overlay.dts
 new file mode 100755
-index 0000000000000..bad61535981e9
+index 000000000000..bad61535981e
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/superaudioboard-overlay.dts
 @@ -0,0 +1,73 @@
@@ -102650,7 +102650,7 @@ index 0000000000000..bad61535981e9
 +};
 diff --git a/arch/arm/boot/dts/overlays/sx150x-overlay.dts b/arch/arm/boot/dts/overlays/sx150x-overlay.dts
 new file mode 100644
-index 0000000000000..1d1069345da21
+index 000000000000..1d1069345da2
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/sx150x-overlay.dts
 @@ -0,0 +1,1706 @@
@@ -104362,7 +104362,7 @@ index 0000000000000..1d1069345da21
 +
 diff --git a/arch/arm/boot/dts/overlays/tc358743-audio-overlay.dts b/arch/arm/boot/dts/overlays/tc358743-audio-overlay.dts
 new file mode 100644
-index 0000000000000..047695bb0c715
+index 000000000000..047695bb0c71
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/tc358743-audio-overlay.dts
 @@ -0,0 +1,52 @@
@@ -104420,7 +104420,7 @@ index 0000000000000..047695bb0c715
 +};
 diff --git a/arch/arm/boot/dts/overlays/tc358743-overlay.dts b/arch/arm/boot/dts/overlays/tc358743-overlay.dts
 new file mode 100644
-index 0000000000000..2a1a3a80de493
+index 000000000000..2a1a3a80de49
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/tc358743-overlay.dts
 @@ -0,0 +1,116 @@
@@ -104542,7 +104542,7 @@ index 0000000000000..2a1a3a80de493
 +};
 diff --git a/arch/arm/boot/dts/overlays/tinylcd35-overlay.dts b/arch/arm/boot/dts/overlays/tinylcd35-overlay.dts
 new file mode 100644
-index 0000000000000..254ac2e0a2144
+index 000000000000..254ac2e0a214
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/tinylcd35-overlay.dts
 @@ -0,0 +1,222 @@
@@ -104770,7 +104770,7 @@ index 0000000000000..254ac2e0a2144
 +};
 diff --git a/arch/arm/boot/dts/overlays/tpm-slb9670-overlay.dts b/arch/arm/boot/dts/overlays/tpm-slb9670-overlay.dts
 new file mode 100644
-index 0000000000000..e69188503ca33
+index 000000000000..e69188503ca3
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/tpm-slb9670-overlay.dts
 @@ -0,0 +1,44 @@
@@ -104820,7 +104820,7 @@ index 0000000000000..e69188503ca33
 +};
 diff --git a/arch/arm/boot/dts/overlays/uart0-overlay.dts b/arch/arm/boot/dts/overlays/uart0-overlay.dts
 new file mode 100755
-index 0000000000000..57ba7745d0233
+index 000000000000..57ba7745d023
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/uart0-overlay.dts
 @@ -0,0 +1,33 @@
@@ -104859,7 +104859,7 @@ index 0000000000000..57ba7745d0233
 +};
 diff --git a/arch/arm/boot/dts/overlays/uart1-overlay.dts b/arch/arm/boot/dts/overlays/uart1-overlay.dts
 new file mode 100644
-index 0000000000000..986d725a26529
+index 000000000000..986d725a2652
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/uart1-overlay.dts
 @@ -0,0 +1,38 @@
@@ -104903,7 +104903,7 @@ index 0000000000000..986d725a26529
 +};
 diff --git a/arch/arm/boot/dts/overlays/uart2-overlay.dts b/arch/arm/boot/dts/overlays/uart2-overlay.dts
 new file mode 100644
-index 0000000000000..9face240aca1f
+index 000000000000..9face240aca1
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/uart2-overlay.dts
 @@ -0,0 +1,27 @@
@@ -104936,7 +104936,7 @@ index 0000000000000..9face240aca1f
 +};
 diff --git a/arch/arm/boot/dts/overlays/uart3-overlay.dts b/arch/arm/boot/dts/overlays/uart3-overlay.dts
 new file mode 100644
-index 0000000000000..ae9f9fe5ea1db
+index 000000000000..ae9f9fe5ea1d
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/uart3-overlay.dts
 @@ -0,0 +1,27 @@
@@ -104969,7 +104969,7 @@ index 0000000000000..ae9f9fe5ea1db
 +};
 diff --git a/arch/arm/boot/dts/overlays/uart4-overlay.dts b/arch/arm/boot/dts/overlays/uart4-overlay.dts
 new file mode 100644
-index 0000000000000..ac004ffbadbf8
+index 000000000000..ac004ffbadbf
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/uart4-overlay.dts
 @@ -0,0 +1,27 @@
@@ -105002,7 +105002,7 @@ index 0000000000000..ac004ffbadbf8
 +};
 diff --git a/arch/arm/boot/dts/overlays/uart5-overlay.dts b/arch/arm/boot/dts/overlays/uart5-overlay.dts
 new file mode 100644
-index 0000000000000..04eaf376effe6
+index 000000000000..04eaf376effe
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/uart5-overlay.dts
 @@ -0,0 +1,27 @@
@@ -105035,7 +105035,7 @@ index 0000000000000..04eaf376effe6
 +};
 diff --git a/arch/arm/boot/dts/overlays/udrc-overlay.dts b/arch/arm/boot/dts/overlays/udrc-overlay.dts
 new file mode 100644
-index 0000000000000..ae7c37996894a
+index 000000000000..ae7c37996894
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/udrc-overlay.dts
 @@ -0,0 +1,128 @@
@@ -105169,7 +105169,7 @@ index 0000000000000..ae7c37996894a
 +};
 diff --git a/arch/arm/boot/dts/overlays/upstream-overlay.dts b/arch/arm/boot/dts/overlays/upstream-overlay.dts
 new file mode 100644
-index 0000000000000..6112640837fc0
+index 000000000000..6112640837fc
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/upstream-overlay.dts
 @@ -0,0 +1,131 @@
@@ -105306,7 +105306,7 @@ index 0000000000000..6112640837fc0
 +};
 diff --git a/arch/arm/boot/dts/overlays/vc4-fkms-v3d-overlay.dts b/arch/arm/boot/dts/overlays/vc4-fkms-v3d-overlay.dts
 new file mode 100644
-index 0000000000000..d9af97c8414f0
+index 000000000000..d9af97c8414f
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/vc4-fkms-v3d-overlay.dts
 @@ -0,0 +1,81 @@
@@ -105393,7 +105393,7 @@ index 0000000000000..d9af97c8414f0
 +};
 diff --git a/arch/arm/boot/dts/overlays/vc4-kms-kippah-7inch-overlay.dts b/arch/arm/boot/dts/overlays/vc4-kms-kippah-7inch-overlay.dts
 new file mode 100644
-index 0000000000000..b03394844abd9
+index 000000000000..b03394844abd
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/vc4-kms-kippah-7inch-overlay.dts
 @@ -0,0 +1,43 @@
@@ -105442,7 +105442,7 @@ index 0000000000000..b03394844abd9
 +};
 diff --git a/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts b/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts
 new file mode 100644
-index 0000000000000..c5f687e8bcb9a
+index 000000000000..c5f687e8bcb9
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts
 @@ -0,0 +1,152 @@
@@ -105600,7 +105600,7 @@ index 0000000000000..c5f687e8bcb9a
 +};
 diff --git a/arch/arm/boot/dts/overlays/vga666-overlay.dts b/arch/arm/boot/dts/overlays/vga666-overlay.dts
 new file mode 100644
-index 0000000000000..a4968d180a5d0
+index 000000000000..a4968d180a5d
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/vga666-overlay.dts
 @@ -0,0 +1,30 @@
@@ -105636,7 +105636,7 @@ index 0000000000000..a4968d180a5d0
 +};
 diff --git a/arch/arm/boot/dts/overlays/w1-gpio-overlay.dts b/arch/arm/boot/dts/overlays/w1-gpio-overlay.dts
 new file mode 100644
-index 0000000000000..f44e325bc1f2e
+index 000000000000..f44e325bc1f2
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/w1-gpio-overlay.dts
 @@ -0,0 +1,40 @@
@@ -105682,7 +105682,7 @@ index 0000000000000..f44e325bc1f2e
 +};
 diff --git a/arch/arm/boot/dts/overlays/w1-gpio-pullup-overlay.dts b/arch/arm/boot/dts/overlays/w1-gpio-pullup-overlay.dts
 new file mode 100644
-index 0000000000000..953c6a1aeab97
+index 000000000000..953c6a1aeab9
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/w1-gpio-pullup-overlay.dts
 @@ -0,0 +1,42 @@
@@ -105730,7 +105730,7 @@ index 0000000000000..953c6a1aeab97
 +};
 diff --git a/arch/arm/boot/dts/overlays/w5500-overlay.dts b/arch/arm/boot/dts/overlays/w5500-overlay.dts
 new file mode 100644
-index 0000000000000..4d3e662967530
+index 000000000000..4d3e66296753
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/w5500-overlay.dts
 @@ -0,0 +1,63 @@
@@ -105799,7 +105799,7 @@ index 0000000000000..4d3e662967530
 +};
 diff --git a/arch/arm/boot/dts/overlays/wittypi-overlay.dts b/arch/arm/boot/dts/overlays/wittypi-overlay.dts
 new file mode 100644
-index 0000000000000..71ce806186deb
+index 000000000000..71ce806186de
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/wittypi-overlay.dts
 @@ -0,0 +1,44 @@
@@ -105848,7 +105848,7 @@ index 0000000000000..71ce806186deb
 +
 +};
 diff --git a/arch/arm64/boot/dts/Makefile b/arch/arm64/boot/dts/Makefile
-index f19b762c008d8..fb5542a7a124e 100644
+index f19b762c008d..fb5542a7a124 100644
 --- a/arch/arm64/boot/dts/Makefile
 +++ b/arch/arm64/boot/dts/Makefile
 @@ -28,3 +28,5 @@ subdir-y += synaptics
@@ -105858,7 +105858,7 @@ index f19b762c008d8..fb5542a7a124e 100644
 +
 +subdir-y += overlays
 diff --git a/arch/arm64/boot/dts/broadcom/Makefile b/arch/arm64/boot/dts/broadcom/Makefile
-index d1d31ccad758f..1004a9fb8bf45 100644
+index d1d31ccad758..1004a9fb8bf4 100644
 --- a/arch/arm64/boot/dts/broadcom/Makefile
 +++ b/arch/arm64/boot/dts/broadcom/Makefile
 @@ -3,6 +3,17 @@ dtb-$(CONFIG_ARCH_BCM2835) += bcm2837-rpi-3-a-plus.dtb \
@@ -105881,7 +105881,7 @@ index d1d31ccad758f..1004a9fb8bf45 100644
 +endif
 diff --git a/arch/arm64/boot/dts/broadcom/bcm2710-rpi-3-b-plus.dts b/arch/arm64/boot/dts/broadcom/bcm2710-rpi-3-b-plus.dts
 new file mode 100644
-index 0000000000000..d9242ff77079c
+index 000000000000..d9242ff77079
 --- /dev/null
 +++ b/arch/arm64/boot/dts/broadcom/bcm2710-rpi-3-b-plus.dts
 @@ -0,0 +1,3 @@
@@ -105890,7 +105890,7 @@ index 0000000000000..d9242ff77079c
 +#include "../../../../arm/boot/dts/bcm2710-rpi-3-b-plus.dts"
 diff --git a/arch/arm64/boot/dts/broadcom/bcm2710-rpi-3-b.dts b/arch/arm64/boot/dts/broadcom/bcm2710-rpi-3-b.dts
 new file mode 100644
-index 0000000000000..deb33441da952
+index 000000000000..deb33441da95
 --- /dev/null
 +++ b/arch/arm64/boot/dts/broadcom/bcm2710-rpi-3-b.dts
 @@ -0,0 +1,3 @@
@@ -105899,7 +105899,7 @@ index 0000000000000..deb33441da952
 +#include "../../../../arm/boot/dts/bcm2710-rpi-3-b.dts"
 diff --git a/arch/arm64/boot/dts/broadcom/bcm2710-rpi-cm3.dts b/arch/arm64/boot/dts/broadcom/bcm2710-rpi-cm3.dts
 new file mode 100644
-index 0000000000000..1c2560017c02f
+index 000000000000..1c2560017c02
 --- /dev/null
 +++ b/arch/arm64/boot/dts/broadcom/bcm2710-rpi-cm3.dts
 @@ -0,0 +1,3 @@
@@ -105908,7 +105908,7 @@ index 0000000000000..1c2560017c02f
 +#include "../../../../arm/boot/dts/bcm2710-rpi-cm3.dts"
 diff --git a/arch/arm64/boot/dts/broadcom/bcm2711-rpi-4-b.dts b/arch/arm64/boot/dts/broadcom/bcm2711-rpi-4-b.dts
 new file mode 100644
-index 0000000000000..1fd86f81f5426
+index 000000000000..1fd86f81f542
 --- /dev/null
 +++ b/arch/arm64/boot/dts/broadcom/bcm2711-rpi-4-b.dts
 @@ -0,0 +1,3 @@
@@ -105917,7 +105917,7 @@ index 0000000000000..1fd86f81f5426
 +#include "../../../../arm/boot/dts/bcm2711-rpi-4-b.dts"
 diff --git a/arch/arm64/boot/dts/broadcom/bcm283x-rpi-csi1-2lane.dtsi b/arch/arm64/boot/dts/broadcom/bcm283x-rpi-csi1-2lane.dtsi
 new file mode 120000
-index 0000000000000..e5c400284467a
+index 000000000000..e5c400284467
 --- /dev/null
 +++ b/arch/arm64/boot/dts/broadcom/bcm283x-rpi-csi1-2lane.dtsi
 @@ -0,0 +1 @@
@@ -105925,7 +105925,7 @@ index 0000000000000..e5c400284467a
 \ No newline at end of file
 diff --git a/arch/arm64/boot/dts/broadcom/bcm283x-rpi-lan7515.dtsi b/arch/arm64/boot/dts/broadcom/bcm283x-rpi-lan7515.dtsi
 new file mode 120000
-index 0000000000000..fc4c05bbe7fd5
+index 000000000000..fc4c05bbe7fd
 --- /dev/null
 +++ b/arch/arm64/boot/dts/broadcom/bcm283x-rpi-lan7515.dtsi
 @@ -0,0 +1 @@
@@ -105933,14 +105933,14 @@ index 0000000000000..fc4c05bbe7fd5
 \ No newline at end of file
 diff --git a/arch/arm64/boot/dts/overlays b/arch/arm64/boot/dts/overlays
 new file mode 120000
-index 0000000000000..ded08646b6f66
+index 000000000000..ded08646b6f6
 --- /dev/null
 +++ b/arch/arm64/boot/dts/overlays
 @@ -0,0 +1 @@
 +../../../arm/boot/dts/overlays
 \ No newline at end of file
 diff --git a/scripts/Makefile.dtbinst b/scripts/Makefile.dtbinst
-index 7301ab5e2e066..da2af04a6d7da 100644
+index 7301ab5e2e06..da2af04a6d7d 100644
 --- a/scripts/Makefile.dtbinst
 +++ b/scripts/Makefile.dtbinst
 @@ -20,6 +20,7 @@ include scripts/Kbuild.include
@@ -105968,7 +105968,7 @@ index 7301ab5e2e066..da2af04a6d7da 100644
  
  .PHONY: $(PHONY)
 diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
-index a6d0044328b1f..bdec9e50358db 100644
+index a6d0044328b1..bdec9e50358d 100644
 --- a/scripts/Makefile.lib
 +++ b/scripts/Makefile.lib
 @@ -240,6 +240,7 @@ DTC ?= $(objtree)/scripts/dtc/dtc
@@ -106035,7 +106035,7 @@ See: https://github.com/raspberrypi/linux/issues/1064
  create mode 100644 drivers/leds/trigger/ledtrig-input.c
 
 diff --git a/drivers/leds/leds-gpio.c b/drivers/leds/leds-gpio.c
-index 2bf74595610f5..b95530703166e 100644
+index 2bf74595610f..b95530703166 100644
 --- a/drivers/leds/leds-gpio.c
 +++ b/drivers/leds/leds-gpio.c
 @@ -46,8 +46,15 @@ static void gpio_led_set(struct led_classdev *led_cdev,
@@ -106078,7 +106078,7 @@ index 2bf74595610f5..b95530703166e 100644
  		state = gpiod_get_value_cansleep(led_dat->gpiod);
  		if (state < 0)
 diff --git a/drivers/leds/trigger/Kconfig b/drivers/leds/trigger/Kconfig
-index ce9429ca6ddea..03e3f1c267dd7 100644
+index ce9429ca6dde..03e3f1c267dd 100644
 --- a/drivers/leds/trigger/Kconfig
 +++ b/drivers/leds/trigger/Kconfig
 @@ -114,6 +114,13 @@ config LEDS_TRIGGER_CAMERA
@@ -106096,7 +106096,7 @@ index ce9429ca6ddea..03e3f1c267dd7 100644
  	bool "LED Panic Trigger"
  	help
 diff --git a/drivers/leds/trigger/Makefile b/drivers/leds/trigger/Makefile
-index 733a83e2a7183..f2d085c672333 100644
+index 733a83e2a718..f2d085c67233 100644
 --- a/drivers/leds/trigger/Makefile
 +++ b/drivers/leds/trigger/Makefile
 @@ -11,6 +11,7 @@ obj-$(CONFIG_LEDS_TRIGGER_ACTIVITY)	+= ledtrig-activity.o
@@ -106109,7 +106109,7 @@ index 733a83e2a7183..f2d085c672333 100644
  obj-$(CONFIG_LEDS_TRIGGER_PATTERN)	+= ledtrig-pattern.o
 diff --git a/drivers/leds/trigger/ledtrig-input.c b/drivers/leds/trigger/ledtrig-input.c
 new file mode 100644
-index 0000000000000..8a974a3556564
+index 000000000000..8a974a355656
 --- /dev/null
 +++ b/drivers/leds/trigger/ledtrig-input.c
 @@ -0,0 +1,55 @@
@@ -106169,7 +106169,7 @@ index 0000000000000..8a974a3556564
 +MODULE_DESCRIPTION("Set LED GPIO to Input \"trigger\"");
 +MODULE_LICENSE("GPL");
 diff --git a/include/linux/leds.h b/include/linux/leds.h
-index efb309dba914a..f94aa00431fb6 100644
+index efb309dba914..f94aa00431fb 100644
 --- a/include/linux/leds.h
 +++ b/include/linux/leds.h
 @@ -73,6 +73,9 @@ struct led_classdev {
@@ -106196,7 +106196,7 @@ Subject: [PATCH 0055/1225] Added Device IDs for August DVB-T 205
  1 file changed, 4 insertions(+)
 
 diff --git a/drivers/media/usb/dvb-usb-v2/rtl28xxu.c b/drivers/media/usb/dvb-usb-v2/rtl28xxu.c
-index 1a36bda285421..9b1cb1908782a 100644
+index 1a36bda28542..9b1cb1908782 100644
 --- a/drivers/media/usb/dvb-usb-v2/rtl28xxu.c
 +++ b/drivers/media/usb/dvb-usb-v2/rtl28xxu.c
 @@ -1938,6 +1938,10 @@ static const struct usb_device_id rtl28xxu_id_table[] = {
@@ -106259,7 +106259,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  create mode 100644 arch/arm/lib/memset_rpi.S
 
 diff --git a/arch/arm/include/asm/string.h b/arch/arm/include/asm/string.h
-index 111a1d8a41ddf..867a4465cebf9 100644
+index 111a1d8a41dd..867a4465cebf 100644
 --- a/arch/arm/include/asm/string.h
 +++ b/arch/arm/include/asm/string.h
 @@ -39,4 +39,9 @@ static inline void *memset64(uint64_t *p, uint64_t v, __kernel_size_t n)
@@ -106273,7 +106273,7 @@ index 111a1d8a41ddf..867a4465cebf9 100644
 +
  #endif
 diff --git a/arch/arm/include/asm/uaccess.h b/arch/arm/include/asm/uaccess.h
-index 98c6b91be4a8a..399a25396ca96 100644
+index 98c6b91be4a8..399a25396ca9 100644
 --- a/arch/arm/include/asm/uaccess.h
 +++ b/arch/arm/include/asm/uaccess.h
 @@ -512,6 +512,9 @@ do {									\
@@ -106287,7 +106287,7 @@ index 98c6b91be4a8a..399a25396ca96 100644
  raw_copy_from_user(void *to, const void __user *from, unsigned long n)
  {
 diff --git a/arch/arm/lib/Makefile b/arch/arm/lib/Makefile
-index 6d2ba454f25b6..8271cde92dec7 100644
+index 6d2ba454f25b..8271cde92dec 100644
 --- a/arch/arm/lib/Makefile
 +++ b/arch/arm/lib/Makefile
 @@ -7,8 +7,8 @@
@@ -106320,7 +106320,7 @@ index 6d2ba454f25b6..8271cde92dec7 100644
  
 diff --git a/arch/arm/lib/arm-mem.h b/arch/arm/lib/arm-mem.h
 new file mode 100644
-index 0000000000000..5d4bda19ad207
+index 000000000000..5d4bda19ad20
 --- /dev/null
 +++ b/arch/arm/lib/arm-mem.h
 @@ -0,0 +1,159 @@
@@ -106484,7 +106484,7 @@ index 0000000000000..5d4bda19ad207
 +92:
 +.endm
 diff --git a/arch/arm/lib/copy_from_user.S b/arch/arm/lib/copy_from_user.S
-index f8016e3db65d7..ab7bf28dbec08 100644
+index f8016e3db65d..ab7bf28dbec0 100644
 --- a/arch/arm/lib/copy_from_user.S
 +++ b/arch/arm/lib/copy_from_user.S
 @@ -107,7 +107,8 @@
@@ -106507,7 +106507,7 @@ index f8016e3db65d7..ab7bf28dbec08 100644
  	.align 0
 diff --git a/arch/arm/lib/exports_rpi.c b/arch/arm/lib/exports_rpi.c
 new file mode 100644
-index 0000000000000..1f826047db754
+index 000000000000..1f826047db75
 --- /dev/null
 +++ b/arch/arm/lib/exports_rpi.c
 @@ -0,0 +1,37 @@
@@ -106550,7 +106550,7 @@ index 0000000000000..1f826047db754
 +EXPORT_SYMBOL(memcmp);
 diff --git a/arch/arm/lib/memcmp_rpi.S b/arch/arm/lib/memcmp_rpi.S
 new file mode 100644
-index 0000000000000..bf6e4edfc9d3b
+index 000000000000..bf6e4edfc9d3
 --- /dev/null
 +++ b/arch/arm/lib/memcmp_rpi.S
 @@ -0,0 +1,285 @@
@@ -106841,7 +106841,7 @@ index 0000000000000..bf6e4edfc9d3b
 +ENDPROC(memcmp)
 diff --git a/arch/arm/lib/memcpy_rpi.S b/arch/arm/lib/memcpy_rpi.S
 new file mode 100644
-index 0000000000000..30f8a9089a835
+index 000000000000..30f8a9089a83
 --- /dev/null
 +++ b/arch/arm/lib/memcpy_rpi.S
 @@ -0,0 +1,61 @@
@@ -106908,7 +106908,7 @@ index 0000000000000..30f8a9089a835
 +ENDPROC(mmiocpy)
 diff --git a/arch/arm/lib/memcpymove.h b/arch/arm/lib/memcpymove.h
 new file mode 100644
-index 0000000000000..d8be5849c8609
+index 000000000000..d8be5849c860
 --- /dev/null
 +++ b/arch/arm/lib/memcpymove.h
 @@ -0,0 +1,506 @@
@@ -107420,7 +107420,7 @@ index 0000000000000..d8be5849c8609
 +.endm
 diff --git a/arch/arm/lib/memmove_rpi.S b/arch/arm/lib/memmove_rpi.S
 new file mode 100644
-index 0000000000000..8b0760c0904c5
+index 000000000000..8b0760c0904c
 --- /dev/null
 +++ b/arch/arm/lib/memmove_rpi.S
 @@ -0,0 +1,61 @@
@@ -107487,7 +107487,7 @@ index 0000000000000..8b0760c0904c5
 +ENDPROC(memmove)
 diff --git a/arch/arm/lib/memset_rpi.S b/arch/arm/lib/memset_rpi.S
 new file mode 100644
-index 0000000000000..e8469cecabc15
+index 000000000000..e8469cecabc1
 --- /dev/null
 +++ b/arch/arm/lib/memset_rpi.S
 @@ -0,0 +1,128 @@
@@ -107620,7 +107620,7 @@ index 0000000000000..e8469cecabc15
 +ENDPROC(memset)
 +ENDPROC(mmioset)
 diff --git a/arch/arm/lib/uaccess_with_memcpy.c b/arch/arm/lib/uaccess_with_memcpy.c
-index c9450982a1558..296c2985ac176 100644
+index c9450982a155..296c2985ac17 100644
 --- a/arch/arm/lib/uaccess_with_memcpy.c
 +++ b/arch/arm/lib/uaccess_with_memcpy.c
 @@ -19,6 +19,14 @@
@@ -107779,7 +107779,7 @@ index c9450982a1558..296c2985ac176 100644
  static unsigned long noinline
  __clear_user_memset(void __user *addr, unsigned long n)
 diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig
-index 34fb06d1b477c..5742092f8c09e 100644
+index 34fb06d1b477..5742092f8c09 100644
 --- a/arch/arm/mach-bcm/Kconfig
 +++ b/arch/arm/mach-bcm/Kconfig
 @@ -188,6 +188,13 @@ config ARCH_BCM_53573
@@ -107821,7 +107821,7 @@ of the trigger signal may be preferable.
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/power/reset/gpio-poweroff.c b/drivers/power/reset/gpio-poweroff.c
-index 6a4bbb5065510..beb1df358c8da 100644
+index 6a4bbb506551..beb1df358c8d 100644
 --- a/drivers/power/reset/gpio-poweroff.c
 +++ b/drivers/power/reset/gpio-poweroff.c
 @@ -50,9 +50,11 @@ static int gpio_poweroff_probe(struct platform_device *pdev)
@@ -107869,7 +107869,7 @@ mfd: Add rpi_sense_core of compatible string
  create mode 100644 include/linux/mfd/rpisense/joystick.h
 
 diff --git a/drivers/input/joystick/Kconfig b/drivers/input/joystick/Kconfig
-index 312b854b5506f..e624320c5d9e9 100644
+index 312b854b5506..e624320c5d9e 100644
 --- a/drivers/input/joystick/Kconfig
 +++ b/drivers/input/joystick/Kconfig
 @@ -372,4 +372,12 @@ config JOYSTICK_FSIA6B
@@ -107886,7 +107886,7 @@ index 312b854b5506f..e624320c5d9e9 100644
 +
  endif
 diff --git a/drivers/input/joystick/Makefile b/drivers/input/joystick/Makefile
-index 8656023f6ef53..9b99c25309299 100644
+index 8656023f6ef5..9b99c2530929 100644
 --- a/drivers/input/joystick/Makefile
 +++ b/drivers/input/joystick/Makefile
 @@ -36,4 +36,4 @@ obj-$(CONFIG_JOYSTICK_WARRIOR)		+= warrior.o
@@ -107897,7 +107897,7 @@ index 8656023f6ef53..9b99c25309299 100644
 +obj-$(CONFIG_JOYSTICK_RPISENSE)		+= rpisense-js.o
 diff --git a/drivers/input/joystick/rpisense-js.c b/drivers/input/joystick/rpisense-js.c
 new file mode 100644
-index 0000000000000..6a416769065d2
+index 000000000000..6a416769065d
 --- /dev/null
 +++ b/drivers/input/joystick/rpisense-js.c
 @@ -0,0 +1,153 @@
@@ -108055,7 +108055,7 @@ index 0000000000000..6a416769065d2
 +MODULE_AUTHOR("Serge Schneider <serge@raspberrypi.org>");
 +MODULE_LICENSE("GPL");
 diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
-index 43169f25da1fd..136f27b4733de 100644
+index 43169f25da1f..136f27b4733d 100644
 --- a/drivers/mfd/Kconfig
 +++ b/drivers/mfd/Kconfig
 @@ -11,6 +11,14 @@ config MFD_CORE
@@ -108074,7 +108074,7 @@ index 43169f25da1fd..136f27b4733de 100644
  	tristate "AMD CS5535 and CS5536 southbridge core functions"
  	select MFD_CORE
 diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
-index c1067ea462046..3ea14d217f269 100644
+index c1067ea46204..3ea14d217f26 100644
 --- a/drivers/mfd/Makefile
 +++ b/drivers/mfd/Makefile
 @@ -255,4 +255,5 @@ obj-$(CONFIG_RAVE_SP_CORE)	+= rave-sp.o
@@ -108085,7 +108085,7 @@ index c1067ea462046..3ea14d217f269 100644
  
 diff --git a/drivers/mfd/rpisense-core.c b/drivers/mfd/rpisense-core.c
 new file mode 100644
-index 0000000000000..6cfd63e5e8b8d
+index 000000000000..6cfd63e5e8b8
 --- /dev/null
 +++ b/drivers/mfd/rpisense-core.c
 @@ -0,0 +1,165 @@
@@ -108255,7 +108255,7 @@ index 0000000000000..6cfd63e5e8b8d
 +MODULE_LICENSE("GPL");
 +
 diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig
-index 148521ffe8c65..1a154908c7fb8 100644
+index 148521ffe8c6..1a154908c7fb 100644
 --- a/drivers/video/fbdev/Kconfig
 +++ b/drivers/video/fbdev/Kconfig
 @@ -2277,6 +2277,19 @@ config FB_SM712
@@ -108279,7 +108279,7 @@ index 148521ffe8c65..1a154908c7fb8 100644
  source "drivers/video/fbdev/omap2/Kconfig"
  source "drivers/video/fbdev/mmp/Kconfig"
 diff --git a/drivers/video/fbdev/Makefile b/drivers/video/fbdev/Makefile
-index 9f4d79be632bb..8d406d031c35e 100644
+index 9f4d79be632b..8d406d031c35 100644
 --- a/drivers/video/fbdev/Makefile
 +++ b/drivers/video/fbdev/Makefile
 @@ -132,6 +132,7 @@ obj-$(CONFIG_FB_MX3)		  += mx3fb.o
@@ -108292,7 +108292,7 @@ index 9f4d79be632bb..8d406d031c35e 100644
  obj-$(CONFIG_FB_VIRTUAL)          += vfb.o
 diff --git a/drivers/video/fbdev/rpisense-fb.c b/drivers/video/fbdev/rpisense-fb.c
 new file mode 100644
-index 0000000000000..26432a5a0b4b4
+index 000000000000..26432a5a0b4b
 --- /dev/null
 +++ b/drivers/video/fbdev/rpisense-fb.c
 @@ -0,0 +1,293 @@
@@ -108591,7 +108591,7 @@ index 0000000000000..26432a5a0b4b4
 +
 diff --git a/include/linux/mfd/rpisense/core.h b/include/linux/mfd/rpisense/core.h
 new file mode 100644
-index 0000000000000..4856aa3c8b066
+index 000000000000..4856aa3c8b06
 --- /dev/null
 +++ b/include/linux/mfd/rpisense/core.h
 @@ -0,0 +1,47 @@
@@ -108644,7 +108644,7 @@ index 0000000000000..4856aa3c8b066
 +#endif
 diff --git a/include/linux/mfd/rpisense/framebuffer.h b/include/linux/mfd/rpisense/framebuffer.h
 new file mode 100644
-index 0000000000000..2ba95d7eebaf9
+index 000000000000..2ba95d7eebaf
 --- /dev/null
 +++ b/include/linux/mfd/rpisense/framebuffer.h
 @@ -0,0 +1,32 @@
@@ -108682,7 +108682,7 @@ index 0000000000000..2ba95d7eebaf9
 +#endif
 diff --git a/include/linux/mfd/rpisense/joystick.h b/include/linux/mfd/rpisense/joystick.h
 new file mode 100644
-index 0000000000000..56196dc2af10e
+index 000000000000..56196dc2af10
 --- /dev/null
 +++ b/include/linux/mfd/rpisense/joystick.h
 @@ -0,0 +1,35 @@
@@ -108738,7 +108738,7 @@ Subject: [PATCH 0059/1225] ASoC: Add support for Rpi-DAC
  create mode 100644 sound/soc/codecs/pcm1794a.c
 
 diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
-index 080a2cec3fa81..e4ab7e7b40735 100644
+index 080a2cec3fa8..e4ab7e7b4073 100644
 --- a/sound/soc/codecs/Kconfig
 +++ b/sound/soc/codecs/Kconfig
 @@ -134,6 +134,7 @@ config SND_SOC_ALL_CODECS
@@ -108761,7 +108761,7 @@ index 080a2cec3fa81..e4ab7e7b40735 100644
  	tristate "Realtek ALC5631/RT5631 CODEC"
  	depends on I2C
 diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile
-index c498373dcc5f6..3c40ea93d2eeb 100644
+index c498373dcc5f..3c40ea93d2ee 100644
 --- a/sound/soc/codecs/Makefile
 +++ b/sound/soc/codecs/Makefile
 @@ -134,6 +134,7 @@ snd-soc-pcm179x-spi-objs := pcm179x-spi.o
@@ -108782,7 +108782,7 @@ index c498373dcc5f6..3c40ea93d2eeb 100644
  obj-$(CONFIG_SND_SOC_RT1011)	+= snd-soc-rt1011.o
 diff --git a/sound/soc/codecs/pcm1794a.c b/sound/soc/codecs/pcm1794a.c
 new file mode 100644
-index 0000000000000..36b5b6c26655a
+index 000000000000..36b5b6c26655
 --- /dev/null
 +++ b/sound/soc/codecs/pcm1794a.c
 @@ -0,0 +1,69 @@
@@ -108933,7 +108933,7 @@ Signed-off-by: Matthias Reichl <hias@horus.com>
 
 diff --git a/sound/soc/bcm/iqaudio-dac.c b/sound/soc/bcm/iqaudio-dac.c
 new file mode 100644
-index 0000000000000..b982320386164
+index 000000000000..b98232038616
 --- /dev/null
 +++ b/sound/soc/bcm/iqaudio-dac.c
 @@ -0,0 +1,223 @@
@@ -109241,7 +109241,7 @@ Signed-off-by: Hui Wang <hui.wang@canonical.com>
  create mode 100644 sound/soc/bcm/hifiberry_dacplus.c
 
 diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig
-index c44247d0b83e8..98426fa4e1f92 100644
+index c44247d0b83e..98426fa4e1f9 100644
 --- a/drivers/clk/Kconfig
 +++ b/drivers/clk/Kconfig
 @@ -70,6 +70,9 @@ config COMMON_CLK_HI655X
@@ -109255,7 +109255,7 @@ index c44247d0b83e8..98426fa4e1f92 100644
  	tristate "Clock driver controlled via SCMI interface"
  	depends on ARM_SCMI_PROTOCOL || COMPILE_TEST
 diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile
-index 0138fb14e6f88..28ca4781d002d 100644
+index 0138fb14e6f8..28ca4781d002 100644
 --- a/drivers/clk/Makefile
 +++ b/drivers/clk/Makefile
 @@ -34,6 +34,7 @@ obj-$(CONFIG_MACH_ASPEED_G6)		+= clk-ast2600.o
@@ -109268,7 +109268,7 @@ index 0138fb14e6f88..28ca4781d002d 100644
  obj-$(CONFIG_ARCH_MILBEAUT_M10V)	+= clk-milbeaut.o
 diff --git a/drivers/clk/clk-hifiberry-dacpro.c b/drivers/clk/clk-hifiberry-dacpro.c
 new file mode 100644
-index 0000000000000..9e26344658236
+index 000000000000..9e2634465823
 --- /dev/null
 +++ b/drivers/clk/clk-hifiberry-dacpro.c
 @@ -0,0 +1,160 @@
@@ -109434,7 +109434,7 @@ index 0000000000000..9e26344658236
 +MODULE_ALIAS("platform:clk-hifiberry-dacpro");
 diff --git a/sound/soc/bcm/hifiberry_dacplus.c b/sound/soc/bcm/hifiberry_dacplus.c
 new file mode 100644
-index 0000000000000..fdf6e950abd8c
+index 000000000000..fdf6e950abd8
 --- /dev/null
 +++ b/sound/soc/bcm/hifiberry_dacplus.c
 @@ -0,0 +1,352 @@
@@ -109823,7 +109823,7 @@ Some code to load the driver based on device-tree-overlays was missing. This is 
  create mode 100644 sound/soc/codecs/tas5713.h
 
 diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
-index e4ab7e7b40735..26f2b5b3e9682 100644
+index e4ab7e7b4073..26f2b5b3e968 100644
 --- a/sound/soc/codecs/Kconfig
 +++ b/sound/soc/codecs/Kconfig
 @@ -188,6 +188,7 @@ config SND_SOC_ALL_CODECS
@@ -109845,7 +109845,7 @@ index e4ab7e7b40735..26f2b5b3e9682 100644
  	tristate
  
 diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile
-index 3c40ea93d2eeb..2cc8bf2c12f67 100644
+index 3c40ea93d2ee..2cc8bf2c12f6 100644
 --- a/sound/soc/codecs/Makefile
 +++ b/sound/soc/codecs/Makefile
 @@ -198,6 +198,7 @@ snd-soc-tas5720-objs := tas5720.o
@@ -109866,7 +109866,7 @@ index 3c40ea93d2eeb..2cc8bf2c12f67 100644
  obj-$(CONFIG_SND_SOC_TLV320AIC23_SPI)	+= snd-soc-tlv320aic23-spi.o
 diff --git a/sound/soc/codecs/tas5713.c b/sound/soc/codecs/tas5713.c
 new file mode 100644
-index 0000000000000..9c1c92e57bbfa
+index 000000000000..9c1c92e57bbf
 --- /dev/null
 +++ b/sound/soc/codecs/tas5713.c
 @@ -0,0 +1,366 @@
@@ -110238,7 +110238,7 @@ index 0000000000000..9c1c92e57bbfa
 +MODULE_LICENSE("GPL v2");
 diff --git a/sound/soc/codecs/tas5713.h b/sound/soc/codecs/tas5713.h
 new file mode 100644
-index 0000000000000..8f019e0489875
+index 000000000000..8f019e048987
 --- /dev/null
 +++ b/sound/soc/codecs/tas5713.h
 @@ -0,0 +1,210 @@
@@ -110482,7 +110482,7 @@ Signed-off-by: Hui Wang <hui.wang@canonical.com>
 
 diff --git a/sound/soc/bcm/rpi-proto.c b/sound/soc/bcm/rpi-proto.c
 new file mode 100644
-index 0000000000000..8f3c2ef170ff2
+index 000000000000..8f3c2ef170ff
 --- /dev/null
 +++ b/sound/soc/bcm/rpi-proto.c
 @@ -0,0 +1,147 @@
@@ -110668,7 +110668,7 @@ Signed-off-by: Matthias Reichl <hias@horus.com>
 
 diff --git a/sound/soc/bcm/justboom-dac.c b/sound/soc/bcm/justboom-dac.c
 new file mode 100644
-index 0000000000000..62bd64cc09280
+index 000000000000..62bd64cc0928
 --- /dev/null
 +++ b/sound/soc/bcm/justboom-dac.c
 @@ -0,0 +1,147 @@
@@ -110848,7 +110848,7 @@ Signed-off-by: Hui Wang <hui.wang@canonical.com>
 
 diff --git a/sound/soc/bcm/audioinjector-pi-soundcard.c b/sound/soc/bcm/audioinjector-pi-soundcard.c
 new file mode 100644
-index 0000000000000..21a46551a1c19
+index 000000000000..21a46551a1c1
 --- /dev/null
 +++ b/sound/soc/bcm/audioinjector-pi-soundcard.c
 @@ -0,0 +1,187 @@
@@ -111059,7 +111059,7 @@ Signed-off-by: Hui Wang <hui.wang@canonical.com>
 
 diff --git a/sound/soc/bcm/digidac1-soundcard.c b/sound/soc/bcm/digidac1-soundcard.c
 new file mode 100644
-index 0000000000000..5046f88c496b7
+index 000000000000..5046f88c496b
 --- /dev/null
 +++ b/sound/soc/bcm/digidac1-soundcard.c
 @@ -0,0 +1,421 @@
@@ -111507,7 +111507,7 @@ Signed-off-by: Hui Wang <hui.wang@canonical.com>
 
 diff --git a/sound/soc/bcm/dionaudio_loco.c b/sound/soc/bcm/dionaudio_loco.c
 new file mode 100644
-index 0000000000000..06af8363fb0ad
+index 000000000000..06af8363fb0a
 --- /dev/null
 +++ b/sound/soc/bcm/dionaudio_loco.c
 @@ -0,0 +1,117 @@
@@ -111672,7 +111672,7 @@ Signed-off-by: Hui Wang <hui.wang@canonical.com>
 
 diff --git a/sound/soc/bcm/allo-piano-dac.c b/sound/soc/bcm/allo-piano-dac.c
 new file mode 100644
-index 0000000000000..61640fb954314
+index 000000000000..61640fb95431
 --- /dev/null
 +++ b/sound/soc/bcm/allo-piano-dac.c
 @@ -0,0 +1,122 @@
@@ -111866,7 +111866,7 @@ Signed-off-by: Hui Wang <hui.wang@canonical.com>
 
 diff --git a/sound/soc/bcm/allo-piano-dac-plus.c b/sound/soc/bcm/allo-piano-dac-plus.c
 new file mode 100644
-index 0000000000000..e910d4a4546dc
+index 000000000000..e910d4a4546d
 --- /dev/null
 +++ b/sound/soc/bcm/allo-piano-dac-plus.c
 @@ -0,0 +1,1013 @@
@@ -112930,7 +112930,7 @@ Signed-off-by: Hui Wang <hui.wang@canonical.com>
  create mode 100644 sound/soc/bcm/allo-boss-dac.c
 
 diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile
-index 28ca4781d002d..e01d58346f8a8 100644
+index 28ca4781d002..e01d58346f8a 100644
 --- a/drivers/clk/Makefile
 +++ b/drivers/clk/Makefile
 @@ -18,6 +18,7 @@ endif
@@ -112943,7 +112943,7 @@ index 28ca4781d002d..e01d58346f8a8 100644
  obj-$(CONFIG_ARCH_AXXIA)		+= clk-axm5516.o
 diff --git a/drivers/clk/clk-allo-dac.c b/drivers/clk/clk-allo-dac.c
 new file mode 100644
-index 0000000000000..a9844cb9454bd
+index 000000000000..a9844cb9454b
 --- /dev/null
 +++ b/drivers/clk/clk-allo-dac.c
 @@ -0,0 +1,161 @@
@@ -113110,7 +113110,7 @@ index 0000000000000..a9844cb9454bd
 +MODULE_ALIAS("platform:clk-allo-dac");
 diff --git a/sound/soc/bcm/allo-boss-dac.c b/sound/soc/bcm/allo-boss-dac.c
 new file mode 100644
-index 0000000000000..cd47413f870c3
+index 000000000000..cd47413f870c
 --- /dev/null
 +++ b/sound/soc/bcm/allo-boss-dac.c
 @@ -0,0 +1,456 @@
@@ -113647,7 +113647,7 @@ Signed-off-by: Hui Wang <hui.wang@canonical.com>
 
 diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
 new file mode 100644
-index 0000000000000..f8d32547195b3
+index 000000000000..f8d32547195b
 --- /dev/null
 +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
 @@ -0,0 +1,463 @@
@@ -114115,7 +114115,7 @@ index 0000000000000..f8d32547195b3
 +zte	ZTE Corp.
 +zyxel	ZyXEL Communications Corp.
 diff --git a/Documentation/devicetree/bindings/vendor-prefixes.yaml b/Documentation/devicetree/bindings/vendor-prefixes.yaml
-index 967e78c5ec0a1..c91a9702fda75 100644
+index 967e78c5ec0a..c91a9702fda7 100644
 --- a/Documentation/devicetree/bindings/vendor-prefixes.yaml
 +++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml
 @@ -143,6 +143,8 @@ patternProperties:
@@ -114129,7 +114129,7 @@ index 967e78c5ec0a1..c91a9702fda75 100644
    "^bosch,.*":
 diff --git a/sound/soc/bcm/pisound.c b/sound/soc/bcm/pisound.c
 new file mode 100644
-index 0000000000000..6af9921b55c71
+index 000000000000..6af9921b55c7
 --- /dev/null
 +++ b/sound/soc/bcm/pisound.c
 @@ -0,0 +1,1201 @@
@@ -115360,7 +115360,7 @@ Signed-off-by: Matthias Reichl <hias@horus.com>
 
 diff --git a/sound/soc/bcm/rpi-cirrus.c b/sound/soc/bcm/rpi-cirrus.c
 new file mode 100644
-index 0000000000000..a0a460f787d1b
+index 000000000000..a0a460f787d1
 --- /dev/null
 +++ b/sound/soc/bcm/rpi-cirrus.c
 @@ -0,0 +1,1035 @@
@@ -116429,7 +116429,7 @@ Signed-off-by: Hui Wang <hui.wang@canonical.com>
 
 diff --git a/sound/soc/bcm/dionaudio_loco-v2.c b/sound/soc/bcm/dionaudio_loco-v2.c
 new file mode 100644
-index 0000000000000..ca48aef621b66
+index 000000000000..ca48aef621b6
 --- /dev/null
 +++ b/sound/soc/bcm/dionaudio_loco-v2.c
 @@ -0,0 +1,117 @@
@@ -116575,7 +116575,7 @@ Signed-off-by: Hui Wang <hui.wang@canonical.com>
 
 diff --git a/sound/soc/bcm/fe-pi-audio.c b/sound/soc/bcm/fe-pi-audio.c
 new file mode 100644
-index 0000000000000..a58a215820b73
+index 000000000000..a58a215820b7
 --- /dev/null
 +++ b/sound/soc/bcm/fe-pi-audio.c
 @@ -0,0 +1,154 @@
@@ -116802,7 +116802,7 @@ Signed-off-by: Hui Wang <hui.wang@canonical.com>
 
 diff --git a/sound/soc/bcm/audioinjector-octo-soundcard.c b/sound/soc/bcm/audioinjector-octo-soundcard.c
 new file mode 100644
-index 0000000000000..02434e8a43c6c
+index 000000000000..02434e8a43c6
 --- /dev/null
 +++ b/sound/soc/bcm/audioinjector-octo-soundcard.c
 @@ -0,0 +1,341 @@
@@ -117148,7 +117148,7 @@ index 0000000000000..02434e8a43c6c
 +MODULE_LICENSE("GPL v2");
 +MODULE_ALIAS("platform:audioinjector-octo-soundcard");
 diff --git a/sound/soc/codecs/cs42xx8-i2c.c b/sound/soc/codecs/cs42xx8-i2c.c
-index 0214e3ab9da00..a4586ea4acf6e 100644
+index 0214e3ab9da0..a4586ea4acf6 100644
 --- a/sound/soc/codecs/cs42xx8-i2c.c
 +++ b/sound/soc/codecs/cs42xx8-i2c.c
 @@ -45,6 +45,13 @@ static struct i2c_device_id cs42xx8_i2c_id[] = {
@@ -117166,7 +117166,7 @@ index 0214e3ab9da00..a4586ea4acf6e 100644
  	.driver = {
  		.name = "cs42xx8",
 diff --git a/sound/soc/codecs/cs42xx8.c b/sound/soc/codecs/cs42xx8.c
-index 94b1adb088fde..203e3f368bd54 100644
+index 94b1adb088fd..203e3f368bd5 100644
 --- a/sound/soc/codecs/cs42xx8.c
 +++ b/sound/soc/codecs/cs42xx8.c
 @@ -516,8 +516,10 @@ const struct of_device_id cs42xx8_of_match[] = {
@@ -117223,7 +117223,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
 
 diff --git a/sound/soc/bcm/googlevoicehat-codec.c b/sound/soc/bcm/googlevoicehat-codec.c
 new file mode 100644
-index 0000000000000..871a25aa498e7
+index 000000000000..871a25aa498e
 --- /dev/null
 +++ b/sound/soc/bcm/googlevoicehat-codec.c
 @@ -0,0 +1,214 @@
@@ -117470,7 +117470,7 @@ Signed-off-by: Sudeep Kumar <sudeepkumar@cem-solutions.net>
 
 diff --git a/sound/soc/bcm/allo-katana-codec.c b/sound/soc/bcm/allo-katana-codec.c
 new file mode 100644
-index 0000000000000..b0aebd40fe5ea
+index 000000000000..b0aebd40fe5e
 --- /dev/null
 +++ b/sound/soc/bcm/allo-katana-codec.c
 @@ -0,0 +1,388 @@
@@ -117901,7 +117901,7 @@ Signed-off-by: Hui Wang <hui.wang@canonical.com>
 
 diff --git a/sound/soc/bcm/rpi-simple-soundcard.c b/sound/soc/bcm/rpi-simple-soundcard.c
 new file mode 100644
-index 0000000000000..2023b0a18a2c6
+index 000000000000..2023b0a18a2c
 --- /dev/null
 +++ b/sound/soc/bcm/rpi-simple-soundcard.c
 @@ -0,0 +1,288 @@
@@ -118209,7 +118209,7 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
  2 files changed, 241 insertions(+)
 
 diff --git a/sound/soc/bcm/Kconfig b/sound/soc/bcm/Kconfig
-index 0037e96aa228f..ff5742759a389 100644
+index 0037e96aa228..ff5742759a38 100644
 --- a/sound/soc/bcm/Kconfig
 +++ b/sound/soc/bcm/Kconfig
 @@ -17,3 +17,202 @@ config SND_SOC_CYGNUS
@@ -118416,7 +118416,7 @@ index 0037e96aa228f..ff5742759a389 100644
 +	  Say Y or M if you want to add support for the Raspberry Pi
 +          generic driver for WM8804 based soundcards.
 diff --git a/sound/soc/bcm/Makefile b/sound/soc/bcm/Makefile
-index b81fa421ec272..522fc73571e4b 100644
+index b81fa421ec27..522fc73571e4 100644
 --- a/sound/soc/bcm/Makefile
 +++ b/sound/soc/bcm/Makefile
 @@ -9,3 +9,45 @@ snd-soc-cygnus-objs := cygnus-pcm.o cygnus-ssp.o
@@ -118528,7 +118528,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
 
 diff --git a/sound/soc/bcm/rpi-wm8804-soundcard.c b/sound/soc/bcm/rpi-wm8804-soundcard.c
 new file mode 100644
-index 0000000000000..b3c3c4ea1e75b
+index 000000000000..b3c3c4ea1e75
 --- /dev/null
 +++ b/sound/soc/bcm/rpi-wm8804-soundcard.c
 @@ -0,0 +1,410 @@
@@ -118971,7 +118971,7 @@ Signed-off-by: Alex Riesen <alexander.riesen@cetitec.com>
  create mode 100644 drivers/video/backlight/rpi_backlight.c
 
 diff --git a/drivers/video/backlight/Kconfig b/drivers/video/backlight/Kconfig
-index 40676be2e46aa..e809c651b7c43 100644
+index 40676be2e46a..e809c651b7c4 100644
 --- a/drivers/video/backlight/Kconfig
 +++ b/drivers/video/backlight/Kconfig
 @@ -248,6 +248,13 @@ config BACKLIGHT_PWM
@@ -118989,7 +118989,7 @@ index 40676be2e46aa..e809c651b7c43 100644
  	tristate "Backlight Driver for DA9030/DA9034 using WLED"
  	depends on PMIC_DA903X
 diff --git a/drivers/video/backlight/Makefile b/drivers/video/backlight/Makefile
-index 63c507c07437d..98f1271fb9c4a 100644
+index 63c507c07437..98f1271fb9c4 100644
 --- a/drivers/video/backlight/Makefile
 +++ b/drivers/video/backlight/Makefile
 @@ -50,6 +50,7 @@ obj-$(CONFIG_BACKLIGHT_PANDORA)		+= pandora_bl.o
@@ -119002,7 +119002,7 @@ index 63c507c07437d..98f1271fb9c4a 100644
  obj-$(CONFIG_BACKLIGHT_TOSA)		+= tosa_bl.o
 diff --git a/drivers/video/backlight/rpi_backlight.c b/drivers/video/backlight/rpi_backlight.c
 new file mode 100644
-index 0000000000000..14a0d9b037395
+index 000000000000..14a0d9b03739
 --- /dev/null
 +++ b/drivers/video/backlight/rpi_backlight.c
 @@ -0,0 +1,119 @@
@@ -119144,7 +119144,7 @@ request that the VPU toggles LEDs.
  create mode 100644 drivers/gpio/gpio-bcm-virt.c
 
 diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
-index f9263426af030..a4fe9a954b882 100644
+index f9263426af03..a4fe9a954b88 100644
 --- a/drivers/gpio/Kconfig
 +++ b/drivers/gpio/Kconfig
 @@ -147,6 +147,12 @@ config GPIO_BCM_KONA
@@ -119161,7 +119161,7 @@ index f9263426af030..a4fe9a954b882 100644
  	tristate "BRCMSTB GPIO support"
  	default y if (ARCH_BRCMSTB || BMIPS_GENERIC)
 diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile
-index d2fd19c15bae3..86edbc79e5956 100644
+index d2fd19c15bae..86edbc79e595 100644
 --- a/drivers/gpio/Makefile
 +++ b/drivers/gpio/Makefile
 @@ -34,6 +34,7 @@ obj-$(CONFIG_GPIO_ARIZONA)		+= gpio-arizona.o
@@ -119174,7 +119174,7 @@ index d2fd19c15bae3..86edbc79e5956 100644
  obj-$(CONFIG_GPIO_BRCMSTB)		+= gpio-brcmstb.o
 diff --git a/drivers/gpio/gpio-bcm-virt.c b/drivers/gpio/gpio-bcm-virt.c
 new file mode 100644
-index 0000000000000..49e28ad9760e0
+index 000000000000..49e28ad9760e
 --- /dev/null
 +++ b/drivers/gpio/gpio-bcm-virt.c
 @@ -0,0 +1,214 @@
@@ -119753,7 +119753,7 @@ https://github.com/pvaret/rtl8192cu-fixes
  create mode 100755 drivers/net/wireless/realtek/rtl8192cu/wlan0dhcp
 
 diff --git a/drivers/net/wireless/realtek/Kconfig b/drivers/net/wireless/realtek/Kconfig
-index 8ea2d8d7e356d..1ed17f043e331 100644
+index 8ea2d8d7e356..1ed17f043e33 100644
 --- a/drivers/net/wireless/realtek/Kconfig
 +++ b/drivers/net/wireless/realtek/Kconfig
 @@ -14,6 +14,7 @@ if WLAN_VENDOR_REALTEK
@@ -119765,7 +119765,7 @@ index 8ea2d8d7e356d..1ed17f043e331 100644
  source "drivers/net/wireless/realtek/rtw88/Kconfig"
  
 diff --git a/drivers/net/wireless/realtek/Makefile b/drivers/net/wireless/realtek/Makefile
-index 888b5d594e797..bfa7a1c3df275 100644
+index 888b5d594e79..bfa7a1c3df27 100644
 --- a/drivers/net/wireless/realtek/Makefile
 +++ b/drivers/net/wireless/realtek/Makefile
 @@ -6,6 +6,7 @@
@@ -119778,7 +119778,7 @@ index 888b5d594e797..bfa7a1c3df275 100644
  
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/Kconfig b/drivers/net/wireless/realtek/rtl8192cu/Kconfig
 new file mode 100644
-index 0000000000000..cd7830bb9d5de
+index 000000000000..cd7830bb9d5d
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/Kconfig
 @@ -0,0 +1,9 @@
@@ -119793,7 +119793,7 @@ index 0000000000000..cd7830bb9d5de
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/Makefile b/drivers/net/wireless/realtek/rtl8192cu/Makefile
 new file mode 100644
-index 0000000000000..c399011a3e377
+index 000000000000..c399011a3e37
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/Makefile
 @@ -0,0 +1,616 @@
@@ -120415,7 +120415,7 @@ index 0000000000000..c399011a3e377
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/clean b/drivers/net/wireless/realtek/rtl8192cu/clean
 new file mode 100644
-index 0000000000000..87664218b8891
+index 000000000000..87664218b889
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/clean
 @@ -0,0 +1,5 @@
@@ -120426,7 +120426,7 @@ index 0000000000000..87664218b8891
 +rmmod 8192de
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/core/efuse/rtw_efuse.c b/drivers/net/wireless/realtek/rtl8192cu/core/efuse/rtw_efuse.c
 new file mode 100755
-index 0000000000000..3d341accc9aa7
+index 000000000000..3d341accc9aa
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/core/efuse/rtw_efuse.c
 @@ -0,0 +1,1147 @@
@@ -121579,7 +121579,7 @@ index 0000000000000..3d341accc9aa7
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/core/rtw_ap.c b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_ap.c
 new file mode 100755
-index 0000000000000..14576dd191f3d
+index 000000000000..14576dd191f3
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_ap.c
 @@ -0,0 +1,2943 @@
@@ -124528,7 +124528,7 @@ index 0000000000000..14576dd191f3d
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/core/rtw_br_ext.c b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_br_ext.c
 new file mode 100755
-index 0000000000000..2f84a38e2fdb8
+index 000000000000..2f84a38e2fdb
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_br_ext.c
 @@ -0,0 +1,1700 @@
@@ -126234,7 +126234,7 @@ index 0000000000000..2f84a38e2fdb8
 +#endif	// CONFIG_BR_EXT
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/core/rtw_cmd.c b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_cmd.c
 new file mode 100755
-index 0000000000000..f906eb3489d1e
+index 000000000000..f906eb3489d1
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_cmd.c
 @@ -0,0 +1,3035 @@
@@ -129275,7 +129275,7 @@ index 0000000000000..f906eb3489d1e
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/core/rtw_debug.c b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_debug.c
 new file mode 100755
-index 0000000000000..f70fcb7b2cd13
+index 000000000000..f70fcb7b2cd1
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_debug.c
 @@ -0,0 +1,1337 @@
@@ -130618,7 +130618,7 @@ index 0000000000000..f70fcb7b2cd13
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/core/rtw_eeprom.c b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_eeprom.c
 new file mode 100755
-index 0000000000000..fd07d64d8724a
+index 000000000000..fd07d64d8724
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_eeprom.c
 @@ -0,0 +1,423 @@
@@ -131047,7 +131047,7 @@ index 0000000000000..fd07d64d8724a
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/core/rtw_ieee80211.c b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_ieee80211.c
 new file mode 100755
-index 0000000000000..f89ce4a003233
+index 000000000000..f89ce4a00323
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_ieee80211.c
 @@ -0,0 +1,1916 @@
@@ -132969,7 +132969,7 @@ index 0000000000000..f89ce4a003233
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/core/rtw_io.c b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_io.c
 new file mode 100755
-index 0000000000000..4ffaa50d3c5df
+index 000000000000..4ffaa50d3c5d
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_io.c
 @@ -0,0 +1,464 @@
@@ -133439,7 +133439,7 @@ index 0000000000000..4ffaa50d3c5df
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/core/rtw_ioctl_query.c b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_ioctl_query.c
 new file mode 100755
-index 0000000000000..06018867e34dd
+index 000000000000..06018867e34d
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_ioctl_query.c
 @@ -0,0 +1,196 @@
@@ -133641,7 +133641,7 @@ index 0000000000000..06018867e34dd
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/core/rtw_ioctl_rtl.c b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_ioctl_rtl.c
 new file mode 100755
-index 0000000000000..31b4704d43478
+index 000000000000..31b4704d4347
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_ioctl_rtl.c
 @@ -0,0 +1,1031 @@
@@ -134678,7 +134678,7 @@ index 0000000000000..31b4704d43478
 +//**************  oid_rtl_seg_03_00 section end **************  
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/core/rtw_ioctl_set.c b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_ioctl_set.c
 new file mode 100755
-index 0000000000000..564ff6eaebec8
+index 000000000000..564ff6eaebec
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_ioctl_set.c
 @@ -0,0 +1,1494 @@
@@ -136178,7 +136178,7 @@ index 0000000000000..564ff6eaebec8
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/core/rtw_iol.c b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_iol.c
 new file mode 100755
-index 0000000000000..872cc4234fc4d
+index 000000000000..872cc4234fc4
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_iol.c
 @@ -0,0 +1,263 @@
@@ -136447,7 +136447,7 @@ index 0000000000000..872cc4234fc4d
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/core/rtw_mlme.c b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_mlme.c
 new file mode 100755
-index 0000000000000..00edd9cc69551
+index 000000000000..00edd9cc6955
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_mlme.c
 @@ -0,0 +1,3967 @@
@@ -140420,7 +140420,7 @@ index 0000000000000..00edd9cc69551
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/core/rtw_mlme_ext.c b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_mlme_ext.c
 new file mode 100755
-index 0000000000000..e20c116a9cf8c
+index 000000000000..e20c116a9cf8
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_mlme_ext.c
 @@ -0,0 +1,13600 @@
@@ -154026,7 +154026,7 @@ index 0000000000000..e20c116a9cf8c
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/core/rtw_mp.c b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_mp.c
 new file mode 100755
-index 0000000000000..9af42cdc980a8
+index 000000000000..9af42cdc980a
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_mp.c
 @@ -0,0 +1,1324 @@
@@ -155356,7 +155356,7 @@ index 0000000000000..9af42cdc980a8
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/core/rtw_mp_ioctl.c b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_mp_ioctl.c
 new file mode 100755
-index 0000000000000..b941e2ce72dbf
+index 000000000000..b941e2ce72db
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_mp_ioctl.c
 @@ -0,0 +1,2954 @@
@@ -158316,7 +158316,7 @@ index 0000000000000..b941e2ce72dbf
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/core/rtw_p2p.c b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_p2p.c
 new file mode 100755
-index 0000000000000..18a1b772cd957
+index 000000000000..18a1b772cd95
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_p2p.c
 @@ -0,0 +1,5370 @@
@@ -163692,7 +163692,7 @@ index 0000000000000..18a1b772cd957
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/core/rtw_pwrctrl.c b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_pwrctrl.c
 new file mode 100755
-index 0000000000000..e2329fb235355
+index 000000000000..e2329fb23535
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_pwrctrl.c
 @@ -0,0 +1,1551 @@
@@ -165249,7 +165249,7 @@ index 0000000000000..e2329fb235355
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/core/rtw_recv.c b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_recv.c
 new file mode 100755
-index 0000000000000..edf85b205b3f5
+index 000000000000..edf85b205b3f
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_recv.c
 @@ -0,0 +1,4306 @@
@@ -169561,7 +169561,7 @@ index 0000000000000..edf85b205b3f5
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/core/rtw_rf.c b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_rf.c
 new file mode 100755
-index 0000000000000..7ae86351b9f04
+index 000000000000..7ae86351b9f0
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_rf.c
 @@ -0,0 +1,95 @@
@@ -169662,7 +169662,7 @@ index 0000000000000..7ae86351b9f04
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/core/rtw_security.c b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_security.c
 new file mode 100755
-index 0000000000000..8fa8ed51b721c
+index 000000000000..8fa8ed51b721
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_security.c
 @@ -0,0 +1,3115 @@
@@ -172783,7 +172783,7 @@ index 0000000000000..8fa8ed51b721c
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/core/rtw_sreset.c b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_sreset.c
 new file mode 100755
-index 0000000000000..e08b1f7397354
+index 000000000000..e08b1f739735
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_sreset.c
 @@ -0,0 +1,352 @@
@@ -173141,7 +173141,7 @@ index 0000000000000..e08b1f7397354
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/core/rtw_sta_mgt.c b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_sta_mgt.c
 new file mode 100755
-index 0000000000000..a2f1c975f9bcd
+index 000000000000..a2f1c975f9bc
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_sta_mgt.c
 @@ -0,0 +1,848 @@
@@ -173995,7 +173995,7 @@ index 0000000000000..a2f1c975f9bcd
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/core/rtw_tdls.c b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_tdls.c
 new file mode 100755
-index 0000000000000..e8c4d4cc7a73a
+index 000000000000..e8c4d4cc7a73
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_tdls.c
 @@ -0,0 +1,2941 @@
@@ -176942,7 +176942,7 @@ index 0000000000000..e8c4d4cc7a73a
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/core/rtw_wlan_util.c b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_wlan_util.c
 new file mode 100755
-index 0000000000000..051445cba2f04
+index 000000000000..051445cba2f0
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_wlan_util.c
 @@ -0,0 +1,2305 @@
@@ -179253,7 +179253,7 @@ index 0000000000000..051445cba2f04
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/core/rtw_xmit.c b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_xmit.c
 new file mode 100755
-index 0000000000000..c080fbf59e177
+index 000000000000..c080fbf59e17
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_xmit.c
 @@ -0,0 +1,4156 @@
@@ -183415,7 +183415,7 @@ index 0000000000000..c080fbf59e177
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/hal/HalPwrSeqCmd.c b/drivers/net/wireless/realtek/rtl8192cu/hal/HalPwrSeqCmd.c
 new file mode 100755
-index 0000000000000..c59bb664de934
+index 000000000000..c59bb664de93
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/hal/HalPwrSeqCmd.c
 @@ -0,0 +1,177 @@
@@ -183598,7 +183598,7 @@ index 0000000000000..c59bb664de934
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/hal/dm.c b/drivers/net/wireless/realtek/rtl8192cu/hal/dm.c
 new file mode 100755
-index 0000000000000..465ca826c9fd6
+index 000000000000..465ca826c9fd
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/hal/dm.c
 @@ -0,0 +1,314 @@
@@ -183918,7 +183918,7 @@ index 0000000000000..465ca826c9fd6
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/hal/dm.h b/drivers/net/wireless/realtek/rtl8192cu/hal/dm.h
 new file mode 100755
-index 0000000000000..dd9a57d9d8f4c
+index 000000000000..dd9a57d9d8f4
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/hal/dm.h
 @@ -0,0 +1,30 @@
@@ -183954,7 +183954,7 @@ index 0000000000000..dd9a57d9d8f4c
 +#endif /* __DM_H__ */
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/hal/hal_com.c b/drivers/net/wireless/realtek/rtl8192cu/hal/hal_com.c
 new file mode 100755
-index 0000000000000..4dcafd656eaea
+index 000000000000..4dcafd656eae
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/hal/hal_com.c
 @@ -0,0 +1,371 @@
@@ -184331,7 +184331,7 @@ index 0000000000000..4dcafd656eaea
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/hal/hal_intf.c b/drivers/net/wireless/realtek/rtl8192cu/hal/hal_intf.c
 new file mode 100755
-index 0000000000000..6c56e72d2588d
+index 000000000000..6c56e72d2588
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/hal/hal_intf.c
 @@ -0,0 +1,546 @@
@@ -184883,7 +184883,7 @@ index 0000000000000..6c56e72d2588d
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/rtl8192c_cmd.c b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/rtl8192c_cmd.c
 new file mode 100755
-index 0000000000000..33921e2ed5abc
+index 000000000000..33921e2ed5ab
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/rtl8192c_cmd.c
 @@ -0,0 +1,1159 @@
@@ -186048,7 +186048,7 @@ index 0000000000000..33921e2ed5abc
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/rtl8192c_dm.c b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/rtl8192c_dm.c
 new file mode 100755
-index 0000000000000..8a4c15307fbfc
+index 000000000000..8a4c15307fbf
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/rtl8192c_dm.c
 @@ -0,0 +1,5058 @@
@@ -191112,7 +191112,7 @@ index 0000000000000..8a4c15307fbfc
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/rtl8192c_hal_init.c b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/rtl8192c_hal_init.c
 new file mode 100755
-index 0000000000000..b9e91d70ce21c
+index 000000000000..b9e91d70ce21
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/rtl8192c_hal_init.c
 @@ -0,0 +1,3628 @@
@@ -194746,7 +194746,7 @@ index 0000000000000..b9e91d70ce21c
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/rtl8192c_mp.c b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/rtl8192c_mp.c
 new file mode 100755
-index 0000000000000..a4194c4cbe7f7
+index 000000000000..a4194c4cbe7f
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/rtl8192c_mp.c
 @@ -0,0 +1,1207 @@
@@ -195959,7 +195959,7 @@ index 0000000000000..a4194c4cbe7f7
 +#endif // CONFIG_MP_INCLUDE
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/rtl8192c_phycfg.c b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/rtl8192c_phycfg.c
 new file mode 100755
-index 0000000000000..1bae6dad889da
+index 000000000000..1bae6dad889d
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/rtl8192c_phycfg.c
 @@ -0,0 +1,4841 @@
@@ -200806,7 +200806,7 @@ index 0000000000000..1bae6dad889da
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/rtl8192c_rf6052.c b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/rtl8192c_rf6052.c
 new file mode 100755
-index 0000000000000..b1af006d055b5
+index 000000000000..b1af006d055b
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/rtl8192c_rf6052.c
 @@ -0,0 +1,1031 @@
@@ -201843,7 +201843,7 @@ index 0000000000000..b1af006d055b5
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/rtl8192c_rxdesc.c b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/rtl8192c_rxdesc.c
 new file mode 100755
-index 0000000000000..3e0d795ed27ac
+index 000000000000..3e0d795ed27a
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/rtl8192c_rxdesc.c
 @@ -0,0 +1,876 @@
@@ -202725,7 +202725,7 @@ index 0000000000000..3e0d795ed27ac
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/rtl8192c_sreset.c b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/rtl8192c_sreset.c
 new file mode 100755
-index 0000000000000..1368d66ac686d
+index 000000000000..1368d66ac686
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/rtl8192c_sreset.c
 @@ -0,0 +1,94 @@
@@ -202825,7 +202825,7 @@ index 0000000000000..1368d66ac686d
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/rtl8192c_xmit.c b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/rtl8192c_xmit.c
 new file mode 100755
-index 0000000000000..2cfd851a1793a
+index 000000000000..2cfd851a1793
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/rtl8192c_xmit.c
 @@ -0,0 +1,63 @@
@@ -202894,7 +202894,7 @@ index 0000000000000..2cfd851a1793a
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/usb/Hal8192CUHWImg.c b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/usb/Hal8192CUHWImg.c
 new file mode 100755
-index 0000000000000..b49486b45fb63
+index 000000000000..b49486b45fb6
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/usb/Hal8192CUHWImg.c
 @@ -0,0 +1,8758 @@
@@ -211658,7 +211658,7 @@ index 0000000000000..b49486b45fb63
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/usb/Hal8192CUHWImg_wowlan.c b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/usb/Hal8192CUHWImg_wowlan.c
 new file mode 100755
-index 0000000000000..66970f1c07998
+index 000000000000..66970f1c0799
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/usb/Hal8192CUHWImg_wowlan.c
 @@ -0,0 +1,2564 @@
@@ -214228,7 +214228,7 @@ index 0000000000000..66970f1c07998
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_led.c b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_led.c
 new file mode 100755
-index 0000000000000..4d4a395c12c83
+index 000000000000..4d4a395c12c8
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_led.c
 @@ -0,0 +1,2680 @@
@@ -216914,7 +216914,7 @@ index 0000000000000..4d4a395c12c83
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_recv.c b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_recv.c
 new file mode 100755
-index 0000000000000..1119cf81bcdc6
+index 000000000000..1119cf81bcdc
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_recv.c
 @@ -0,0 +1,229 @@
@@ -217149,7 +217149,7 @@ index 0000000000000..1119cf81bcdc6
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_xmit.c b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_xmit.c
 new file mode 100755
-index 0000000000000..3a4137b9ae199
+index 000000000000..3a4137b9ae19
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/usb/rtl8192cu_xmit.c
 @@ -0,0 +1,1150 @@
@@ -218305,7 +218305,7 @@ index 0000000000000..3a4137b9ae199
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/usb/usb_halinit.c b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/usb/usb_halinit.c
 new file mode 100755
-index 0000000000000..ff894732ba900
+index 000000000000..ff894732ba90
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/usb/usb_halinit.c
 @@ -0,0 +1,6261 @@
@@ -224572,7 +224572,7 @@ index 0000000000000..ff894732ba900
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/usb/usb_ops_ce.c b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/usb/usb_ops_ce.c
 new file mode 100755
-index 0000000000000..9523337622b85
+index 000000000000..9523337622b8
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/usb/usb_ops_ce.c
 @@ -0,0 +1,1207 @@
@@ -225785,7 +225785,7 @@ index 0000000000000..9523337622b85
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/usb/usb_ops_linux.c b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/usb/usb_ops_linux.c
 new file mode 100755
-index 0000000000000..2d627d303122a
+index 000000000000..2d627d303122
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/usb/usb_ops_linux.c
 @@ -0,0 +1,1536 @@
@@ -227327,7 +227327,7 @@ index 0000000000000..2d627d303122a
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/usb/usb_ops_xp.c b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/usb/usb_ops_xp.c
 new file mode 100755
-index 0000000000000..32ff645aecf38
+index 000000000000..32ff645aecf3
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/usb/usb_ops_xp.c
 @@ -0,0 +1,1265 @@
@@ -228598,7 +228598,7 @@ index 0000000000000..32ff645aecf38
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/ifcfg-wlan0 b/drivers/net/wireless/realtek/rtl8192cu/ifcfg-wlan0
 new file mode 100755
-index 0000000000000..7ecb7ae62c7fb
+index 000000000000..7ecb7ae62c7f
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/ifcfg-wlan0
 @@ -0,0 +1,4 @@
@@ -228609,7 +228609,7 @@ index 0000000000000..7ecb7ae62c7fb
 \ No newline at end of file
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/Hal8192CEHWImg.h b/drivers/net/wireless/realtek/rtl8192cu/include/Hal8192CEHWImg.h
 new file mode 100755
-index 0000000000000..4ae36300d8b7a
+index 000000000000..4ae36300d8b7
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/Hal8192CEHWImg.h
 @@ -0,0 +1,85 @@
@@ -228700,7 +228700,7 @@ index 0000000000000..4ae36300d8b7a
 +#endif //__INC_HAL8192CE_FW_IMG_H
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/Hal8192CPhyCfg.h b/drivers/net/wireless/realtek/rtl8192cu/include/Hal8192CPhyCfg.h
 new file mode 100755
-index 0000000000000..3afb292c71a74
+index 000000000000..3afb292c71a7
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/Hal8192CPhyCfg.h
 @@ -0,0 +1,428 @@
@@ -229134,7 +229134,7 @@ index 0000000000000..3afb292c71a74
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/Hal8192CPhyReg.h b/drivers/net/wireless/realtek/rtl8192cu/include/Hal8192CPhyReg.h
 new file mode 100755
-index 0000000000000..6364166d68cf4
+index 000000000000..6364166d68cf
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/Hal8192CPhyReg.h
 @@ -0,0 +1,1123 @@
@@ -230263,7 +230263,7 @@ index 0000000000000..6364166d68cf4
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/Hal8192CUHWImg.h b/drivers/net/wireless/realtek/rtl8192cu/include/Hal8192CUHWImg.h
 new file mode 100755
-index 0000000000000..ba3c282f63486
+index 000000000000..ba3c282f6348
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/Hal8192CUHWImg.h
 @@ -0,0 +1,105 @@
@@ -230374,7 +230374,7 @@ index 0000000000000..ba3c282f63486
 +#endif //__INC_HAL8192CU_FW_IMG_H
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/Hal8192CUHWImg_wowlan.h b/drivers/net/wireless/realtek/rtl8192cu/include/Hal8192CUHWImg_wowlan.h
 new file mode 100755
-index 0000000000000..47d4d2fc42732
+index 000000000000..47d4d2fc4273
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/Hal8192CUHWImg_wowlan.h
 @@ -0,0 +1,34 @@
@@ -230414,7 +230414,7 @@ index 0000000000000..47d4d2fc42732
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/Hal8192DEHWImg.h b/drivers/net/wireless/realtek/rtl8192cu/include/Hal8192DEHWImg.h
 new file mode 100755
-index 0000000000000..06397752a28d7
+index 000000000000..06397752a28d
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/Hal8192DEHWImg.h
 @@ -0,0 +1,66 @@
@@ -230486,7 +230486,7 @@ index 0000000000000..06397752a28d7
 +#endif //__INC_HAL8192CU_FW_IMG_H
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/Hal8192DPhyCfg.h b/drivers/net/wireless/realtek/rtl8192cu/include/Hal8192DPhyCfg.h
 new file mode 100755
-index 0000000000000..624fbda6d486a
+index 000000000000..624fbda6d486
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/Hal8192DPhyCfg.h
 @@ -0,0 +1,528 @@
@@ -231020,7 +231020,7 @@ index 0000000000000..624fbda6d486a
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/Hal8192DPhyReg.h b/drivers/net/wireless/realtek/rtl8192cu/include/Hal8192DPhyReg.h
 new file mode 100755
-index 0000000000000..f28aa033bbe03
+index 000000000000..f28aa033bbe0
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/Hal8192DPhyReg.h
 @@ -0,0 +1,1171 @@
@@ -232197,7 +232197,7 @@ index 0000000000000..f28aa033bbe03
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/Hal8192DUHWImg.h b/drivers/net/wireless/realtek/rtl8192cu/include/Hal8192DUHWImg.h
 new file mode 100755
-index 0000000000000..d6c66d993b46c
+index 000000000000..d6c66d993b46
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/Hal8192DUHWImg.h
 @@ -0,0 +1,66 @@
@@ -232269,7 +232269,7 @@ index 0000000000000..d6c66d993b46c
 +#endif //__INC_HAL8192CU_FW_IMG_H
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/Hal8192DUHWImg_wowlan.h b/drivers/net/wireless/realtek/rtl8192cu/include/Hal8192DUHWImg_wowlan.h
 new file mode 100755
-index 0000000000000..cc27a776ea403
+index 000000000000..cc27a776ea40
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/Hal8192DUHWImg_wowlan.h
 @@ -0,0 +1,30 @@
@@ -232305,7 +232305,7 @@ index 0000000000000..cc27a776ea403
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/HalPwrSeqCmd.h b/drivers/net/wireless/realtek/rtl8192cu/include/HalPwrSeqCmd.h
 new file mode 100755
-index 0000000000000..e5d151cfdfba6
+index 000000000000..e5d151cfdfba
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/HalPwrSeqCmd.h
 @@ -0,0 +1,137 @@
@@ -232448,7 +232448,7 @@ index 0000000000000..e5d151cfdfba6
 +#endif
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/autoconf.h b/drivers/net/wireless/realtek/rtl8192cu/include/autoconf.h
 new file mode 100755
-index 0000000000000..0a77785954f82
+index 000000000000..0a77785954f8
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/autoconf.h
 @@ -0,0 +1,336 @@
@@ -232790,7 +232790,7 @@ index 0000000000000..0a77785954f82
 +//#define CONFIG_BUSY_TRAFFIC_SKIP_PWR_TRACK
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/basic_types.h b/drivers/net/wireless/realtek/rtl8192cu/include/basic_types.h
 new file mode 100755
-index 0000000000000..f76e68ffe96a5
+index 000000000000..f76e68ffe96a
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/basic_types.h
 @@ -0,0 +1,321 @@
@@ -233117,7 +233117,7 @@ index 0000000000000..f76e68ffe96a5
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/byteorder/big_endian.h b/drivers/net/wireless/realtek/rtl8192cu/include/byteorder/big_endian.h
 new file mode 100755
-index 0000000000000..eca68a6569f69
+index 000000000000..eca68a6569f6
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/byteorder/big_endian.h
 @@ -0,0 +1,87 @@
@@ -233210,7 +233210,7 @@ index 0000000000000..eca68a6569f69
 +#endif /* _LINUX_BYTEORDER_BIG_ENDIAN_H */
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/byteorder/generic.h b/drivers/net/wireless/realtek/rtl8192cu/include/byteorder/generic.h
 new file mode 100755
-index 0000000000000..7c8d4d7047bc1
+index 000000000000..7c8d4d7047bc
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/byteorder/generic.h
 @@ -0,0 +1,212 @@
@@ -233428,7 +233428,7 @@ index 0000000000000..7c8d4d7047bc1
 +#endif /* _LINUX_BYTEORDER_GENERIC_H */
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/byteorder/little_endian.h b/drivers/net/wireless/realtek/rtl8192cu/include/byteorder/little_endian.h
 new file mode 100755
-index 0000000000000..433045e469390
+index 000000000000..433045e46939
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/byteorder/little_endian.h
 @@ -0,0 +1,89 @@
@@ -233523,7 +233523,7 @@ index 0000000000000..433045e469390
 +#endif /* _LINUX_BYTEORDER_LITTLE_ENDIAN_H */
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/byteorder/swab.h b/drivers/net/wireless/realtek/rtl8192cu/include/byteorder/swab.h
 new file mode 100755
-index 0000000000000..a3ca9eaecb956
+index 000000000000..a3ca9eaecb95
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/byteorder/swab.h
 @@ -0,0 +1,140 @@
@@ -233669,7 +233669,7 @@ index 0000000000000..a3ca9eaecb956
 +#endif /* _LINUX_BYTEORDER_SWAB_H */
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/byteorder/swabb.h b/drivers/net/wireless/realtek/rtl8192cu/include/byteorder/swabb.h
 new file mode 100755
-index 0000000000000..7e2a118c21221
+index 000000000000..7e2a118c2122
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/byteorder/swabb.h
 @@ -0,0 +1,156 @@
@@ -233831,7 +233831,7 @@ index 0000000000000..7e2a118c21221
 +#endif /* _LINUX_BYTEORDER_SWABB_H */
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/circ_buf.h b/drivers/net/wireless/realtek/rtl8192cu/include/circ_buf.h
 new file mode 100755
-index 0000000000000..1bd4704a7c33a
+index 000000000000..1bd4704a7c33
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/circ_buf.h
 @@ -0,0 +1,27 @@
@@ -233864,7 +233864,7 @@ index 0000000000000..1bd4704a7c33a
 +#endif //_CIRC_BUF_H_
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/cmd_osdep.h b/drivers/net/wireless/realtek/rtl8192cu/include/cmd_osdep.h
 new file mode 100755
-index 0000000000000..077efa731f9a7
+index 000000000000..077efa731f9a
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/cmd_osdep.h
 @@ -0,0 +1,36 @@
@@ -233906,7 +233906,7 @@ index 0000000000000..077efa731f9a7
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/drv_conf.h b/drivers/net/wireless/realtek/rtl8192cu/include/drv_conf.h
 new file mode 100755
-index 0000000000000..13176879f666b
+index 000000000000..13176879f666
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/drv_conf.h
 @@ -0,0 +1,78 @@
@@ -233990,7 +233990,7 @@ index 0000000000000..13176879f666b
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/drv_types.h b/drivers/net/wireless/realtek/rtl8192cu/include/drv_types.h
 new file mode 100755
-index 0000000000000..0ac34f21e33ec
+index 000000000000..0ac34f21e33e
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/drv_types.h
 @@ -0,0 +1,662 @@
@@ -234658,7 +234658,7 @@ index 0000000000000..0ac34f21e33ec
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/drv_types_ce.h b/drivers/net/wireless/realtek/rtl8192cu/include/drv_types_ce.h
 new file mode 100755
-index 0000000000000..be0459dcb2195
+index 000000000000..be0459dcb219
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/drv_types_ce.h
 @@ -0,0 +1,92 @@
@@ -234756,7 +234756,7 @@ index 0000000000000..be0459dcb2195
 +#endif
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/drv_types_linux.h b/drivers/net/wireless/realtek/rtl8192cu/include/drv_types_linux.h
 new file mode 100755
-index 0000000000000..db1c585690ff8
+index 000000000000..db1c585690ff
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/drv_types_linux.h
 @@ -0,0 +1,25 @@
@@ -234787,7 +234787,7 @@ index 0000000000000..db1c585690ff8
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/drv_types_sdio.h b/drivers/net/wireless/realtek/rtl8192cu/include/drv_types_sdio.h
 new file mode 100755
-index 0000000000000..fd467ca6ddfda
+index 000000000000..fd467ca6ddfd
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/drv_types_sdio.h
 @@ -0,0 +1,70 @@
@@ -234863,7 +234863,7 @@ index 0000000000000..fd467ca6ddfda
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/drv_types_xp.h b/drivers/net/wireless/realtek/rtl8192cu/include/drv_types_xp.h
 new file mode 100755
-index 0000000000000..2d51b1db13b09
+index 000000000000..2d51b1db13b0
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/drv_types_xp.h
 @@ -0,0 +1,95 @@
@@ -234964,7 +234964,7 @@ index 0000000000000..2d51b1db13b09
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/ethernet.h b/drivers/net/wireless/realtek/rtl8192cu/include/ethernet.h
 new file mode 100755
-index 0000000000000..36e29c060d3f7
+index 000000000000..36e29c060d3f
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/ethernet.h
 @@ -0,0 +1,41 @@
@@ -235011,7 +235011,7 @@ index 0000000000000..36e29c060d3f7
 +#endif // #ifndef __INC_ETHERNET_H
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/h2clbk.h b/drivers/net/wireless/realtek/rtl8192cu/include/h2clbk.h
 new file mode 100755
-index 0000000000000..359c9e7a8f249
+index 000000000000..359c9e7a8f24
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/h2clbk.h
 @@ -0,0 +1,35 @@
@@ -235052,7 +235052,7 @@ index 0000000000000..359c9e7a8f249
 +void h2c_event_callback(unsigned char *dev, unsigned char *pbuf);
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/hal_com.h b/drivers/net/wireless/realtek/rtl8192cu/include/hal_com.h
 new file mode 100755
-index 0000000000000..42aae0e057b15
+index 000000000000..42aae0e057b1
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/hal_com.h
 @@ -0,0 +1,146 @@
@@ -235204,7 +235204,7 @@ index 0000000000000..42aae0e057b15
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/hal_intf.h b/drivers/net/wireless/realtek/rtl8192cu/include/hal_intf.h
 new file mode 100755
-index 0000000000000..dd8266229eddb
+index 000000000000..dd8266229edd
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/hal_intf.h
 @@ -0,0 +1,432 @@
@@ -235642,7 +235642,7 @@ index 0000000000000..dd8266229eddb
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/ieee80211.h b/drivers/net/wireless/realtek/rtl8192cu/include/ieee80211.h
 new file mode 100755
-index 0000000000000..e283a5f25d4c9
+index 000000000000..e283a5f25d4c
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/ieee80211.h
 @@ -0,0 +1,1580 @@
@@ -237228,7 +237228,7 @@ index 0000000000000..e283a5f25d4c9
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/ieee80211_ext.h b/drivers/net/wireless/realtek/rtl8192cu/include/ieee80211_ext.h
 new file mode 100755
-index 0000000000000..3e55305e1d981
+index 000000000000..3e55305e1d98
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/ieee80211_ext.h
 @@ -0,0 +1,477 @@
@@ -237711,7 +237711,7 @@ index 0000000000000..3e55305e1d981
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/if_ether.h b/drivers/net/wireless/realtek/rtl8192cu/include/if_ether.h
 new file mode 100755
-index 0000000000000..9e36d7fadb258
+index 000000000000..9e36d7fadb25
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/if_ether.h
 @@ -0,0 +1,112 @@
@@ -237829,7 +237829,7 @@ index 0000000000000..9e36d7fadb258
 +#endif	/* _LINUX_IF_ETHER_H */
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/ioctl_cfg80211.h b/drivers/net/wireless/realtek/rtl8192cu/include/ioctl_cfg80211.h
 new file mode 100755
-index 0000000000000..f182fb0f349e4
+index 000000000000..f182fb0f349e
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/ioctl_cfg80211.h
 @@ -0,0 +1,184 @@
@@ -238019,7 +238019,7 @@ index 0000000000000..f182fb0f349e4
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/ip.h b/drivers/net/wireless/realtek/rtl8192cu/include/ip.h
 new file mode 100755
-index 0000000000000..d7f723d265281
+index 000000000000..d7f723d26528
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/ip.h
 @@ -0,0 +1,141 @@
@@ -238166,7 +238166,7 @@ index 0000000000000..d7f723d265281
 +#endif	/* _LINUX_IP_H */
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/linux/wireless.h b/drivers/net/wireless/realtek/rtl8192cu/include/linux/wireless.h
 new file mode 100755
-index 0000000000000..24a22d63d696b
+index 000000000000..24a22d63d696
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/linux/wireless.h
 @@ -0,0 +1,90 @@
@@ -238262,7 +238262,7 @@ index 0000000000000..24a22d63d696b
 +#endif	/* _LINUX_WIRELESS_H */
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/mlme_osdep.h b/drivers/net/wireless/realtek/rtl8192cu/include/mlme_osdep.h
 new file mode 100755
-index 0000000000000..75754db1accd6
+index 000000000000..75754db1accd
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/mlme_osdep.h
 @@ -0,0 +1,40 @@
@@ -238308,7 +238308,7 @@ index 0000000000000..75754db1accd6
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/mp_custom_oid.h b/drivers/net/wireless/realtek/rtl8192cu/include/mp_custom_oid.h
 new file mode 100755
-index 0000000000000..5f8673811fb58
+index 000000000000..5f8673811fb5
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/mp_custom_oid.h
 @@ -0,0 +1,353 @@
@@ -238667,7 +238667,7 @@ index 0000000000000..5f8673811fb58
 +#endif //#ifndef	__CUSTOM_OID_H
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/nic_spec.h b/drivers/net/wireless/realtek/rtl8192cu/include/nic_spec.h
 new file mode 100755
-index 0000000000000..18e7b2c096715
+index 000000000000..18e7b2c09671
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/nic_spec.h
 @@ -0,0 +1,47 @@
@@ -238720,7 +238720,7 @@ index 0000000000000..18e7b2c096715
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/osdep_ce_service.h b/drivers/net/wireless/realtek/rtl8192cu/include/osdep_ce_service.h
 new file mode 100755
-index 0000000000000..e374077fdb342
+index 000000000000..e374077fdb34
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/osdep_ce_service.h
 @@ -0,0 +1,171 @@
@@ -238897,7 +238897,7 @@ index 0000000000000..e374077fdb342
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/osdep_intf.h b/drivers/net/wireless/realtek/rtl8192cu/include/osdep_intf.h
 new file mode 100755
-index 0000000000000..3cd165969f2f7
+index 000000000000..3cd165969f2f
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/osdep_intf.h
 @@ -0,0 +1,155 @@
@@ -239058,7 +239058,7 @@ index 0000000000000..3cd165969f2f7
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/osdep_service.h b/drivers/net/wireless/realtek/rtl8192cu/include/osdep_service.h
 new file mode 100755
-index 0000000000000..a6dcdff1d1b73
+index 000000000000..a6dcdff1d1b7
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/osdep_service.h
 @@ -0,0 +1,1821 @@
@@ -240885,7 +240885,7 @@ index 0000000000000..a6dcdff1d1b73
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/pci_hal.h b/drivers/net/wireless/realtek/rtl8192cu/include/pci_hal.h
 new file mode 100755
-index 0000000000000..1ee0ee2c226ba
+index 000000000000..1ee0ee2c226b
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/pci_hal.h
 @@ -0,0 +1,168 @@
@@ -241059,7 +241059,7 @@ index 0000000000000..1ee0ee2c226ba
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/pci_ops.h b/drivers/net/wireless/realtek/rtl8192cu/include/pci_ops.h
 new file mode 100755
-index 0000000000000..9404ff44b6286
+index 000000000000..9404ff44b628
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/pci_ops.h
 @@ -0,0 +1,60 @@
@@ -241125,7 +241125,7 @@ index 0000000000000..9404ff44b6286
 +#endif
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/pci_osintf.h b/drivers/net/wireless/realtek/rtl8192cu/include/pci_osintf.h
 new file mode 100755
-index 0000000000000..09715af43781b
+index 000000000000..09715af43781
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/pci_osintf.h
 @@ -0,0 +1,33 @@
@@ -241164,7 +241164,7 @@ index 0000000000000..09715af43781b
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/recv_osdep.h b/drivers/net/wireless/realtek/rtl8192cu/include/recv_osdep.h
 new file mode 100755
-index 0000000000000..536ed3100ae2c
+index 000000000000..536ed3100ae2
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/recv_osdep.h
 @@ -0,0 +1,58 @@
@@ -241228,7 +241228,7 @@ index 0000000000000..536ed3100ae2c
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192c_cmd.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192c_cmd.h
 new file mode 100755
-index 0000000000000..c54cc31334e3a
+index 000000000000..c54cc31334e3
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192c_cmd.h
 @@ -0,0 +1,153 @@
@@ -241387,7 +241387,7 @@ index 0000000000000..c54cc31334e3a
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192c_dm.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192c_dm.h
 new file mode 100755
-index 0000000000000..9d065405ecbc3
+index 000000000000..9d065405ecbc
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192c_dm.h
 @@ -0,0 +1,516 @@
@@ -241909,7 +241909,7 @@ index 0000000000000..9d065405ecbc3
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192c_event.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192c_event.h
 new file mode 100755
-index 0000000000000..1013f74a0be3f
+index 000000000000..1013f74a0be3
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192c_event.h
 @@ -0,0 +1,28 @@
@@ -241943,7 +241943,7 @@ index 0000000000000..1013f74a0be3f
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192c_hal.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192c_hal.h
 new file mode 100755
-index 0000000000000..3348971c8018d
+index 000000000000..3348971c8018
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192c_hal.h
 @@ -0,0 +1,937 @@
@@ -242886,7 +242886,7 @@ index 0000000000000..3348971c8018d
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192c_led.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192c_led.h
 new file mode 100755
-index 0000000000000..1ccf935968964
+index 000000000000..1ccf93596896
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192c_led.h
 @@ -0,0 +1,42 @@
@@ -242934,7 +242934,7 @@ index 0000000000000..1ccf935968964
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192c_recv.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192c_recv.h
 new file mode 100755
-index 0000000000000..d5656f5ebd8f5
+index 000000000000..d5656f5ebd8f
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192c_recv.h
 @@ -0,0 +1,184 @@
@@ -243124,7 +243124,7 @@ index 0000000000000..d5656f5ebd8f5
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192c_rf.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192c_rf.h
 new file mode 100755
-index 0000000000000..26c678a8da437
+index 000000000000..26c678a8da43
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192c_rf.h
 @@ -0,0 +1,92 @@
@@ -243222,7 +243222,7 @@ index 0000000000000..26c678a8da437
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192c_spec.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192c_spec.h
 new file mode 100755
-index 0000000000000..8ff13a7e12106
+index 000000000000..8ff13a7e1210
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192c_spec.h
 @@ -0,0 +1,1865 @@
@@ -245093,7 +245093,7 @@ index 0000000000000..8ff13a7e12106
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192c_sreset.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192c_sreset.h
 new file mode 100755
-index 0000000000000..20e88b5017cbf
+index 000000000000..20e88b5017cb
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192c_sreset.h
 @@ -0,0 +1,32 @@
@@ -245131,7 +245131,7 @@ index 0000000000000..20e88b5017cbf
 +#endif
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192c_xmit.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192c_xmit.h
 new file mode 100755
-index 0000000000000..7d2059dfc3ac8
+index 000000000000..7d2059dfc3ac
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192c_xmit.h
 @@ -0,0 +1,129 @@
@@ -245266,7 +245266,7 @@ index 0000000000000..7d2059dfc3ac8
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192d_cmd.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192d_cmd.h
 new file mode 100755
-index 0000000000000..ad7e7838e870b
+index 000000000000..ad7e7838e870
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192d_cmd.h
 @@ -0,0 +1,142 @@
@@ -245414,7 +245414,7 @@ index 0000000000000..ad7e7838e870b
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192d_dm.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192d_dm.h
 new file mode 100755
-index 0000000000000..ab5e5f79597d3
+index 000000000000..ab5e5f79597d
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192d_dm.h
 @@ -0,0 +1,420 @@
@@ -245840,7 +245840,7 @@ index 0000000000000..ab5e5f79597d3
 +#endif	//__HAL8190PCIDM_H__
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192d_hal.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192d_hal.h
 new file mode 100755
-index 0000000000000..1ab5f98259159
+index 000000000000..1ab5f9825915
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192d_hal.h
 @@ -0,0 +1,1126 @@
@@ -246972,7 +246972,7 @@ index 0000000000000..1ab5f98259159
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192d_led.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192d_led.h
 new file mode 100755
-index 0000000000000..d736bda4e9357
+index 000000000000..d736bda4e935
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192d_led.h
 @@ -0,0 +1,43 @@
@@ -247021,7 +247021,7 @@ index 0000000000000..d736bda4e9357
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192d_recv.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192d_recv.h
 new file mode 100755
-index 0000000000000..36cc2322be768
+index 000000000000..36cc2322be76
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192d_recv.h
 @@ -0,0 +1,187 @@
@@ -247214,7 +247214,7 @@ index 0000000000000..36cc2322be768
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192d_rf.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192d_rf.h
 new file mode 100755
-index 0000000000000..0b439a3f0dd7b
+index 000000000000..0b439a3f0dd7
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192d_rf.h
 @@ -0,0 +1,97 @@
@@ -247317,7 +247317,7 @@ index 0000000000000..0b439a3f0dd7b
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192d_spec.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192d_spec.h
 new file mode 100755
-index 0000000000000..bef7184e27c0f
+index 000000000000..bef7184e27c0
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192d_spec.h
 @@ -0,0 +1,1841 @@
@@ -249164,7 +249164,7 @@ index 0000000000000..bef7184e27c0f
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192d_xmit.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192d_xmit.h
 new file mode 100755
-index 0000000000000..d01fb4a76caa6
+index 000000000000..d01fb4a76caa
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192d_xmit.h
 @@ -0,0 +1,145 @@
@@ -249315,7 +249315,7 @@ index 0000000000000..d01fb4a76caa6
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtw_android.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_android.h
 new file mode 100755
-index 0000000000000..f9214c2d8a050
+index 000000000000..f9214c2d8a05
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_android.h
 @@ -0,0 +1,90 @@
@@ -249411,7 +249411,7 @@ index 0000000000000..f9214c2d8a050
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtw_ap.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_ap.h
 new file mode 100755
-index 0000000000000..42be4c67b5085
+index 000000000000..42be4c67b508
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_ap.h
 @@ -0,0 +1,64 @@
@@ -249481,7 +249481,7 @@ index 0000000000000..42be4c67b5085
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtw_br_ext.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_br_ext.h
 new file mode 100755
-index 0000000000000..9da3fddc4965e
+index 000000000000..9da3fddc4965
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_br_ext.h
 @@ -0,0 +1,76 @@
@@ -249563,7 +249563,7 @@ index 0000000000000..9da3fddc4965e
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtw_byteorder.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_byteorder.h
 new file mode 100755
-index 0000000000000..0f06b7acb3aab
+index 000000000000..0f06b7acb3aa
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_byteorder.h
 @@ -0,0 +1,40 @@
@@ -249609,7 +249609,7 @@ index 0000000000000..0f06b7acb3aab
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtw_cmd.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_cmd.h
 new file mode 100755
-index 0000000000000..ab115c5f6a234
+index 000000000000..ab115c5f6a23
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_cmd.h
 @@ -0,0 +1,1167 @@
@@ -250782,7 +250782,7 @@ index 0000000000000..ab115c5f6a234
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtw_debug.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_debug.h
 new file mode 100755
-index 0000000000000..44537363a76bf
+index 000000000000..44537363a76b
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_debug.h
 @@ -0,0 +1,538 @@
@@ -251326,7 +251326,7 @@ index 0000000000000..44537363a76bf
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtw_eeprom.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_eeprom.h
 new file mode 100755
-index 0000000000000..ce834dd19aef8
+index 000000000000..ce834dd19aef
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_eeprom.h
 @@ -0,0 +1,152 @@
@@ -251484,7 +251484,7 @@ index 0000000000000..ce834dd19aef8
 +#endif  //__RTL871X_EEPROM_H__
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtw_efuse.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_efuse.h
 new file mode 100755
-index 0000000000000..224aa4f92bd77
+index 000000000000..224aa4f92bd7
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_efuse.h
 @@ -0,0 +1,124 @@
@@ -251614,7 +251614,7 @@ index 0000000000000..224aa4f92bd77
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtw_event.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_event.h
 new file mode 100755
-index 0000000000000..4299ddcf9cd0f
+index 000000000000..4299ddcf9cd0
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_event.h
 @@ -0,0 +1,154 @@
@@ -251774,7 +251774,7 @@ index 0000000000000..4299ddcf9cd0f
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtw_ht.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_ht.h
 new file mode 100755
-index 0000000000000..3cd904df9c7c3
+index 000000000000..3cd904df9c7c
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_ht.h
 @@ -0,0 +1,50 @@
@@ -251830,7 +251830,7 @@ index 0000000000000..3cd904df9c7c3
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtw_io.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_io.h
 new file mode 100755
-index 0000000000000..c66845c86b016
+index 000000000000..c66845c86b01
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_io.h
 @@ -0,0 +1,504 @@
@@ -252340,7 +252340,7 @@ index 0000000000000..c66845c86b016
 +#endif	//_RTL8711_IO_H_
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtw_ioctl.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_ioctl.h
 new file mode 100755
-index 0000000000000..c4da30199b521
+index 000000000000..c4da30199b52
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_ioctl.h
 @@ -0,0 +1,269 @@
@@ -252615,7 +252615,7 @@ index 0000000000000..c4da30199b521
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtw_ioctl_query.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_ioctl_query.h
 new file mode 100755
-index 0000000000000..5b6018af5653a
+index 000000000000..5b6018af5653
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_ioctl_query.h
 @@ -0,0 +1,36 @@
@@ -252657,7 +252657,7 @@ index 0000000000000..5b6018af5653a
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtw_ioctl_rtl.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_ioctl_rtl.h
 new file mode 100755
-index 0000000000000..3bff766513bde
+index 000000000000..3bff766513bd
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_ioctl_rtl.h
 @@ -0,0 +1,83 @@
@@ -252746,7 +252746,7 @@ index 0000000000000..3bff766513bde
 +#endif
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtw_ioctl_set.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_ioctl_set.h
 new file mode 100755
-index 0000000000000..31d9cf66aee9b
+index 000000000000..31d9cf66aee9
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_ioctl_set.h
 @@ -0,0 +1,79 @@
@@ -252831,7 +252831,7 @@ index 0000000000000..31d9cf66aee9b
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtw_iol.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_iol.h
 new file mode 100755
-index 0000000000000..45fa5a22554ed
+index 000000000000..45fa5a22554e
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_iol.h
 @@ -0,0 +1,89 @@
@@ -252926,7 +252926,7 @@ index 0000000000000..45fa5a22554ed
 +#endif //__RTW_IOL_H_
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtw_led.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_led.h
 new file mode 100755
-index 0000000000000..b5365ba3743d2
+index 000000000000..b5365ba3743d
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_led.h
 @@ -0,0 +1,217 @@
@@ -253149,7 +253149,7 @@ index 0000000000000..b5365ba3743d2
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtw_mlme.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_mlme.h
 new file mode 100755
-index 0000000000000..60e2ad6491682
+index 000000000000..60e2ad649168
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_mlme.h
 @@ -0,0 +1,850 @@
@@ -254005,7 +254005,7 @@ index 0000000000000..60e2ad6491682
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtw_mlme_ext.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_mlme_ext.h
 new file mode 100755
-index 0000000000000..5cddca4dc7c60
+index 000000000000..5cddca4dc7c6
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_mlme_ext.h
 @@ -0,0 +1,963 @@
@@ -254974,7 +254974,7 @@ index 0000000000000..5cddca4dc7c60
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtw_mp.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_mp.h
 new file mode 100755
-index 0000000000000..0ebb1ba62575c
+index 000000000000..0ebb1ba62575
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_mp.h
 @@ -0,0 +1,712 @@
@@ -255692,7 +255692,7 @@ index 0000000000000..0ebb1ba62575c
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtw_mp_ioctl.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_mp_ioctl.h
 new file mode 100755
-index 0000000000000..962bc38eee7f7
+index 000000000000..962bc38eee7f
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_mp_ioctl.h
 @@ -0,0 +1,596 @@
@@ -256294,7 +256294,7 @@ index 0000000000000..962bc38eee7f7
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtw_mp_phy_regdef.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_mp_phy_regdef.h
 new file mode 100755
-index 0000000000000..0b47cb5c546f2
+index 000000000000..0b47cb5c546f
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_mp_phy_regdef.h
 @@ -0,0 +1,1097 @@
@@ -257397,7 +257397,7 @@ index 0000000000000..0b47cb5c546f2
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtw_p2p.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_p2p.h
 new file mode 100755
-index 0000000000000..4249bc96cda9e
+index 000000000000..4249bc96cda9
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_p2p.h
 @@ -0,0 +1,161 @@
@@ -257564,7 +257564,7 @@ index 0000000000000..4249bc96cda9e
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtw_pwrctrl.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_pwrctrl.h
 new file mode 100755
-index 0000000000000..a4cb292e1aeaf
+index 000000000000..a4cb292e1aea
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_pwrctrl.h
 @@ -0,0 +1,362 @@
@@ -257932,7 +257932,7 @@ index 0000000000000..a4cb292e1aeaf
 +#endif  //__RTL871X_PWRCTRL_H_
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtw_qos.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_qos.h
 new file mode 100755
-index 0000000000000..a359c5feb5742
+index 000000000000..a359c5feb574
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_qos.h
 @@ -0,0 +1,40 @@
@@ -257978,7 +257978,7 @@ index 0000000000000..a359c5feb5742
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtw_recv.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_recv.h
 new file mode 100755
-index 0000000000000..3a4b14bb91c4f
+index 000000000000..3a4b14bb91c4
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_recv.h
 @@ -0,0 +1,731 @@
@@ -258715,7 +258715,7 @@ index 0000000000000..3a4b14bb91c4f
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtw_rf.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_rf.h
 new file mode 100755
-index 0000000000000..697dd4e5d4630
+index 000000000000..697dd4e5d463
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_rf.h
 @@ -0,0 +1,152 @@
@@ -258873,7 +258873,7 @@ index 0000000000000..697dd4e5d4630
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtw_security.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_security.h
 new file mode 100755
-index 0000000000000..835677c37c488
+index 000000000000..835677c37c48
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_security.h
 @@ -0,0 +1,447 @@
@@ -259326,7 +259326,7 @@ index 0000000000000..835677c37c488
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtw_sreset.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_sreset.h
 new file mode 100755
-index 0000000000000..45dd2bfbf1e21
+index 000000000000..45dd2bfbf1e2
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_sreset.h
 @@ -0,0 +1,74 @@
@@ -259406,7 +259406,7 @@ index 0000000000000..45dd2bfbf1e21
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtw_tdls.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_tdls.h
 new file mode 100755
-index 0000000000000..1005331cc4592
+index 000000000000..1005331cc459
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_tdls.h
 @@ -0,0 +1,143 @@
@@ -259555,14 +259555,14 @@ index 0000000000000..1005331cc4592
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtw_version.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_version.h
 new file mode 100644
-index 0000000000000..4fb9dd4371094
+index 000000000000..4fb9dd437109
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_version.h
 @@ -0,0 +1 @@
 +#define DRIVERVERSION	"v4.0.2_9000.20130911"
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtw_xmit.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_xmit.h
 new file mode 100755
-index 0000000000000..f7eaf4a68b119
+index 000000000000..f7eaf4a68b11
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtw_xmit.h
 @@ -0,0 +1,754 @@
@@ -260322,7 +260322,7 @@ index 0000000000000..f7eaf4a68b119
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/sta_info.h b/drivers/net/wireless/realtek/rtl8192cu/include/sta_info.h
 new file mode 100755
-index 0000000000000..4f563b558d786
+index 000000000000..4f563b558d78
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/sta_info.h
 @@ -0,0 +1,432 @@
@@ -260760,7 +260760,7 @@ index 0000000000000..4f563b558d786
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/usb_hal.h b/drivers/net/wireless/realtek/rtl8192cu/include/usb_hal.h
 new file mode 100755
-index 0000000000000..d765b82076b9a
+index 000000000000..d765b82076b9
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/usb_hal.h
 @@ -0,0 +1,37 @@
@@ -260803,7 +260803,7 @@ index 0000000000000..d765b82076b9a
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/usb_ops.h b/drivers/net/wireless/realtek/rtl8192cu/include/usb_ops.h
 new file mode 100755
-index 0000000000000..8bbec2d8e39c3
+index 000000000000..8bbec2d8e39c
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/usb_ops.h
 @@ -0,0 +1,110 @@
@@ -260919,7 +260919,7 @@ index 0000000000000..8bbec2d8e39c3
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/usb_ops_linux.h b/drivers/net/wireless/realtek/rtl8192cu/include/usb_ops_linux.h
 new file mode 100755
-index 0000000000000..d418ba26c924a
+index 000000000000..d418ba26c924
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/usb_ops_linux.h
 @@ -0,0 +1,63 @@
@@ -260988,7 +260988,7 @@ index 0000000000000..d418ba26c924a
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/usb_osintf.h b/drivers/net/wireless/realtek/rtl8192cu/include/usb_osintf.h
 new file mode 100755
-index 0000000000000..753013dd0a544
+index 000000000000..753013dd0a54
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/usb_osintf.h
 @@ -0,0 +1,38 @@
@@ -261032,7 +261032,7 @@ index 0000000000000..753013dd0a544
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/usb_vendor_req.h b/drivers/net/wireless/realtek/rtl8192cu/include/usb_vendor_req.h
 new file mode 100755
-index 0000000000000..f33e98258385c
+index 000000000000..f33e98258385
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/usb_vendor_req.h
 @@ -0,0 +1,59 @@
@@ -261097,7 +261097,7 @@ index 0000000000000..f33e98258385c
 +#endif
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/wifi.h b/drivers/net/wireless/realtek/rtl8192cu/include/wifi.h
 new file mode 100755
-index 0000000000000..c5a5f2f28fbaf
+index 000000000000..c5a5f2f28fba
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/wifi.h
 @@ -0,0 +1,1248 @@
@@ -262351,7 +262351,7 @@ index 0000000000000..c5a5f2f28fbaf
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/wlan_bssdef.h b/drivers/net/wireless/realtek/rtl8192cu/include/wlan_bssdef.h
 new file mode 100755
-index 0000000000000..1cf93dca46a1f
+index 000000000000..1cf93dca46a1
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/wlan_bssdef.h
 @@ -0,0 +1,703 @@
@@ -263060,7 +263060,7 @@ index 0000000000000..1cf93dca46a1f
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/xmit_osdep.h b/drivers/net/wireless/realtek/rtl8192cu/include/xmit_osdep.h
 new file mode 100755
-index 0000000000000..e5848ece14d86
+index 000000000000..e5848ece14d8
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/include/xmit_osdep.h
 @@ -0,0 +1,95 @@
@@ -263161,7 +263161,7 @@ index 0000000000000..e5848ece14d86
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/ioctl_cfg80211.c b/drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/ioctl_cfg80211.c
 new file mode 100755
-index 0000000000000..28807e9148579
+index 000000000000..28807e914857
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/ioctl_cfg80211.c
 @@ -0,0 +1,5589 @@
@@ -268756,7 +268756,7 @@ index 0000000000000..28807e9148579
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/ioctl_linux.c b/drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/ioctl_linux.c
 new file mode 100755
-index 0000000000000..9adbeaf16cf85
+index 000000000000..9adbeaf16cf8
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/ioctl_linux.c
 @@ -0,0 +1,11909 @@
@@ -280671,7 +280671,7 @@ index 0000000000000..9adbeaf16cf85
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/mlme_linux.c b/drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/mlme_linux.c
 new file mode 100755
-index 0000000000000..0ec8d05958cf3
+index 000000000000..0ec8d05958cf
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/mlme_linux.c
 @@ -0,0 +1,653 @@
@@ -281330,7 +281330,7 @@ index 0000000000000..0ec8d05958cf3
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/os_intfs.c b/drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/os_intfs.c
 new file mode 100755
-index 0000000000000..c93e32f133e36
+index 000000000000..c93e32f133e3
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/os_intfs.c
 @@ -0,0 +1,2771 @@
@@ -284107,7 +284107,7 @@ index 0000000000000..c93e32f133e36
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/pci_intf.c b/drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/pci_intf.c
 new file mode 100755
-index 0000000000000..5bf576f1a3e3e
+index 000000000000..5bf576f1a3e3
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/pci_intf.c
 @@ -0,0 +1,1997 @@
@@ -286110,7 +286110,7 @@ index 0000000000000..5bf576f1a3e3e
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/pci_ops_linux.c b/drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/pci_ops_linux.c
 new file mode 100755
-index 0000000000000..7d671df3932c2
+index 000000000000..7d671df3932c
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/pci_ops_linux.c
 @@ -0,0 +1,24 @@
@@ -286140,7 +286140,7 @@ index 0000000000000..7d671df3932c2
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/recv_linux.c b/drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/recv_linux.c
 new file mode 100755
-index 0000000000000..628abdf7832bc
+index 000000000000..628abdf7832b
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/recv_linux.c
 @@ -0,0 +1,461 @@
@@ -286607,7 +286607,7 @@ index 0000000000000..628abdf7832bc
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/rtw_android.c b/drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/rtw_android.c
 new file mode 100755
-index 0000000000000..2908c51692946
+index 000000000000..2908c5169294
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/rtw_android.c
 @@ -0,0 +1,843 @@
@@ -287456,7 +287456,7 @@ index 0000000000000..2908c51692946
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/usb_intf.c b/drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/usb_intf.c
 new file mode 100755
-index 0000000000000..de044435d5eca
+index 000000000000..de044435d5ec
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/usb_intf.c
 @@ -0,0 +1,1662 @@
@@ -289124,7 +289124,7 @@ index 0000000000000..de044435d5eca
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/usb_ops_linux.c b/drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/usb_ops_linux.c
 new file mode 100755
-index 0000000000000..f54cfb4283d46
+index 000000000000..f54cfb4283d4
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/usb_ops_linux.c
 @@ -0,0 +1,649 @@
@@ -289779,7 +289779,7 @@ index 0000000000000..f54cfb4283d46
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/xmit_linux.c b/drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/xmit_linux.c
 new file mode 100755
-index 0000000000000..9105e293eb3c8
+index 000000000000..9105e293eb3c
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/os_dep/linux/xmit_linux.c
 @@ -0,0 +1,421 @@
@@ -290206,7 +290206,7 @@ index 0000000000000..9105e293eb3c8
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/os_dep/osdep_service.c b/drivers/net/wireless/realtek/rtl8192cu/os_dep/osdep_service.c
 new file mode 100755
-index 0000000000000..1dc4c3a1cb8b3
+index 000000000000..1dc4c3a1cb8b
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/os_dep/osdep_service.c
 @@ -0,0 +1,2300 @@
@@ -292512,7 +292512,7 @@ index 0000000000000..1dc4c3a1cb8b3
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/runwpa b/drivers/net/wireless/realtek/rtl8192cu/runwpa
 new file mode 100755
-index 0000000000000..f825e8bdb123a
+index 000000000000..f825e8bdb123
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/runwpa
 @@ -0,0 +1,20 @@
@@ -292538,7 +292538,7 @@ index 0000000000000..f825e8bdb123a
 +
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/wlan0dhcp b/drivers/net/wireless/realtek/rtl8192cu/wlan0dhcp
 new file mode 100755
-index 0000000000000..24ab3720bef62
+index 000000000000..24ab3720bef6
 --- /dev/null
 +++ b/drivers/net/wireless/realtek/rtl8192cu/wlan0dhcp
 @@ -0,0 +1,15 @@
@@ -292619,7 +292619,7 @@ configfs: New of_overlay API
 
 diff --git a/Documentation/devicetree/configfs-overlays.txt b/Documentation/devicetree/configfs-overlays.txt
 new file mode 100644
-index 0000000000000..5fa43e0643072
+index 000000000000..5fa43e064307
 --- /dev/null
 +++ b/Documentation/devicetree/configfs-overlays.txt
 @@ -0,0 +1,31 @@
@@ -292655,7 +292655,7 @@ index 0000000000000..5fa43e0643072
 +intended to be used by hardware managers in the kernel, while the copy interface
 +make sense for developers (since it avoids problems with namespaces).
 diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig
-index d91618641be69..f6643624c8e32 100644
+index d91618641be6..f6643624c8e3 100644
 --- a/drivers/of/Kconfig
 +++ b/drivers/of/Kconfig
 @@ -107,4 +107,11 @@ config OF_DMA_DEFAULT_COHERENT
@@ -292671,7 +292671,7 @@ index d91618641be69..f6643624c8e32 100644
 +
  endif # OF
 diff --git a/drivers/of/Makefile b/drivers/of/Makefile
-index 663a4af0cccd5..b00a95adf5199 100644
+index 663a4af0cccd..b00a95adf519 100644
 --- a/drivers/of/Makefile
 +++ b/drivers/of/Makefile
 @@ -1,6 +1,7 @@
@@ -292684,7 +292684,7 @@ index 663a4af0cccd5..b00a95adf5199 100644
  obj-$(CONFIG_OF_EARLY_FLATTREE) += fdt_address.o
 diff --git a/drivers/of/configfs.c b/drivers/of/configfs.c
 new file mode 100644
-index 0000000000000..178f0629b0f01
+index 000000000000..178f0629b0f0
 --- /dev/null
 +++ b/drivers/of/configfs.c
 @@ -0,0 +1,310 @@
@@ -293051,7 +293051,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  3 files changed, 20 insertions(+), 7 deletions(-)
 
 diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
-index cd813c69a1781..b80dde1050ff9 100644
+index cd813c69a178..b80dde1050ff 100644
 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
 @@ -2769,6 +2769,8 @@ brcmf_cfg80211_set_power_mgmt(struct wiphy *wiphy, struct net_device *ndev,
@@ -293103,7 +293103,7 @@ index cd813c69a1781..b80dde1050ff9 100644
  	ccreq->country_abbrev[1] = alpha2[1];
  	ccreq->country_abbrev[2] = 0;
 diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
-index dec25e4156199..5c2a03d629e48 100644
+index dec25e415619..5c2a03d629e4 100644
 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
 @@ -59,7 +59,7 @@ static int brcmf_fcmode;
@@ -293116,7 +293116,7 @@ index dec25e4156199..5c2a03d629e48 100644
  MODULE_PARM_DESC(roamoff, "Do not use internal roaming engine");
  
 diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
-index ef5521b9b3577..0c9f5b5791e93 100644
+index ef5521b9b357..0c9f5b5791e9 100644
 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
 @@ -604,6 +604,7 @@ BRCMF_FW_DEF(4329, "brcmfmac4329-sdio");
@@ -293152,7 +293152,7 @@ other with conf_req and conf_rsp messages, in a demented game of tag.
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/bluetooth/hci_h5.c b/drivers/bluetooth/hci_h5.c
-index bf3e23104194a..4abd08fccf3a2 100644
+index bf3e23104194..4abd08fccf3a 100644
 --- a/drivers/bluetooth/hci_h5.c
 +++ b/drivers/bluetooth/hci_h5.c
 @@ -342,7 +342,8 @@ static void h5_handle_internal_rx(struct hci_uart *hu)
@@ -293189,7 +293189,7 @@ Subject: [PATCH 0087/1225] config: Add default configs
 
 diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig
 new file mode 100644
-index 0000000000000..fbaccfbd0ed3a
+index 000000000000..fbaccfbd0ed3
 --- /dev/null
 +++ b/arch/arm/configs/bcm2709_defconfig
 @@ -0,0 +1,1444 @@
@@ -294639,7 +294639,7 @@ index 0000000000000..fbaccfbd0ed3a
 +CONFIG_KDB_KEYBOARD=y
 diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig
 new file mode 100644
-index 0000000000000..ec25f919fe4b9
+index 000000000000..ec25f919fe4b
 --- /dev/null
 +++ b/arch/arm/configs/bcm2711_defconfig
 @@ -0,0 +1,1439 @@
@@ -296084,7 +296084,7 @@ index 0000000000000..ec25f919fe4b9
 +CONFIG_KDB_KEYBOARD=y
 diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig
 new file mode 100644
-index 0000000000000..b4f93d8fd86f3
+index 000000000000..b4f93d8fd86f
 --- /dev/null
 +++ b/arch/arm/configs/bcmrpi_defconfig
 @@ -0,0 +1,1454 @@
@@ -297544,7 +297544,7 @@ index 0000000000000..b4f93d8fd86f3
 +CONFIG_KDB_KEYBOARD=y
 diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig
 new file mode 100644
-index 0000000000000..4719d38c4b4e5
+index 000000000000..4719d38c4b4e
 --- /dev/null
 +++ b/arch/arm64/configs/bcm2711_defconfig
 @@ -0,0 +1,1465 @@
@@ -299015,7 +299015,7 @@ index 0000000000000..4719d38c4b4e5
 +CONFIG_KDB_KEYBOARD=y
 diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig
 new file mode 100644
-index 0000000000000..ca7668f549bcd
+index 000000000000..ca7668f549bc
 --- /dev/null
 +++ b/arch/arm64/configs/bcmrpi3_defconfig
 @@ -0,0 +1,1243 @@
@@ -300282,7 +300282,7 @@ Signed-off-by: Michael Zoran <mzoran@crowfest.net>
  2 files changed, 35 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/irqchip/irq-bcm2835.c b/drivers/irqchip/irq-bcm2835.c
-index ff7b998579c1e..93878d725f260 100644
+index ff7b998579c1..93878d725f26 100644
 --- a/drivers/irqchip/irq-bcm2835.c
 +++ b/drivers/irqchip/irq-bcm2835.c
 @@ -153,10 +153,23 @@ static void armctrl_unmask_irq(struct irq_data *d)
@@ -300311,7 +300311,7 @@ index ff7b998579c1e..93878d725f260 100644
  
  static int armctrl_xlate(struct irq_domain *d, struct device_node *ctrlr,
 diff --git a/drivers/irqchip/irq-bcm2836.c b/drivers/irqchip/irq-bcm2836.c
-index 49642bcd0b75c..d8ef8f7fee5bb 100644
+index 49642bcd0b75..d8ef8f7fee5b 100644
 --- a/drivers/irqchip/irq-bcm2836.c
 +++ b/drivers/irqchip/irq-bcm2836.c
 @@ -86,6 +86,27 @@ static void bcm2836_arm_irqchip_unmask_gpu_irq(struct irq_data *d)
@@ -300357,7 +300357,7 @@ Subject: [PATCH 0089/1225] ARM64: Force hardware emulation of deprecated
  1 file changed, 5 insertions(+)
 
 diff --git a/arch/arm64/kernel/armv8_deprecated.c b/arch/arm64/kernel/armv8_deprecated.c
-index bcb14d11232f9..bfa3a069cbf1e 100644
+index bcb14d11232f..bfa3a069cbf1 100644
 --- a/arch/arm64/kernel/armv8_deprecated.c
 +++ b/arch/arm64/kernel/armv8_deprecated.c
 @@ -182,10 +182,15 @@ static void __init register_insn_emulation(struct insn_emulation_ops *ops)
@@ -300394,10 +300394,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 file changed, 14 insertions(+)
 
 diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile
-index cd8f3cdabfd07..8e9bc1497a59a 100644
+index d227cf87c48f..3447d81ddb27 100644
 --- a/arch/arm64/Makefile
 +++ b/arch/arm64/Makefile
-@@ -143,6 +143,20 @@ Image.%: Image
+@@ -147,6 +147,20 @@ Image.%: Image
  zinstall install:
  	$(Q)$(MAKE) $(build)=$(boot) $@
  
@@ -300436,10 +300436,10 @@ This reverts commit dce5b0fbdd2174f7fc9b27f4e89877a33169239a.
  1 file changed, 14 deletions(-)
 
 diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile
-index 8e9bc1497a59a..cd8f3cdabfd07 100644
+index 3447d81ddb27..d227cf87c48f 100644
 --- a/arch/arm64/Makefile
 +++ b/arch/arm64/Makefile
-@@ -143,20 +143,6 @@ Image.%: Image
+@@ -147,20 +147,6 @@ Image.%: Image
  zinstall install:
  	$(Q)$(MAKE) $(build)=$(boot) $@
  
@@ -300476,7 +300476,7 @@ hack: cache: Fix linker error
  2 files changed, 6 insertions(+), 4 deletions(-)
 
 diff --git a/arch/arm/mm/cache-v6.S b/arch/arm/mm/cache-v6.S
-index f0f65eb073e48..8680118015219 100644
+index f0f65eb073e4..868011801521 100644
 --- a/arch/arm/mm/cache-v6.S
 +++ b/arch/arm/mm/cache-v6.S
 @@ -198,7 +198,7 @@ ENTRY(v6_flush_kern_dcache_area)
@@ -300498,7 +300498,7 @@ index f0f65eb073e48..8680118015219 100644
  1:
  #ifdef CONFIG_DMA_CACHE_RWFO
 diff --git a/arch/arm/mm/cache-v7.S b/arch/arm/mm/cache-v7.S
-index 0ee8fc4b4672c..8acb1857ff679 100644
+index 0ee8fc4b4672..8acb1857ff67 100644
 --- a/arch/arm/mm/cache-v7.S
 +++ b/arch/arm/mm/cache-v7.S
 @@ -363,7 +363,8 @@ ENDPROC(v7_flush_kern_dcache_area)
@@ -300553,7 +300553,7 @@ Signed-off-by: Matteo Croce <mcroce@redhat.com>
  create mode 100644 drivers/perf/raspberrypi_axi_monitor.c
 
 diff --git a/drivers/perf/Kconfig b/drivers/perf/Kconfig
-index 09ae8a970880f..6b49f81903cda 100644
+index 09ae8a970880..6b49f81903cd 100644
 --- a/drivers/perf/Kconfig
 +++ b/drivers/perf/Kconfig
 @@ -129,4 +129,11 @@ config ARM_SPE_PMU
@@ -300569,7 +300569,7 @@ index 09ae8a970880f..6b49f81903cda 100644
 +          you want to build it as a module.
  endmenu
 diff --git a/drivers/perf/Makefile b/drivers/perf/Makefile
-index 2ebb4de178151..23e4cd6813860 100644
+index 2ebb4de17815..23e4cd681386 100644
 --- a/drivers/perf/Makefile
 +++ b/drivers/perf/Makefile
 @@ -12,3 +12,4 @@ obj-$(CONFIG_QCOM_L3_PMU) += qcom_l3_pmu.o
@@ -300579,7 +300579,7 @@ index 2ebb4de178151..23e4cd6813860 100644
 +obj-$(CONFIG_RPI_AXIPERF) += raspberrypi_axi_monitor.o
 diff --git a/drivers/perf/raspberrypi_axi_monitor.c b/drivers/perf/raspberrypi_axi_monitor.c
 new file mode 100644
-index 0000000000000..5ae2bdaa88b41
+index 000000000000..5ae2bdaa88b4
 --- /dev/null
 +++ b/drivers/perf/raspberrypi_axi_monitor.c
 @@ -0,0 +1,637 @@
@@ -301238,36 +301238,48 @@ See: https://github.com/raspberrypi/linux/issues/1950
 
 Signed-off-by: Phil Elwell <phil@raspberrypi.org>
 ---
- kernel/cgroup/cgroup.c | 30 ++++++++++++++++++++++++++++++
- 1 file changed, 30 insertions(+)
+ kernel/cgroup/cgroup.c | 38 ++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 38 insertions(+)
 
 diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c
-index 37db8eba149ac..2831a56cbe09f 100644
+index ede370ec245d..f3b97f1ce428 100644
 --- a/kernel/cgroup/cgroup.c
 +++ b/kernel/cgroup/cgroup.c
-@@ -5722,6 +5722,8 @@ int __init cgroup_init_early(void)
+@@ -5721,6 +5721,9 @@ int __init cgroup_init_early(void)
+ 	return 0;
  }
  
- static u16 cgroup_disable_mask __initdata;
 +static u16 cgroup_enable_mask __initdata;
 +static int __init cgroup_disable(char *str);
- 
++
  /**
   * cgroup_init - cgroup initialization
-@@ -5761,6 +5763,12 @@ int __init cgroup_init(void)
+  *
+@@ -5759,6 +5762,12 @@ int __init cgroup_init(void)
  
  	mutex_unlock(&cgroup_mutex);
  
-+	/* Apply an implicit disable... */
++	/*
++	 * Apply an implicit disable, knowing that an explicit enable will
++	 * prevent if from doing anything.
++	 */
 +	cgroup_disable("memory");
 +
-+	/* ...knowing that an explicit enable will override it. */
-+	cgroup_disable_mask &= ~cgroup_enable_mask;
-+
  	for_each_subsys(ss, ssid) {
  		if (ss->early_init) {
  			struct cgroup_subsys_state *css =
-@@ -6180,6 +6188,28 @@ static int __init cgroup_disable(char *str)
+@@ -6168,6 +6177,10 @@ static int __init cgroup_disable(char *str)
+ 			    strcmp(token, ss->legacy_name))
+ 				continue;
+ 
++			/* An explicit cgroup_enable overrides a disable */
++			if (cgroup_enable_mask & (1 << i))
++				continue;
++
+ 			static_branch_disable(cgroup_subsys_enabled_key[i]);
+ 			pr_info("Disabling %s control group subsystem\n",
+ 				ss->name);
+@@ -6177,6 +6190,31 @@ static int __init cgroup_disable(char *str)
  }
  __setup("cgroup_disable=", cgroup_disable);
  
@@ -301287,6 +301299,9 @@ index 37db8eba149ac..2831a56cbe09f 100644
 +				continue;
 +
 +			cgroup_enable_mask |= 1 << i;
++			static_branch_enable(cgroup_subsys_enabled_key[i]);
++			pr_info("Enabling %s control group subsystem\n",
++				ss->name);
 +		}
 +	}
 +	return 1;
@@ -301328,7 +301343,7 @@ Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
  1 file changed, 14 insertions(+)
 
 diff --git a/arch/arm/mach-bcm/board_bcm2835.c b/arch/arm/mach-bcm/board_bcm2835.c
-index bfc556f767203..73ec2427fbcfb 100644
+index bfc556f76720..73ec2427fbcf 100644
 --- a/arch/arm/mach-bcm/board_bcm2835.c
 +++ b/arch/arm/mach-bcm/board_bcm2835.c
 @@ -6,12 +6,25 @@
@@ -301387,7 +301402,7 @@ Signed-off-by: Floris Bos <bos@je-eigen-domein.nl>
  1 file changed, 69 insertions(+)
 
 diff --git a/arch/arm/mach-bcm/board_bcm2835.c b/arch/arm/mach-bcm/board_bcm2835.c
-index 73ec2427fbcfb..9b6c921106b56 100644
+index 73ec2427fbcf..9b6c921106b5 100644
 --- a/arch/arm/mach-bcm/board_bcm2835.c
 +++ b/arch/arm/mach-bcm/board_bcm2835.c
 @@ -6,6 +6,7 @@
@@ -301508,7 +301523,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  1 file changed, 4 insertions(+)
 
 diff --git a/arch/arm/kernel/fiq.c b/arch/arm/kernel/fiq.c
-index cd1234c103fcd..a0f96e3b88981 100644
+index cd1234c103fc..a0f96e3b8898 100644
 --- a/arch/arm/kernel/fiq.c
 +++ b/arch/arm/kernel/fiq.c
 @@ -56,6 +56,8 @@
@@ -301544,7 +301559,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/tty/serial/8250/8250_bcm2835aux.c b/drivers/tty/serial/8250/8250_bcm2835aux.c
-index 4997c519ebb3a..33da68341c3a7 100644
+index 4997c519ebb3..33da68341c3a 100644
 --- a/drivers/tty/serial/8250/8250_bcm2835aux.c
 +++ b/drivers/tty/serial/8250/8250_bcm2835aux.c
 @@ -50,7 +50,8 @@ static int bcm2835aux_serial_probe(struct platform_device *pdev)
@@ -301575,7 +301590,7 @@ Signed-off-by: Eric Anholt <eric@anholt.net>
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/firmware/raspberrypi.c b/drivers/firmware/raspberrypi.c
-index 7162f6d6649c6..7947e65a22da9 100644
+index 7162f6d6649c..7947e65a22da 100644
 --- a/drivers/firmware/raspberrypi.c
 +++ b/drivers/firmware/raspberrypi.c
 @@ -43,7 +43,7 @@ static void response_callback(struct mbox_client *cl, void *msg)
@@ -301616,7 +301631,7 @@ Signed-off-by: Eric Anholt <eric@anholt.net>
  create mode 100644 drivers/gpu/drm/vc4/vc4_firmware_kms.c
 
 diff --git a/drivers/gpu/drm/vc4/Makefile b/drivers/gpu/drm/vc4/Makefile
-index b303703bc7f37..e90c6304775ab 100644
+index b303703bc7f3..e90c6304775a 100644
 --- a/drivers/gpu/drm/vc4/Makefile
 +++ b/drivers/gpu/drm/vc4/Makefile
 @@ -9,6 +9,7 @@ vc4-y := \
@@ -301628,7 +301643,7 @@ index b303703bc7f37..e90c6304775ab 100644
  	vc4_gem.o \
  	vc4_hdmi.o \
 diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c
-index f1f0a7c877713..9e51a4e937dfc 100644
+index f1f0a7c87771..9e51a4e937df 100644
 --- a/drivers/gpu/drm/vc4/vc4_crtc.c
 +++ b/drivers/gpu/drm/vc4/vc4_crtc.c
 @@ -97,6 +97,9 @@ bool vc4_crtc_get_scanoutpos(struct drm_device *dev, unsigned int crtc_id,
@@ -301674,7 +301689,7 @@ index f1f0a7c877713..9e51a4e937dfc 100644
  }
  
 diff --git a/drivers/gpu/drm/vc4/vc4_drv.c b/drivers/gpu/drm/vc4/vc4_drv.c
-index 0d78ba017a29b..af8df6d328b9b 100644
+index 0d78ba017a29..af8df6d328b9 100644
 --- a/drivers/gpu/drm/vc4/vc4_drv.c
 +++ b/drivers/gpu/drm/vc4/vc4_drv.c
 @@ -346,6 +346,7 @@ static struct platform_driver *const component_drivers[] = {
@@ -301686,7 +301701,7 @@ index 0d78ba017a29b..af8df6d328b9b 100644
  };
  
 diff --git a/drivers/gpu/drm/vc4/vc4_drv.h b/drivers/gpu/drm/vc4/vc4_drv.h
-index 6627b20c99e9c..fbcdb44ccf010 100644
+index 6627b20c99e9..fbcdb44ccf01 100644
 --- a/drivers/gpu/drm/vc4/vc4_drv.h
 +++ b/drivers/gpu/drm/vc4/vc4_drv.h
 @@ -71,6 +71,9 @@ struct vc4_perfmon {
@@ -301712,7 +301727,7 @@ index 6627b20c99e9c..fbcdb44ccf010 100644
  void vc4_gem_destroy(struct drm_device *dev);
 diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 new file mode 100644
-index 0000000000000..78c3430593550
+index 000000000000..78c343059355
 --- /dev/null
 +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 @@ -0,0 +1,656 @@
@@ -302391,7 +302406,7 @@ Signed-off-by: Eric Anholt <eric@anholt.net>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
-index 78c3430593550..d9a5551d01a21 100644
+index 78c343059355..d9a5551d01a2 100644
 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 @@ -265,7 +265,7 @@ static struct drm_plane *vc4_fkms_plane_init(struct drm_device *dev,
@@ -302422,7 +302437,7 @@ Signed-off-by: Eric Anholt <eric@anholt.net>
  1 file changed, 26 insertions(+)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
-index d9a5551d01a21..e372666af0119 100644
+index d9a5551d01a2..e372666af011 100644
 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 @@ -101,6 +101,11 @@ static int vc4_plane_set_primary_blank(struct drm_plane *plane, bool blank)
@@ -302502,7 +302517,7 @@ Signed-off-by: Eric Anholt <eric@anholt.net>
  1 file changed, 15 insertions(+)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
-index e372666af0119..4d7b7f218cbbc 100644
+index e372666af011..4d7b7f218cbb 100644
 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 @@ -336,6 +336,21 @@ static int vc4_crtc_atomic_check(struct drm_crtc *crtc,
@@ -302548,7 +302563,7 @@ Signed-off-by: Eric Anholt <eric@anholt.net>
  1 file changed, 37 insertions(+), 3 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
-index 4d7b7f218cbbc..809437cf32158 100644
+index 4d7b7f218cbb..809437cf3215 100644
 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 @@ -36,6 +36,8 @@ struct vc4_crtc {
@@ -302653,7 +302668,7 @@ Signed-off-by: Eric Anholt <eric@anholt.net>
  1 file changed, 5 insertions(+)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
-index 809437cf32158..d5066f395b621 100644
+index 809437cf3215..d5066f395b62 100644
 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 @@ -17,6 +17,7 @@
@@ -302694,7 +302709,7 @@ Signed-off-by: Eric Anholt <eric@anholt.net>
  2 files changed, 15 insertions(+), 14 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c
-index 9e51a4e937dfc..7b22d4f2ae573 100644
+index 9e51a4e937df..7b22d4f2ae57 100644
 --- a/drivers/gpu/drm/vc4/vc4_crtc.c
 +++ b/drivers/gpu/drm/vc4/vc4_crtc.c
 @@ -767,15 +767,8 @@ static void vc4_crtc_atomic_flush(struct drm_crtc *crtc,
@@ -302730,7 +302745,7 @@ index 9e51a4e937dfc..7b22d4f2ae573 100644
  }
  
 diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
-index d5066f395b621..e3dfc20c404ca 100644
+index d5066f395b62..e3dfc20c404c 100644
 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 @@ -433,6 +433,19 @@ static int vc4_page_flip(struct drm_crtc *crtc,
@@ -302777,7 +302792,7 @@ Subject: [PATCH 0107/1225] vc4_fkms: Apply firmware overscan offset to
  1 file changed, 17 insertions(+)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
-index e3dfc20c404ca..7edb38953a6a2 100644
+index e3dfc20c404c..7edb38953a6a 100644
 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 @@ -42,6 +42,7 @@ struct vc4_crtc {
@@ -302847,7 +302862,7 @@ Signed-off-by: Eric Anholt <eric@anholt.net>
  1 file changed, 6 insertions(+), 4 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
-index 7edb38953a6a2..967a0bf5886b7 100644
+index 7edb38953a6a..967a0bf5886b 100644
 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 @@ -43,6 +43,7 @@ struct vc4_crtc {
@@ -302897,7 +302912,7 @@ Signed-off-by: Eric Anholt <eric@anholt.net>
  1 file changed, 20 insertions(+), 10 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
-index 967a0bf5886b7..462d9084ce53d 100644
+index 967a0bf5886b..462d9084ce53 100644
 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 @@ -204,10 +204,6 @@ static void vc4_cursor_plane_atomic_update(struct drm_plane *plane,
@@ -302962,7 +302977,7 @@ Signed-off-by: Eric Anholt <eric@anholt.net>
  1 file changed, 7 insertions(+), 17 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
-index 462d9084ce53d..60e9d8fa55113 100644
+index 462d9084ce53..60e9d8fa5511 100644
 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 @@ -37,8 +37,6 @@ struct vc4_crtc {
@@ -303035,7 +303050,7 @@ Subject: [PATCH 0111/1225] vc4_firmware_kms: fix build
  1 file changed, 6 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
-index 60e9d8fa55113..1584f90face03 100644
+index 60e9d8fa5511..1584f90face0 100644
 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 @@ -18,6 +18,7 @@
@@ -303106,7 +303121,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  1 file changed, 1 insertion(+), 3 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
-index 1584f90face03..347ad72682dc2 100644
+index 1584f90face0..347ad72682dc 100644
 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 @@ -194,8 +194,8 @@ static void vc4_cursor_plane_atomic_update(struct drm_plane *plane,
@@ -303149,7 +303164,7 @@ Signed-off-by: Eric Anholt <eric@anholt.net>
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_kms.c b/drivers/gpu/drm/vc4/vc4_kms.c
-index 78d4fb0499e39..75d3e8c6b6507 100644
+index 78d4fb0499e3..75d3e8c6b650 100644
 --- a/drivers/gpu/drm/vc4/vc4_kms.c
 +++ b/drivers/gpu/drm/vc4/vc4_kms.c
 @@ -240,7 +240,8 @@ static int vc4_atomic_commit(struct drm_device *dev,
@@ -303189,7 +303204,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/i2c/busses/i2c-gpio.c b/drivers/i2c/busses/i2c-gpio.c
-index a4a6825c87583..cfbcf3952ddc9 100644
+index a4a6825c8758..cfbcf3952ddc 100644
 --- a/drivers/i2c/busses/i2c-gpio.c
 +++ b/drivers/i2c/busses/i2c-gpio.c
 @@ -445,7 +445,9 @@ static int i2c_gpio_probe(struct platform_device *pdev)
@@ -303218,7 +303233,7 @@ Subject: [PATCH 0115/1225] added capture_clear option to pps-gpio via
  1 file changed, 2 insertions(+)
 
 diff --git a/drivers/pps/clients/pps-gpio.c b/drivers/pps/clients/pps-gpio.c
-index e0de1df2ede07..ee7d8f4e7f2e2 100644
+index e0de1df2ede0..ee7d8f4e7f2e 100644
 --- a/drivers/pps/clients/pps-gpio.c
 +++ b/drivers/pps/clients/pps-gpio.c
 @@ -145,6 +145,8 @@ static int pps_gpio_setup(struct platform_device *pdev)
@@ -303250,7 +303265,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  1 file changed, 16 insertions(+)
 
 diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c
-index ba42568316f1b..e266ca2191ed3 100644
+index ba42568316f1..e266ca2191ed 100644
 --- a/drivers/net/usb/lan78xx.c
 +++ b/drivers/net/usb/lan78xx.c
 @@ -2643,6 +2643,22 @@ static int lan78xx_open(struct net_device *net)
@@ -303291,7 +303306,7 @@ Reduces overhead when using X
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c
-index 17a638f150824..ce8ef69307951 100644
+index 1cfbbaf6901d..c5251b01f619 100644
 --- a/drivers/hid/usbhid/hid-core.c
 +++ b/drivers/hid/usbhid/hid-core.c
 @@ -45,7 +45,7 @@
@@ -303334,7 +303349,7 @@ Signed-off-by: Nick Bulleid <nedbulleid@fastmail.com>
  2 files changed, 10 insertions(+)
 
 diff --git a/Documentation/devicetree/bindings/power/reset/gpio-poweroff.txt b/Documentation/devicetree/bindings/power/reset/gpio-poweroff.txt
-index 3e56c1b34a4c9..76dd7b06e26a1 100644
+index 3e56c1b34a4c..76dd7b06e26a 100644
 --- a/Documentation/devicetree/bindings/power/reset/gpio-poweroff.txt
 +++ b/Documentation/devicetree/bindings/power/reset/gpio-poweroff.txt
 @@ -31,6 +31,7 @@ Optional properties:
@@ -303346,7 +303361,7 @@ index 3e56c1b34a4c9..76dd7b06e26a1 100644
  Examples:
  
 diff --git a/drivers/power/reset/gpio-poweroff.c b/drivers/power/reset/gpio-poweroff.c
-index beb1df358c8da..608d78f0514a0 100644
+index beb1df358c8d..608d78f0514a 100644
 --- a/drivers/power/reset/gpio-poweroff.c
 +++ b/drivers/power/reset/gpio-poweroff.c
 @@ -51,6 +51,7 @@ static int gpio_poweroff_probe(struct platform_device *pdev)
@@ -303397,7 +303412,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  1 file changed, 39 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/firmware/raspberrypi.c b/drivers/firmware/raspberrypi.c
-index 7947e65a22da9..9ad10f7e019b8 100644
+index 7947e65a22da..9ad10f7e019b 100644
 --- a/drivers/firmware/raspberrypi.c
 +++ b/drivers/firmware/raspberrypi.c
 @@ -12,6 +12,7 @@
@@ -303502,7 +303517,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/drivers/irqchip/irq-bcm2835.c b/drivers/irqchip/irq-bcm2835.c
-index 93878d725f260..40c1b38d5db5c 100644
+index 93878d725f26..40c1b38d5db5 100644
 --- a/drivers/irqchip/irq-bcm2835.c
 +++ b/drivers/irqchip/irq-bcm2835.c
 @@ -73,8 +73,6 @@
@@ -303562,7 +303577,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  1 file changed, 7 insertions(+), 40 deletions(-)
 
 diff --git a/drivers/of/configfs.c b/drivers/of/configfs.c
-index 178f0629b0f01..ac04301dabe13 100644
+index 178f0629b0f0..ac04301dabe1 100644
 --- a/drivers/of/configfs.c
 +++ b/drivers/of/configfs.c
 @@ -40,41 +40,6 @@ struct cfs_overlay_item {
@@ -303688,7 +303703,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  1 file changed, 17 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c
-index e266ca2191ed3..3b904c55a21aa 100644
+index e266ca2191ed..3b904c55a21a 100644
 --- a/drivers/net/usb/lan78xx.c
 +++ b/drivers/net/usb/lan78xx.c
 @@ -425,6 +425,15 @@ static int msg_level = -1;
@@ -303747,7 +303762,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
-index 5c2a03d629e48..dec25e4156199 100644
+index 5c2a03d629e4..dec25e415619 100644
 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
 @@ -59,7 +59,7 @@ static int brcmf_fcmode;
@@ -303780,7 +303795,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  1 file changed, 16 insertions(+), 16 deletions(-)
 
 diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c
-index 3b904c55a21aa..3bf87542c2ec9 100644
+index 3b904c55a21a..3bf87542c2ec 100644
 --- a/drivers/net/usb/lan78xx.c
 +++ b/drivers/net/usb/lan78xx.c
 @@ -2175,6 +2175,22 @@ static int lan78xx_phy_init(struct lan78xx_net *dev)
@@ -303867,7 +303882,7 @@ Signed-off-by: Serge Schneider <serge@raspberrypi.org>
 
 diff --git a/Documentation/devicetree/bindings/hwmon/rpi-poe-fan.txt b/Documentation/devicetree/bindings/hwmon/rpi-poe-fan.txt
 new file mode 100644
-index 0000000000000..c71f8569a4dc9
+index 000000000000..c71f8569a4dc
 --- /dev/null
 +++ b/Documentation/devicetree/bindings/hwmon/rpi-poe-fan.txt
 @@ -0,0 +1,55 @@
@@ -303928,7 +303943,7 @@ index 0000000000000..c71f8569a4dc9
 +	};
 diff --git a/Documentation/hwmon/rpi-poe-fan b/Documentation/hwmon/rpi-poe-fan
 new file mode 100644
-index 0000000000000..9182ab6339933
+index 000000000000..9182ab633993
 --- /dev/null
 +++ b/Documentation/hwmon/rpi-poe-fan
 @@ -0,0 +1,15 @@
@@ -303948,7 +303963,7 @@ index 0000000000000..9182ab6339933
 +the commands to the board over I2C on the ID_EEPROM pins. The driver exposes
 +the fan to the user space through the hwmon sysfs interface.
 diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
-index 13a6b4afb4b36..753e58923a855 100644
+index 13a6b4afb4b3..753e58923a85 100644
 --- a/drivers/hwmon/Kconfig
 +++ b/drivers/hwmon/Kconfig
 @@ -1346,6 +1346,17 @@ config SENSORS_RASPBERRYPI_HWMON
@@ -303970,7 +303985,7 @@ index 13a6b4afb4b36..753e58923a855 100644
  	tristate "Sensiron humidity and temperature sensors. SHT15 and compat."
  	depends on GPIOLIB || COMPILE_TEST
 diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile
-index 40c036ea45e6b..4607ea5e1d5d3 100644
+index 40c036ea45e6..4607ea5e1d5d 100644
 --- a/drivers/hwmon/Makefile
 +++ b/drivers/hwmon/Makefile
 @@ -144,6 +144,7 @@ obj-$(CONFIG_SENSORS_PCF8591)	+= pcf8591.o
@@ -303983,7 +303998,7 @@ index 40c036ea45e6b..4607ea5e1d5d3 100644
  obj-$(CONFIG_SENSORS_SCH5627)	+= sch5627.o
 diff --git a/drivers/hwmon/rpi-poe-fan.c b/drivers/hwmon/rpi-poe-fan.c
 new file mode 100644
-index 0000000000000..3effaf2eb86db
+index 000000000000..3effaf2eb86d
 --- /dev/null
 +++ b/drivers/hwmon/rpi-poe-fan.c
 @@ -0,0 +1,436 @@
@@ -304438,7 +304453,7 @@ Subject: [PATCH 0126/1225] cxd2880: CXD2880_SPI_DRV should select DVB_CXD2880
  1 file changed, 1 insertion(+)
 
 diff --git a/drivers/media/spi/Kconfig b/drivers/media/spi/Kconfig
-index bcc49cb47de63..2068f4b9fc376 100644
+index bcc49cb47de6..2068f4b9fc37 100644
 --- a/drivers/media/spi/Kconfig
 +++ b/drivers/media/spi/Kconfig
 @@ -23,6 +23,7 @@ menu "Media SPI Adapters"
@@ -304475,7 +304490,7 @@ Signed-off-by: Oliver Gjoneski <ogjoneski@gmail.com>
  1 file changed, 33 insertions(+), 5 deletions(-)
 
 diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
-index 8dc730cfe7a63..dc13c7df8c1c0 100644
+index 8dc730cfe7a6..dc13c7df8c1c 100644
 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
 +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
 @@ -7,6 +7,7 @@
@@ -304602,7 +304617,7 @@ Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
  1 file changed, 37 insertions(+), 4 deletions(-)
 
 diff --git a/drivers/hwmon/raspberrypi-hwmon.c b/drivers/hwmon/raspberrypi-hwmon.c
-index d3a64a35f7a9a..db3b03438dd05 100644
+index d3a64a35f7a9..db3b03438dd0 100644
 --- a/drivers/hwmon/raspberrypi-hwmon.c
 +++ b/drivers/hwmon/raspberrypi-hwmon.c
 @@ -15,6 +15,36 @@
@@ -304681,7 +304696,7 @@ Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
  1 file changed, 33 insertions(+)
 
 diff --git a/drivers/firmware/raspberrypi.c b/drivers/firmware/raspberrypi.c
-index 9ad10f7e019b8..e834e300bb6f6 100644
+index 9ad10f7e019b..e834e300bb6f 100644
 --- a/drivers/firmware/raspberrypi.c
 +++ b/drivers/firmware/raspberrypi.c
 @@ -28,6 +28,7 @@ struct rpi_firmware {
@@ -304762,7 +304777,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  1 file changed, 2 insertions(+)
 
 diff --git a/drivers/tty/serial/sc16is7xx.c b/drivers/tty/serial/sc16is7xx.c
-index 7d3ae31cc7204..fe486498530da 100644
+index 7d3ae31cc720..fe486498530d 100644
 --- a/drivers/tty/serial/sc16is7xx.c
 +++ b/drivers/tty/serial/sc16is7xx.c
 @@ -696,6 +696,8 @@ static bool sc16is7xx_port_irq(struct sc16is7xx_port *s, int portno)
@@ -304802,7 +304817,7 @@ Signed-off-by: Lina Iyer <ilina@codeaurora.org>
  1 file changed, 23 insertions(+), 10 deletions(-)
 
 diff --git a/drivers/thermal/step_wise.c b/drivers/thermal/step_wise.c
-index 6e051cbd824ff..7d30b8d928ab2 100644
+index 6e051cbd824f..7d30b8d928ab 100644
 --- a/drivers/thermal/step_wise.c
 +++ b/drivers/thermal/step_wise.c
 @@ -24,7 +24,7 @@
@@ -304890,7 +304905,7 @@ Signed-off-by: Serge Schneider <serge@raspberrypi.org>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/thermal/step_wise.c b/drivers/thermal/step_wise.c
-index 7d30b8d928ab2..c481ed33810cd 100644
+index 7d30b8d928ab..c481ed33810c 100644
 --- a/drivers/thermal/step_wise.c
 +++ b/drivers/thermal/step_wise.c
 @@ -155,7 +155,7 @@ static void thermal_zone_trip_update(struct thermal_zone_device *tz, int trip)
@@ -304918,7 +304933,7 @@ Subject: [PATCH 0133/1225] Update issue templates (#2736)
 
 diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
 new file mode 100644
-index 0000000000000..09bdc4a968383
+index 000000000000..09bdc4a96838
 --- /dev/null
 +++ b/.github/ISSUE_TEMPLATE/bug_report.md
 @@ -0,0 +1,34 @@
@@ -304978,7 +304993,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  1 file changed, 6 insertions(+), 4 deletions(-)
 
 diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
-index abdf448b11a3d..1e6bc8ecb5dc6 100644
+index abdf448b11a3..1e6bc8ecb5dc 100644
 --- a/drivers/gpio/gpiolib.c
 +++ b/drivers/gpio/gpiolib.c
 @@ -55,6 +55,8 @@
@@ -305036,7 +305051,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  3 files changed, 38 insertions(+)
 
 diff --git a/Documentation/devicetree/bindings/net/microchip,lan78xx.txt b/Documentation/devicetree/bindings/net/microchip,lan78xx.txt
-index 11a679530ae65..104768b85bbc5 100644
+index 11a679530ae6..104768b85bbc 100644
 --- a/Documentation/devicetree/bindings/net/microchip,lan78xx.txt
 +++ b/Documentation/devicetree/bindings/net/microchip,lan78xx.txt
 @@ -14,6 +14,9 @@ Optional properties of the embedded PHY:
@@ -305050,7 +305065,7 @@ index 11a679530ae65..104768b85bbc5 100644
  Example:
  
 diff --git a/drivers/net/phy/microchip.c b/drivers/net/phy/microchip.c
-index a644e8e5071c3..15e0a7383f688 100644
+index a644e8e5071c..15e0a7383f68 100644
 --- a/drivers/net/phy/microchip.c
 +++ b/drivers/net/phy/microchip.c
 @@ -217,6 +217,7 @@ static int lan88xx_probe(struct phy_device *phydev)
@@ -305095,7 +305110,7 @@ index a644e8e5071c3..15e0a7383f688 100644
  	priv->chip_id = phy_read_mmd(phydev, 3, LAN88XX_MMD3_CHIP_ID);
  	priv->chip_rev = phy_read_mmd(phydev, 3, LAN88XX_MMD3_CHIP_REV);
 diff --git a/include/linux/microchipphy.h b/include/linux/microchipphy.h
-index 517288da19fd3..626c450d71f45 100644
+index 517288da19fd..626c450d71f4 100644
 --- a/include/linux/microchipphy.h
 +++ b/include/linux/microchipphy.h
 @@ -61,6 +61,14 @@
@@ -305138,7 +305153,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  2 files changed, 28 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
-index d4d1e44b16b2c..e5f651f78441a 100644
+index d4d1e44b16b2..e5f651f78441 100644
 --- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
 +++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
 @@ -364,7 +364,12 @@ static void buffer_cb(struct vchiq_mmal_instance *instance,
@@ -305199,7 +305214,7 @@ index d4d1e44b16b2c..e5f651f78441a 100644
  	/* enable the camera port */
  	dev->capture.port->cb_ctx = dev;
 diff --git a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.h b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.h
-index b5fce38de038c..dcb1b8e1f4e00 100644
+index b5fce38de038..dcb1b8e1f4e0 100644
 --- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.h
 +++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.h
 @@ -93,6 +93,8 @@ struct bm2835_mmal_dev {
@@ -305243,7 +305258,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  2 files changed, 44 insertions(+), 7 deletions(-)
 
 diff --git a/drivers/firmware/raspberrypi.c b/drivers/firmware/raspberrypi.c
-index e834e300bb6f6..6ab3bec57532e 100644
+index e834e300bb6f..6ab3bec57532 100644
 --- a/drivers/firmware/raspberrypi.c
 +++ b/drivers/firmware/raspberrypi.c
 @@ -229,21 +229,55 @@ static const struct attribute_group rpi_firmware_dev_group = {
@@ -305318,7 +305333,7 @@ index e834e300bb6f6..6ab3bec57532e 100644
  	rpi_register_clk_driver(dev);
  
 diff --git a/include/soc/bcm2835/raspberrypi-firmware.h b/include/soc/bcm2835/raspberrypi-firmware.h
-index 25fca695f9039..9c6027fc25dae 100644
+index 25fca695f903..9c6027fc25da 100644
 --- a/include/soc/bcm2835/raspberrypi-firmware.h
 +++ b/include/soc/bcm2835/raspberrypi-firmware.h
 @@ -38,6 +38,8 @@ struct rpi_firmware_property_tag_header {
@@ -305352,7 +305367,7 @@ See: https://github.com/raspberrypi/linux/issues/2447
  1 file changed, 12 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c
-index 3bf87542c2ec9..3ce3c651d1580 100644
+index 3bf87542c2ec..3ce3c651d158 100644
 --- a/drivers/net/usb/lan78xx.c
 +++ b/drivers/net/usb/lan78xx.c
 @@ -434,6 +434,11 @@ static bool enable_tso;
@@ -305429,7 +305444,7 @@ Signed-off-by: Hui Wang <hui.wang@canonical.com>
  create mode 100644 sound/soc/bcm/audiosense-pi.c
 
 diff --git a/sound/soc/bcm/Kconfig b/sound/soc/bcm/Kconfig
-index ff5742759a389..c5c5a75782e06 100644
+index ff5742759a38..c5c5a75782e0 100644
 --- a/sound/soc/bcm/Kconfig
 +++ b/sound/soc/bcm/Kconfig
 @@ -132,6 +132,13 @@ config SND_AUDIOINJECTOR_OCTO_SOUNDCARD
@@ -305447,7 +305462,7 @@ index ff5742759a389..c5c5a75782e06 100644
          tristate "Support for Red Rocks Audio DigiDAC1"
          depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
 diff --git a/sound/soc/bcm/Makefile b/sound/soc/bcm/Makefile
-index 522fc73571e4b..d90d2bba75470 100644
+index 522fc73571e4..d90d2bba7547 100644
 --- a/sound/soc/bcm/Makefile
 +++ b/sound/soc/bcm/Makefile
 @@ -20,6 +20,7 @@ snd-soc-rpi-proto-objs := rpi-proto.o
@@ -305468,7 +305483,7 @@ index 522fc73571e4b..d90d2bba75470 100644
  obj-$(CONFIG_SND_BCM2708_SOC_DIONAUDIO_LOCO_V2) += snd-soc-dionaudio-loco-v2.o
 diff --git a/sound/soc/bcm/audiosense-pi.c b/sound/soc/bcm/audiosense-pi.c
 new file mode 100644
-index 0000000000000..d247ee8e61272
+index 000000000000..d247ee8e6127
 --- /dev/null
 +++ b/sound/soc/bcm/audiosense-pi.c
 @@ -0,0 +1,248 @@
@@ -305735,7 +305750,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  1 file changed, 51 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/spi/spi-bcm2835.c b/drivers/spi/spi-bcm2835.c
-index 56ee84e85bee2..b5efa2236b614 100644
+index c86c3ac6097d..27dee3416a25 100644
 --- a/drivers/spi/spi-bcm2835.c
 +++ b/drivers/spi/spi-bcm2835.c
 @@ -1169,9 +1169,57 @@ static void bcm2835_spi_handle_err(struct spi_controller *ctlr,
@@ -305798,9 +305813,9 @@ index 56ee84e85bee2..b5efa2236b614 100644
  }
  
  static int bcm2835_spi_setup(struct spi_device *spi)
-@@ -1276,6 +1324,7 @@ static int bcm2835_spi_probe(struct platform_device *pdev)
+@@ -1282,6 +1330,7 @@ static int bcm2835_spi_probe(struct platform_device *pdev)
  	ctlr->bits_per_word_mask = SPI_BPW_MASK(8);
- 	ctlr->num_chipselect = BCM2835_SPI_NUM_CS;
+ 	ctlr->num_chipselect = 3;
  	ctlr->setup = bcm2835_spi_setup;
 +	ctlr->set_cs = bcm2835_spi_set_cs;
  	ctlr->transfer_one = bcm2835_spi_transfer_one;
@@ -305846,7 +305861,7 @@ Signed-off-by: Matthias Reichl <hias@horus.com>
  create mode 100644 sound/soc/bcm/hifiberry_dacplusadc.c
 
 diff --git a/sound/soc/bcm/Kconfig b/sound/soc/bcm/Kconfig
-index c5c5a75782e06..604923282cefd 100644
+index c5c5a75782e0..604923282cef 100644
 --- a/sound/soc/bcm/Kconfig
 +++ b/sound/soc/bcm/Kconfig
 @@ -41,6 +41,15 @@ config SND_BCM2708_SOC_HIFIBERRY_DACPLUS
@@ -305866,7 +305881,7 @@ index c5c5a75782e06..604923282cefd 100644
          tristate "Support for HifiBerry Digi"
          depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
 diff --git a/sound/soc/bcm/Makefile b/sound/soc/bcm/Makefile
-index d90d2bba75470..c276724de2a56 100644
+index d90d2bba7547..c276724de2a5 100644
 --- a/sound/soc/bcm/Makefile
 +++ b/sound/soc/bcm/Makefile
 @@ -14,6 +14,7 @@ snd-soc-googlevoicehat-codec-objs := googlevoicehat-codec.o
@@ -305887,7 +305902,7 @@ index d90d2bba75470..c276724de2a56 100644
  obj-$(CONFIG_SND_BCM2708_SOC_RPI_PROTO) += snd-soc-rpi-proto.o
 diff --git a/sound/soc/bcm/hifiberry_dacplusadc.c b/sound/soc/bcm/hifiberry_dacplusadc.c
 new file mode 100644
-index 0000000000000..ab454f2ecb17b
+index 000000000000..ab454f2ecb17
 --- /dev/null
 +++ b/sound/soc/bcm/hifiberry_dacplusadc.c
 @@ -0,0 +1,390 @@
@@ -306298,7 +306313,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
-index 26f2b5b3e9682..eea92595d5e15 100644
+index 26f2b5b3e968..eea92595d5e1 100644
 --- a/sound/soc/codecs/Kconfig
 +++ b/sound/soc/codecs/Kconfig
 @@ -320,11 +320,11 @@ config SND_SOC_AD193X
@@ -306335,7 +306350,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c
-index 3ce3c651d1580..8a197006eb6ef 100644
+index 3ce3c651d158..8a197006eb6e 100644
 --- a/drivers/net/usb/lan78xx.c
 +++ b/drivers/net/usb/lan78xx.c
 @@ -2180,7 +2180,7 @@ static int lan78xx_phy_init(struct lan78xx_net *dev)
@@ -306368,7 +306383,7 @@ This reverts commit 2da56630b1cc422f58408033102b8f91ae97bc91.
  create mode 100644 drivers/staging/vc04_services/interface/vchiq_arm/vchiq_killable.h
 
 diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
-index dc13c7df8c1c0..2722e73fe0fa3 100644
+index dc13c7df8c1c..2722e73fe0fa 100644
 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
 +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
 @@ -19,6 +19,7 @@
@@ -306380,7 +306395,7 @@ index dc13c7df8c1c0..2722e73fe0fa3 100644
  
  #define MAX_FRAGMENTS (VCHIQ_NUM_CURRENT_BULKS * 2)
 diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
-index eb76cc2cbfd8c..d927c67012b0b 100644
+index eb76cc2cbfd8..d927c67012b0 100644
 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
 +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
 @@ -28,6 +28,7 @@
@@ -306392,7 +306407,7 @@ index eb76cc2cbfd8c..d927c67012b0b 100644
  #define DEVICE_NAME "vchiq"
  
 diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_connected.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_connected.c
-index 1640906e3929f..a462eb37d9305 100644
+index 1640906e3929..a462eb37d930 100644
 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_connected.c
 +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_connected.c
 @@ -3,6 +3,7 @@
@@ -306404,7 +306419,7 @@ index 1640906e3929f..a462eb37d9305 100644
  #include <linux/mutex.h>
  
 diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
-index 56a23a297fa44..4299715d85d70 100644
+index 56a23a297fa4..4299715d85d7 100644
 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
 +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
 @@ -2,6 +2,7 @@
@@ -306417,7 +306432,7 @@ index 56a23a297fa44..4299715d85d70 100644
  
 diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_killable.h b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_killable.h
 new file mode 100644
-index 0000000000000..778063ba312af
+index 000000000000..778063ba312a
 --- /dev/null
 +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_killable.h
 @@ -0,0 +1,55 @@
@@ -306477,7 +306492,7 @@ index 0000000000000..778063ba312af
 +
 +#endif
 diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_util.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_util.c
-index 5e6d3035dc058..7b38afd4739df 100644
+index 5e6d3035dc05..7b38afd4739d 100644
 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_util.c
 +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_util.c
 @@ -2,6 +2,7 @@
@@ -306503,7 +306518,7 @@ This reverts commit b7491a9fca2dc2535b9dc922550a37c5baae9d3d.
  1 file changed, 22 insertions(+), 9 deletions(-)
 
 diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c
-index c250fbef2fa3d..b42917c250504 100644
+index c250fbef2fa3..b42917c25050 100644
 --- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c
 +++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c
 @@ -6,13 +6,13 @@
@@ -306609,7 +306624,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  1 file changed, 6 insertions(+), 5 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
-index 347ad72682dc2..85e273665836d 100644
+index 347ad72682dc..85e273665836 100644
 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 @@ -161,14 +161,14 @@ static void vc4_primary_plane_atomic_update(struct drm_plane *plane,
@@ -306682,7 +306697,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  1 file changed, 8 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/dma/bcm2835-dma.c b/drivers/dma/bcm2835-dma.c
-index 6860131b02d9a..1e5d6f1bed4ec 100644
+index 6860131b02d9..1e5d6f1bed4e 100644
 --- a/drivers/dma/bcm2835-dma.c
 +++ b/drivers/dma/bcm2835-dma.c
 @@ -141,6 +141,10 @@ struct bcm2835_desc {
@@ -306735,7 +306750,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_kms.c b/drivers/gpu/drm/vc4/vc4_kms.c
-index 75d3e8c6b6507..57124fe942472 100644
+index 75d3e8c6b650..57124fe94247 100644
 --- a/drivers/gpu/drm/vc4/vc4_kms.c
 +++ b/drivers/gpu/drm/vc4/vc4_kms.c
 @@ -166,7 +166,8 @@ vc4_atomic_complete_commit(struct drm_atomic_state *state)
@@ -306763,7 +306778,7 @@ Signed-off-by: Phil Howard <phil@pimoroni.com>
  1 file changed, 17 insertions(+)
 
 diff --git a/drivers/rtc/rtc-rv3028.c b/drivers/rtc/rtc-rv3028.c
-index bbdfebd706442..8b2446909a1bb 100644
+index bbdfebd70644..8b2446909a1b 100644
 --- a/drivers/rtc/rtc-rv3028.c
 +++ b/drivers/rtc/rtc-rv3028.c
 @@ -73,6 +73,7 @@
@@ -306832,7 +306847,7 @@ Signed-off-by: Hui Wang <hui.wang@canonical.com>
  create mode 100644 sound/soc/codecs/i-sabre-codec.h
 
 diff --git a/sound/soc/bcm/Kconfig b/sound/soc/bcm/Kconfig
-index 604923282cefd..fde6b15e30b57 100644
+index 604923282cef..fde6b15e30b5 100644
 --- a/sound/soc/bcm/Kconfig
 +++ b/sound/soc/bcm/Kconfig
 @@ -119,6 +119,13 @@ config SND_BCM2708_SOC_IQAUDIO_DIGI
@@ -306850,7 +306865,7 @@ index 604923282cefd..fde6b15e30b57 100644
  	tristate "Support for ADAU1977 ADC"
  	depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
 diff --git a/sound/soc/bcm/Makefile b/sound/soc/bcm/Makefile
-index c276724de2a56..66c62edafb844 100644
+index c276724de2a5..66c62edafb84 100644
 --- a/sound/soc/bcm/Makefile
 +++ b/sound/soc/bcm/Makefile
 @@ -19,6 +19,7 @@ snd-soc-justboom-dac-objs := justboom-dac.o
@@ -306871,7 +306886,7 @@ index c276724de2a56..66c62edafb844 100644
  obj-$(CONFIG_SND_AUDIOSENSE_PI) += snd-soc-audiosense-pi.o
 diff --git a/sound/soc/bcm/i-sabre-q2m.c b/sound/soc/bcm/i-sabre-q2m.c
 new file mode 100644
-index 0000000000000..aee2527dfad51
+index 000000000000..aee2527dfad5
 --- /dev/null
 +++ b/sound/soc/bcm/i-sabre-q2m.c
 @@ -0,0 +1,158 @@
@@ -307034,7 +307049,7 @@ index 0000000000000..aee2527dfad51
 +MODULE_AUTHOR("Audiophonics <http://www.audiophonics.fr>");
 +MODULE_LICENSE("GPL");
 diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
-index eea92595d5e15..2cc56e9a0e84c 100644
+index eea92595d5e1..2cc56e9a0e84 100644
 --- a/sound/soc/codecs/Kconfig
 +++ b/sound/soc/codecs/Kconfig
 @@ -97,6 +97,7 @@ config SND_SOC_ALL_CODECS
@@ -307055,7 +307070,7 @@ index eea92595d5e15..2cc56e9a0e84c 100644
 +
  endmenu
 diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile
-index 2cc8bf2c12f67..9b201db7a1502 100644
+index 2cc8bf2c12f6..9b201db7a150 100644
 --- a/sound/soc/codecs/Makefile
 +++ b/sound/soc/codecs/Makefile
 @@ -92,6 +92,7 @@ snd-soc-hdac-hda-objs := hdac_hda.o
@@ -307076,7 +307091,7 @@ index 2cc8bf2c12f67..9b201db7a1502 100644
  obj-$(CONFIG_SND_SOC_L3)	+= snd-soc-l3.o
 diff --git a/sound/soc/codecs/i-sabre-codec.c b/sound/soc/codecs/i-sabre-codec.c
 new file mode 100644
-index 0000000000000..f6e5b68eb8f1f
+index 000000000000..f6e5b68eb8f1
 --- /dev/null
 +++ b/sound/soc/codecs/i-sabre-codec.c
 @@ -0,0 +1,392 @@
@@ -307474,7 +307489,7 @@ index 0000000000000..f6e5b68eb8f1f
 +MODULE_LICENSE("GPL");
 diff --git a/sound/soc/codecs/i-sabre-codec.h b/sound/soc/codecs/i-sabre-codec.h
 new file mode 100644
-index 0000000000000..9cac5a2446b9e
+index 000000000000..9cac5a2446b9
 --- /dev/null
 +++ b/sound/soc/codecs/i-sabre-codec.h
 @@ -0,0 +1,42 @@
@@ -307537,7 +307552,7 @@ in both dwc_otg and in ipv6 processing.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c
-index 8a197006eb6ef..f72ab25e7d06c 100644
+index 8a197006eb6e..f72ab25e7d06 100644
 --- a/drivers/net/usb/lan78xx.c
 +++ b/drivers/net/usb/lan78xx.c
 @@ -3169,7 +3169,7 @@ static int rx_submit(struct lan78xx_net *dev, struct urb *urb, gfp_t flags)
@@ -307575,7 +307590,7 @@ Signed-off-by: Hui Wang <hui.wang@canonical.com>
  create mode 100644 sound/soc/bcm/iqaudio-codec.c
 
 diff --git a/sound/soc/bcm/Kconfig b/sound/soc/bcm/Kconfig
-index fde6b15e30b57..e6d1c6b3fb5be 100644
+index fde6b15e30b5..e6d1c6b3fb5b 100644
 --- a/sound/soc/bcm/Kconfig
 +++ b/sound/soc/bcm/Kconfig
 @@ -104,6 +104,13 @@ config SND_BCM2708_SOC_JUSTBOOM_DIGI
@@ -307593,7 +307608,7 @@ index fde6b15e30b57..e6d1c6b3fb5be 100644
  	tristate "Support for IQaudIO-DAC"
  	depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
 diff --git a/sound/soc/bcm/Makefile b/sound/soc/bcm/Makefile
-index 66c62edafb844..e0e2645d76584 100644
+index 66c62edafb84..e0e2645d7658 100644
 --- a/sound/soc/bcm/Makefile
 +++ b/sound/soc/bcm/Makefile
 @@ -18,6 +18,7 @@ snd-soc-hifiberry-dacplusadc-objs := hifiberry_dacplusadc.o
@@ -307614,7 +307629,7 @@ index 66c62edafb844..e0e2645d76584 100644
  obj-$(CONFIG_SND_AUDIOINJECTOR_PI_SOUNDCARD) += snd-soc-audioinjector-pi-soundcard.o
 diff --git a/sound/soc/bcm/iqaudio-codec.c b/sound/soc/bcm/iqaudio-codec.c
 new file mode 100644
-index 0000000000000..83f2dba1f5d63
+index 000000000000..83f2dba1f5d6
 --- /dev/null
 +++ b/sound/soc/bcm/iqaudio-codec.c
 @@ -0,0 +1,274 @@
@@ -307907,7 +307922,7 @@ Subject: [PATCH 0153/1225] sound: pcm512x-codec: Adding 352.8kHz samplerate
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/sound/soc/codecs/pcm512x.c b/sound/soc/codecs/pcm512x.c
-index 4cbef9affffda..604b405c81ac9 100644
+index 4cbef9affffd..604b405c81ac 100644
 --- a/sound/soc/codecs/pcm512x.c
 +++ b/sound/soc/codecs/pcm512x.c
 @@ -534,7 +534,7 @@ static unsigned long pcm512x_ncp_target(struct pcm512x_priv *pcm512x,
@@ -307938,7 +307953,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  1 file changed, 22 insertions(+)
 
 diff --git a/drivers/media/i2c/ov5647.c b/drivers/media/i2c/ov5647.c
-index e7d2e5b4ad4b9..3e587eb0a30e6 100644
+index e7d2e5b4ad4b..3e587eb0a30e 100644
 --- a/drivers/media/i2c/ov5647.c
 +++ b/drivers/media/i2c/ov5647.c
 @@ -463,8 +463,30 @@ static int ov5647_enum_mbus_code(struct v4l2_subdev *sd,
@@ -307989,7 +308004,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  1 file changed, 4 insertions(+)
 
 diff --git a/Documentation/devicetree/bindings/media/i2c/ov5647.txt b/Documentation/devicetree/bindings/media/i2c/ov5647.txt
-index 22e44945b6610..70f06c24f4709 100644
+index 22e44945b661..70f06c24f470 100644
 --- a/Documentation/devicetree/bindings/media/i2c/ov5647.txt
 +++ b/Documentation/devicetree/bindings/media/i2c/ov5647.txt
 @@ -10,6 +10,9 @@ Required properties:
@@ -308027,7 +308042,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  1 file changed, 28 insertions(+)
 
 diff --git a/drivers/media/i2c/ov5647.c b/drivers/media/i2c/ov5647.c
-index 3e587eb0a30e6..c39e3d20e3efd 100644
+index 3e587eb0a30e..c39e3d20e3ef 100644
 --- a/drivers/media/i2c/ov5647.c
 +++ b/drivers/media/i2c/ov5647.c
 @@ -21,6 +21,7 @@
@@ -308129,7 +308144,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  1 file changed, 14 insertions(+), 3 deletions(-)
 
 diff --git a/drivers/media/i2c/ov5647.c b/drivers/media/i2c/ov5647.c
-index c39e3d20e3efd..8a1a515388e0e 100644
+index c39e3d20e3ef..8a1a515388e0 100644
 --- a/drivers/media/i2c/ov5647.c
 +++ b/drivers/media/i2c/ov5647.c
 @@ -44,6 +44,7 @@
@@ -308218,7 +308233,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/media/i2c/tc358743.c b/drivers/media/i2c/tc358743.c
-index cff99cf61ed4d..5b40de02f0d14 100644
+index 114c084c4aec..a40115b4e500 100644
 --- a/drivers/media/i2c/tc358743.c
 +++ b/drivers/media/i2c/tc358743.c
 @@ -1949,7 +1949,7 @@ static int tc358743_probe_of(struct tc358743_state *state)
@@ -308259,7 +308274,7 @@ Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
  2 files changed, 20 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/media/i2c/tc358743.c b/drivers/media/i2c/tc358743.c
-index 5b40de02f0d14..98cee67005cbc 100644
+index a40115b4e500..e50582df0e23 100644
 --- a/drivers/media/i2c/tc358743.c
 +++ b/drivers/media/i2c/tc358743.c
 @@ -1608,11 +1608,20 @@ static int tc358743_g_mbus_config(struct v4l2_subdev *sd,
@@ -308294,7 +308309,7 @@ index 5b40de02f0d14..98cee67005cbc 100644
  		err = tc358743_probe_of(state);
  		if (err == -ENODEV)
 diff --git a/include/media/v4l2-mediabus.h b/include/media/v4l2-mediabus.h
-index c072ed1418113..c90b6a7535b5b 100644
+index c072ed141811..c90b6a7535b5 100644
 --- a/include/media/v4l2-mediabus.h
 +++ b/include/media/v4l2-mediabus.h
 @@ -67,6 +67,14 @@
@@ -308331,7 +308346,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  1 file changed, 33 insertions(+), 14 deletions(-)
 
 diff --git a/drivers/media/i2c/tc358743.c b/drivers/media/i2c/tc358743.c
-index 98cee67005cbc..4a6de85326bfa 100644
+index e50582df0e23..44602ec57245 100644
 --- a/drivers/media/i2c/tc358743.c
 +++ b/drivers/media/i2c/tc358743.c
 @@ -1978,6 +1978,7 @@ static int tc358743_probe_of(struct tc358743_state *state)
@@ -308423,7 +308438,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  1 file changed, 23 insertions(+), 4 deletions(-)
 
 diff --git a/drivers/media/i2c/tc358743.c b/drivers/media/i2c/tc358743.c
-index 4a6de85326bfa..843f341a7eab6 100644
+index 44602ec57245..7491cb65e70a 100644
 --- a/drivers/media/i2c/tc358743.c
 +++ b/drivers/media/i2c/tc358743.c
 @@ -110,7 +110,7 @@ static inline struct tc358743_state *to_state(struct v4l2_subdev *sd)
@@ -308523,7 +308538,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  1 file changed, 13 insertions(+)
 
 diff --git a/drivers/media/i2c/adv7180.c b/drivers/media/i2c/adv7180.c
-index e780969cc2f26..43229fccf83a3 100644
+index e780969cc2f2..43229fccf83a 100644
 --- a/drivers/media/i2c/adv7180.c
 +++ b/drivers/media/i2c/adv7180.c
 @@ -1246,6 +1246,7 @@ static const struct adv7180_chip_info adv7282_m_info = {
@@ -308572,7 +308587,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  1 file changed, 1 insertion(+)
 
 diff --git a/drivers/media/i2c/adv7180.c b/drivers/media/i2c/adv7180.c
-index 43229fccf83a3..8e3cf751a5a1d 100644
+index 43229fccf83a..8e3cf751a5a1 100644
 --- a/drivers/media/i2c/adv7180.c
 +++ b/drivers/media/i2c/adv7180.c
 @@ -1235,6 +1235,7 @@ static const struct adv7180_chip_info adv7282_m_info = {
@@ -308602,7 +308617,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  1 file changed, 5 insertions(+)
 
 diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
-index 3210b3c82a4a2..456dfa847ccb1 100644
+index 3210b3c82a4a..456dfa847ccb 100644
 --- a/include/uapi/linux/videodev2.h
 +++ b/include/uapi/linux/videodev2.h
 @@ -82,6 +82,11 @@
@@ -308638,7 +308653,7 @@ Acked-by: Rob Herring <robh@kernel.org>
 
 diff --git a/Documentation/devicetree/bindings/media/bcm2835-unicam.txt b/Documentation/devicetree/bindings/media/bcm2835-unicam.txt
 new file mode 100644
-index 0000000000000..7714fb374b34d
+index 000000000000..7714fb374b34
 --- /dev/null
 +++ b/Documentation/devicetree/bindings/media/bcm2835-unicam.txt
 @@ -0,0 +1,85 @@
@@ -308744,7 +308759,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  1 file changed, 7 insertions(+)
 
 diff --git a/MAINTAINERS b/MAINTAINERS
-index 1407008df7491..b7685777a8061 100644
+index 1407008df749..b7685777a806 100644
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
 @@ -3198,6 +3198,13 @@ N:	bcm2711
@@ -308792,7 +308807,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  1 file changed, 14 insertions(+), 26 deletions(-)
 
 diff --git a/drivers/media/i2c/tc358743.c b/drivers/media/i2c/tc358743.c
-index 843f341a7eab6..01e255aede504 100644
+index 7491cb65e70a..3dbf60faccaa 100644
 --- a/drivers/media/i2c/tc358743.c
 +++ b/drivers/media/i2c/tc358743.c
 @@ -1690,12 +1690,23 @@ static int tc358743_enum_mbus_code(struct v4l2_subdev *sd,
@@ -308885,7 +308900,7 @@ Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
-index d927c67012b0b..006566ae27754 100644
+index d927c67012b0..006566ae2775 100644
 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
 +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
 @@ -3259,7 +3259,8 @@ static int vchiq_probe(struct platform_device *pdev)
@@ -308917,7 +308932,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
-index e5f651f78441a..d220b20518913 100644
+index e5f651f78441..d220b2051891 100644
 --- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
 +++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
 @@ -1114,8 +1114,8 @@ static int mmal_setup_components(struct bm2835_mmal_dev *dev,
@@ -308960,7 +308975,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  1 file changed, 5 insertions(+)
 
 diff --git a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
-index d220b20518913..74b7db3204eca 100644
+index d220b2051891..74b7db3204ec 100644
 --- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
 +++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
 @@ -380,6 +380,11 @@ static void buffer_cb(struct vchiq_mmal_instance *instance,
@@ -309023,7 +309038,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  rename drivers/staging/vc04_services/{bcm2835-camera => vchiq-mmal}/mmal-vchiq.h (100%)
 
 diff --git a/drivers/staging/vc04_services/Kconfig b/drivers/staging/vc04_services/Kconfig
-index 6baf9dd57f1f2..3777e1fe3d2e6 100644
+index 6baf9dd57f1f..3777e1fe3d2e 100644
 --- a/drivers/staging/vc04_services/Kconfig
 +++ b/drivers/staging/vc04_services/Kconfig
 @@ -22,6 +22,7 @@ config BCM2835_VCHIQ
@@ -309035,7 +309050,7 @@ index 6baf9dd57f1f2..3777e1fe3d2e6 100644
  endif
  
 diff --git a/drivers/staging/vc04_services/Makefile b/drivers/staging/vc04_services/Makefile
-index afe43fa5a6d7c..91fa00347eb79 100644
+index afe43fa5a6d7..91fa00347eb7 100644
 --- a/drivers/staging/vc04_services/Makefile
 +++ b/drivers/staging/vc04_services/Makefile
 @@ -12,6 +12,7 @@ vchiq-objs := \
@@ -309047,7 +309062,7 @@ index afe43fa5a6d7c..91fa00347eb79 100644
  ccflags-y += -Idrivers/staging/vc04_services -D__VCCOREVER__=0x04000000
  
 diff --git a/drivers/staging/vc04_services/bcm2835-camera/Kconfig b/drivers/staging/vc04_services/bcm2835-camera/Kconfig
-index c81baf2c111e8..a0d80ff03b1cd 100644
+index c81baf2c111e..a0d80ff03b1c 100644
 --- a/drivers/staging/vc04_services/bcm2835-camera/Kconfig
 +++ b/drivers/staging/vc04_services/bcm2835-camera/Kconfig
 @@ -3,7 +3,7 @@ config VIDEO_BCM2835
@@ -309060,7 +309075,7 @@ index c81baf2c111e8..a0d80ff03b1cd 100644
  	select BTREE
  	help
 diff --git a/drivers/staging/vc04_services/bcm2835-camera/Makefile b/drivers/staging/vc04_services/bcm2835-camera/Makefile
-index 472f21e1f2a18..a6cb6eebef2ec 100644
+index 472f21e1f2a1..a6cb6eebef2e 100644
 --- a/drivers/staging/vc04_services/bcm2835-camera/Makefile
 +++ b/drivers/staging/vc04_services/bcm2835-camera/Makefile
 @@ -1,11 +1,12 @@
@@ -309080,7 +309095,7 @@ index 472f21e1f2a18..a6cb6eebef2ec 100644
  	-D__VCCOREVER__=0x04000000
 diff --git a/drivers/staging/vc04_services/vchiq-mmal/Kconfig b/drivers/staging/vc04_services/vchiq-mmal/Kconfig
 new file mode 100644
-index 0000000000000..2288a95273e27
+index 000000000000..2288a95273e2
 --- /dev/null
 +++ b/drivers/staging/vc04_services/vchiq-mmal/Kconfig
 @@ -0,0 +1,7 @@
@@ -309093,7 +309108,7 @@ index 0000000000000..2288a95273e27
 +	  majority of the multimedia services on VideoCore.
 diff --git a/drivers/staging/vc04_services/vchiq-mmal/Makefile b/drivers/staging/vc04_services/vchiq-mmal/Makefile
 new file mode 100644
-index 0000000000000..f1647fc72afaa
+index 000000000000..f1647fc72afa
 --- /dev/null
 +++ b/drivers/staging/vc04_services/vchiq-mmal/Makefile
 @@ -0,0 +1,8 @@
@@ -309137,7 +309152,7 @@ diff --git a/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c b/drivers
 similarity index 98%
 rename from drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c
 rename to drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
-index 1c180ead4a20b..ea3d60210a6b9 100644
+index 1c180ead4a20..ea3d60210a6b 100644
 --- a/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c
 +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
 @@ -17,6 +17,7 @@
@@ -309310,7 +309325,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  2 files changed, 20 insertions(+), 10 deletions(-)
 
 diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
-index ea3d60210a6b9..f619697b09a17 100644
+index ea3d60210a6b..f619697b09a1 100644
 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
 +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
 @@ -37,8 +37,11 @@ MODULE_AUTHOR("Dave Stevenson, <dave.stevenson@raspberrypi.org>");
@@ -309393,7 +309408,7 @@ index ea3d60210a6b9..f619697b09a17 100644
  
  	return ret;
 diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h
-index 47897e81ec586..4e34728d87e53 100644
+index 47897e81ec58..4e34728d87e5 100644
 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h
 +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h
 @@ -82,6 +82,7 @@ struct vchiq_mmal_port {
@@ -309423,7 +309438,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
-index f619697b09a17..38db20d42e42a 100644
+index f619697b09a1..38db20d42e42 100644
 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
 +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
 @@ -1759,7 +1759,7 @@ int vchiq_mmal_component_enable(struct vchiq_mmal_instance *instance,
@@ -309455,7 +309470,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  1 file changed, 7 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
-index 38db20d42e42a..9aeb5ac086835 100644
+index 38db20d42e42..9aeb5ac08683 100644
 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
 +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
 @@ -43,6 +43,12 @@ MODULE_VERSION("0.0.1");
@@ -309506,7 +309521,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  4 files changed, 63 insertions(+), 34 deletions(-)
 
 diff --git a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
-index 74b7db3204eca..4317bf5954774 100644
+index 74b7db3204ec..4317bf595477 100644
 --- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
 +++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
 @@ -72,6 +72,12 @@ static const struct v4l2_fract
@@ -309687,7 +309702,7 @@ index 74b7db3204eca..4317bf5954774 100644
  		q->mem_ops = &vb2_vmalloc_memops;
  		q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
 diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-common.h b/drivers/staging/vc04_services/vchiq-mmal/mmal-common.h
-index ff5398737b4a2..a635389208fc5 100644
+index ff5398737b4a..a635389208fc 100644
 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-common.h
 +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-common.h
 @@ -49,6 +49,11 @@ struct mmal_buffer {
@@ -309703,7 +309718,7 @@ index ff5398737b4a2..a635389208fc5 100644
  
  /* */
 diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
-index 9aeb5ac086835..0dca66e45af88 100644
+index 9aeb5ac08683..0dca66e45af8 100644
 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
 +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
 @@ -258,17 +258,25 @@ static void buffer_work_cb(struct work_struct *work)
@@ -309757,7 +309772,7 @@ index 9aeb5ac086835..0dca66e45af88 100644
  
  		spin_unlock_irqrestore(&port->slock, flags);
 diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h
-index 4e34728d87e53..cca7289761c2a 100644
+index 4e34728d87e5..cca7289761c2 100644
 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h
 +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h
 @@ -44,8 +44,7 @@ struct vchiq_mmal_port;
@@ -309796,7 +309811,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  4 files changed, 196 insertions(+), 14 deletions(-)
 
 diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-common.h b/drivers/staging/vc04_services/vchiq-mmal/mmal-common.h
-index a635389208fc5..b78c180e0c79f 100644
+index a635389208fc..b78c180e0c79 100644
 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-common.h
 +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-common.h
 @@ -50,6 +50,7 @@ struct mmal_buffer {
@@ -309808,7 +309823,7 @@ index a635389208fc5..b78c180e0c79f 100644
  	u32 mmal_flags;
  	s64 dts;
 diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-msg.h b/drivers/staging/vc04_services/vchiq-mmal/mmal-msg.h
-index 43cc59316f90a..607ea384f715c 100644
+index 43cc59316f90..607ea384f715 100644
 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-msg.h
 +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-msg.h
 @@ -346,6 +346,41 @@ struct mmal_msg_port_parameter_get_reply {
@@ -309854,7 +309869,7 @@ index 43cc59316f90a..607ea384f715c 100644
  	u32 client_component;	/* component context */
  
 diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
-index 0dca66e45af88..f66d28ed7c840 100644
+index 0dca66e45af8..f66d28ed7c84 100644
 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
 +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
 @@ -150,6 +150,8 @@ struct mmal_msg_context {
@@ -310125,7 +310140,7 @@ index 0dca66e45af88..f66d28ed7c840 100644
  
  	return ret;
 diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h
-index cca7289761c2a..eeef5ee9467a3 100644
+index cca7289761c2..eeef5ee9467a 100644
 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h
 +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h
 @@ -78,6 +78,10 @@ struct vchiq_mmal_port {
@@ -310159,7 +310174,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  1 file changed, 13 insertions(+), 5 deletions(-)
 
 diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
-index f66d28ed7c840..a75e9fd8cbe1d 100644
+index f66d28ed7c84..a75e9fd8cbe1 100644
 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
 +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
 @@ -427,11 +427,19 @@ buffer_from_host(struct vchiq_mmal_instance *instance,
@@ -310208,7 +310223,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  2 files changed, 2 insertions(+)
 
 diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-msg.h b/drivers/staging/vc04_services/vchiq-mmal/mmal-msg.h
-index 607ea384f715c..bd83159403e51 100644
+index 607ea384f715..bd83159403e5 100644
 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-msg.h
 +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-msg.h
 @@ -38,6 +38,7 @@
@@ -310220,7 +310235,7 @@ index 607ea384f715c..bd83159403e51 100644
  enum mmal_msg_type {
  	MMAL_MSG_TYPE_QUIT = 1,
 diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h
-index eeef5ee9467a3..7a490f29737ac 100644
+index eeef5ee9467a..7a490f29737a 100644
 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h
 +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h
 @@ -16,6 +16,7 @@
@@ -310454,7 +310469,7 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
  create mode 100644 include/linux/broadcom/vc_sm_cma_ioctl.h
 
 diff --git a/drivers/staging/vc04_services/Kconfig b/drivers/staging/vc04_services/Kconfig
-index 3777e1fe3d2e6..697f3548879f1 100644
+index 3777e1fe3d2e..697f3548879f 100644
 --- a/drivers/staging/vc04_services/Kconfig
 +++ b/drivers/staging/vc04_services/Kconfig
 @@ -23,6 +23,7 @@ source "drivers/staging/vc04_services/bcm2835-audio/Kconfig"
@@ -310466,7 +310481,7 @@ index 3777e1fe3d2e6..697f3548879f1 100644
  endif
  
 diff --git a/drivers/staging/vc04_services/Makefile b/drivers/staging/vc04_services/Makefile
-index 91fa00347eb79..c90ad85db4fb9 100644
+index 91fa00347eb7..c90ad85db4fb 100644
 --- a/drivers/staging/vc04_services/Makefile
 +++ b/drivers/staging/vc04_services/Makefile
 @@ -13,6 +13,7 @@ vchiq-objs := \
@@ -310478,7 +310493,7 @@ index 91fa00347eb79..c90ad85db4fb9 100644
  ccflags-y += -Idrivers/staging/vc04_services -D__VCCOREVER__=0x04000000
  
 diff --git a/drivers/staging/vc04_services/bcm2835-camera/Makefile b/drivers/staging/vc04_services/bcm2835-camera/Makefile
-index a6cb6eebef2ec..b18e32df01ae1 100644
+index a6cb6eebef2e..b18e32df01ae 100644
 --- a/drivers/staging/vc04_services/bcm2835-camera/Makefile
 +++ b/drivers/staging/vc04_services/bcm2835-camera/Makefile
 @@ -7,6 +7,6 @@ obj-$(CONFIG_VIDEO_BCM2835) += bcm2835-v4l2.o
@@ -310492,7 +310507,7 @@ index a6cb6eebef2ec..b18e32df01ae1 100644
  	-D__VCCOREVER__=0x04000000
 diff --git a/drivers/staging/vc04_services/vc-sm-cma/Kconfig b/drivers/staging/vc04_services/vc-sm-cma/Kconfig
 new file mode 100644
-index 0000000000000..bbd296f5826b4
+index 000000000000..bbd296f5826b
 --- /dev/null
 +++ b/drivers/staging/vc04_services/vc-sm-cma/Kconfig
 @@ -0,0 +1,10 @@
@@ -310508,7 +310523,7 @@ index 0000000000000..bbd296f5826b4
 +	  running on VideoCore.
 diff --git a/drivers/staging/vc04_services/vc-sm-cma/Makefile b/drivers/staging/vc04_services/vc-sm-cma/Makefile
 new file mode 100644
-index 0000000000000..5a0bc5f235e7a
+index 000000000000..5a0bc5f235e7
 --- /dev/null
 +++ b/drivers/staging/vc04_services/vc-sm-cma/Makefile
 @@ -0,0 +1,8 @@
@@ -310522,14 +310537,14 @@ index 0000000000000..5a0bc5f235e7a
 +obj-$(CONFIG_BCM_VC_SM_CMA) += vc-sm-cma.o
 diff --git a/drivers/staging/vc04_services/vc-sm-cma/TODO b/drivers/staging/vc04_services/vc-sm-cma/TODO
 new file mode 100644
-index 0000000000000..ac9b5f8a73895
+index 000000000000..ac9b5f8a7389
 --- /dev/null
 +++ b/drivers/staging/vc04_services/vc-sm-cma/TODO
 @@ -0,0 +1 @@
 +No currently outstanding tasks except some clean-up.
 diff --git a/drivers/staging/vc04_services/vc-sm-cma/vc_sm.c b/drivers/staging/vc04_services/vc-sm-cma/vc_sm.c
 new file mode 100644
-index 0000000000000..8cbe2b3522c65
+index 000000000000..8cbe2b3522c6
 --- /dev/null
 +++ b/drivers/staging/vc04_services/vc-sm-cma/vc_sm.c
 @@ -0,0 +1,1774 @@
@@ -312309,7 +312324,7 @@ index 0000000000000..8cbe2b3522c65
 +MODULE_ALIAS("platform:vcsm-cma");
 diff --git a/drivers/staging/vc04_services/vc-sm-cma/vc_sm.h b/drivers/staging/vc04_services/vc-sm-cma/vc_sm.h
 new file mode 100644
-index 0000000000000..f1c7b95b14cee
+index 000000000000..f1c7b95b14ce
 --- /dev/null
 +++ b/drivers/staging/vc04_services/vc-sm-cma/vc_sm.h
 @@ -0,0 +1,84 @@
@@ -312399,7 +312414,7 @@ index 0000000000000..f1c7b95b14cee
 +#endif
 diff --git a/drivers/staging/vc04_services/vc-sm-cma/vc_sm_cma_vchi.c b/drivers/staging/vc04_services/vc-sm-cma/vc_sm_cma_vchi.c
 new file mode 100644
-index 0000000000000..83110c55f4402
+index 000000000000..83110c55f440
 --- /dev/null
 +++ b/drivers/staging/vc04_services/vc-sm-cma/vc_sm_cma_vchi.c
 @@ -0,0 +1,505 @@
@@ -312910,7 +312925,7 @@ index 0000000000000..83110c55f4402
 +}
 diff --git a/drivers/staging/vc04_services/vc-sm-cma/vc_sm_cma_vchi.h b/drivers/staging/vc04_services/vc-sm-cma/vc_sm_cma_vchi.h
 new file mode 100644
-index 0000000000000..05509efcdfcda
+index 000000000000..05509efcdfcd
 --- /dev/null
 +++ b/drivers/staging/vc04_services/vc-sm-cma/vc_sm_cma_vchi.h
 @@ -0,0 +1,63 @@
@@ -312979,7 +312994,7 @@ index 0000000000000..05509efcdfcda
 +#endif /* __VC_SM_CMA_VCHI_H__INCLUDED__ */
 diff --git a/drivers/staging/vc04_services/vc-sm-cma/vc_sm_defs.h b/drivers/staging/vc04_services/vc-sm-cma/vc_sm_defs.h
 new file mode 100644
-index 0000000000000..8a0d1f6dbfe89
+index 000000000000..8a0d1f6dbfe8
 --- /dev/null
 +++ b/drivers/staging/vc04_services/vc-sm-cma/vc_sm_defs.h
 @@ -0,0 +1,300 @@
@@ -313285,7 +313300,7 @@ index 0000000000000..8a0d1f6dbfe89
 +#endif /* __VC_SM_DEFS_H__INCLUDED__ */
 diff --git a/drivers/staging/vc04_services/vc-sm-cma/vc_sm_knl.h b/drivers/staging/vc04_services/vc-sm-cma/vc_sm_knl.h
 new file mode 100644
-index 0000000000000..988fdd967922b
+index 000000000000..988fdd967922
 --- /dev/null
 +++ b/drivers/staging/vc04_services/vc-sm-cma/vc_sm_knl.h
 @@ -0,0 +1,28 @@
@@ -313318,7 +313333,7 @@ index 0000000000000..988fdd967922b
 +
 +#endif /* __VC_SM_KNL_H__INCLUDED__ */
 diff --git a/drivers/staging/vc04_services/vchiq-mmal/Makefile b/drivers/staging/vc04_services/vchiq-mmal/Makefile
-index f1647fc72afaa..8aef25fbd3b99 100644
+index f1647fc72afa..8aef25fbd3b9 100644
 --- a/drivers/staging/vc04_services/vchiq-mmal/Makefile
 +++ b/drivers/staging/vc04_services/vchiq-mmal/Makefile
 @@ -4,5 +4,5 @@ bcm2835-mmal-vchiq-objs := mmal-vchiq.o
@@ -313330,7 +313345,7 @@ index f1647fc72afaa..8aef25fbd3b99 100644
  	-D__VCCOREVER__=0x04000000
 diff --git a/include/linux/broadcom/vc_sm_cma_ioctl.h b/include/linux/broadcom/vc_sm_cma_ioctl.h
 new file mode 100644
-index 0000000000000..107460ad1be34
+index 000000000000..107460ad1be3
 --- /dev/null
 +++ b/include/linux/broadcom/vc_sm_cma_ioctl.h
 @@ -0,0 +1,114 @@
@@ -313484,7 +313499,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  4 files changed, 70 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/staging/vc04_services/vchiq-mmal/Kconfig b/drivers/staging/vc04_services/vchiq-mmal/Kconfig
-index 2288a95273e27..ff4d34eb45cc2 100644
+index 2288a95273e2..ff4d34eb45cc 100644
 --- a/drivers/staging/vc04_services/vchiq-mmal/Kconfig
 +++ b/drivers/staging/vc04_services/vchiq-mmal/Kconfig
 @@ -2,6 +2,7 @@ config BCM2835_VCHIQ_MMAL
@@ -313496,7 +313511,7 @@ index 2288a95273e27..ff4d34eb45cc2 100644
  	  Enables the MMAL API over VCHIQ as used for the
  	  majority of the multimedia services on VideoCore.
 diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-common.h b/drivers/staging/vc04_services/vchiq-mmal/mmal-common.h
-index b78c180e0c79f..3893a280fcfa8 100644
+index b78c180e0c79..3893a280fcfa 100644
 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-common.h
 +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-common.h
 @@ -50,6 +50,10 @@ struct mmal_buffer {
@@ -313511,7 +313526,7 @@ index b78c180e0c79f..3893a280fcfa8 100644
  	unsigned long length;
  	u32 mmal_flags;
 diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
-index a75e9fd8cbe1d..8be5b72b6ece1 100644
+index a75e9fd8cbe1..8be5b72b6ece 100644
 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
 +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
 @@ -26,9 +26,12 @@
@@ -313626,7 +313641,7 @@ index a75e9fd8cbe1d..8be5b72b6ece1 100644
  }
  EXPORT_SYMBOL_GPL(mmal_vchi_buffer_cleanup);
 diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h
-index 7a490f29737ac..ae6c69ba16ee9 100644
+index 7a490f29737a..ae6c69ba16ee 100644
 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h
 +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h
 @@ -49,6 +49,7 @@ typedef void (*vchiq_mmal_buffer_cb)(
@@ -313662,7 +313677,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  2 files changed, 33 insertions(+), 3 deletions(-)
 
 diff --git a/drivers/media/common/videobuf2/videobuf2-core.c b/drivers/media/common/videobuf2/videobuf2-core.c
-index 4489744fbbd95..a04bbc073c61a 100644
+index 4489744fbbd9..a04bbc073c61 100644
 --- a/drivers/media/common/videobuf2/videobuf2-core.c
 +++ b/drivers/media/common/videobuf2/videobuf2-core.c
 @@ -2073,12 +2073,12 @@ static int __find_plane_by_offset(struct vb2_queue *q, unsigned long off,
@@ -313704,7 +313719,7 @@ index 4489744fbbd95..a04bbc073c61a 100644
  	if (ret < 0) {
  		dprintk(3, "buffer %d, plane %d failed to export (%d)\n",
 diff --git a/include/media/videobuf2-core.h b/include/media/videobuf2-core.h
-index 640aabe69450c..d86d888247a15 100644
+index 640aabe69450..d86d888247a1 100644
 --- a/include/media/videobuf2-core.h
 +++ b/include/media/videobuf2-core.h
 @@ -869,6 +869,21 @@ int vb2_core_streamon(struct vb2_queue *q, unsigned int type);
@@ -313758,7 +313773,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  create mode 100644 drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 
 diff --git a/drivers/staging/vc04_services/Kconfig b/drivers/staging/vc04_services/Kconfig
-index 697f3548879f1..0db67350a1f17 100644
+index 697f3548879f..0db67350a1f1 100644
 --- a/drivers/staging/vc04_services/Kconfig
 +++ b/drivers/staging/vc04_services/Kconfig
 @@ -24,6 +24,7 @@ source "drivers/staging/vc04_services/bcm2835-audio/Kconfig"
@@ -313770,7 +313785,7 @@ index 697f3548879f1..0db67350a1f17 100644
  endif
  
 diff --git a/drivers/staging/vc04_services/Makefile b/drivers/staging/vc04_services/Makefile
-index c90ad85db4fb9..709185d002e11 100644
+index c90ad85db4fb..709185d002e1 100644
 --- a/drivers/staging/vc04_services/Makefile
 +++ b/drivers/staging/vc04_services/Makefile
 @@ -10,10 +10,11 @@ vchiq-objs := \
@@ -313791,7 +313806,7 @@ index c90ad85db4fb9..709185d002e11 100644
  
 diff --git a/drivers/staging/vc04_services/bcm2835-codec/Kconfig b/drivers/staging/vc04_services/bcm2835-codec/Kconfig
 new file mode 100644
-index 0000000000000..951971b39ce0e
+index 000000000000..951971b39ce0
 --- /dev/null
 +++ b/drivers/staging/vc04_services/bcm2835-codec/Kconfig
 @@ -0,0 +1,11 @@
@@ -313808,7 +313823,7 @@ index 0000000000000..951971b39ce0e
 +	  to a service running on VideoCore.
 diff --git a/drivers/staging/vc04_services/bcm2835-codec/Makefile b/drivers/staging/vc04_services/bcm2835-codec/Makefile
 new file mode 100644
-index 0000000000000..5820ec1f89ece
+index 000000000000..5820ec1f89ec
 --- /dev/null
 +++ b/drivers/staging/vc04_services/bcm2835-codec/Makefile
 @@ -0,0 +1,8 @@
@@ -313822,7 +313837,7 @@ index 0000000000000..5820ec1f89ece
 +	-D__VCCOREVER__=0x04000000
 diff --git a/drivers/staging/vc04_services/bcm2835-codec/TODO b/drivers/staging/vc04_services/bcm2835-codec/TODO
 new file mode 100644
-index 0000000000000..ea9a7b7a88e2f
+index 000000000000..ea9a7b7a88e2
 --- /dev/null
 +++ b/drivers/staging/vc04_services/bcm2835-codec/TODO
 @@ -0,0 +1,24 @@
@@ -313853,7 +313868,7 @@ index 0000000000000..ea9a7b7a88e2f
 \ No newline at end of file
 diff --git a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 new file mode 100644
-index 0000000000000..4e4e4fb69ade1
+index 000000000000..4e4e4fb69ade
 --- /dev/null
 +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 @@ -0,0 +1,2359 @@
@@ -316243,7 +316258,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  2 files changed, 10 insertions(+), 3 deletions(-)
 
 diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
-index 8be5b72b6ece1..9416cbeae3a34 100644
+index 8be5b72b6ece..9416cbeae3a3 100644
 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
 +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
 @@ -472,9 +472,9 @@ buffer_from_host(struct vchiq_mmal_instance *instance,
@@ -316281,7 +316296,7 @@ index 8be5b72b6ece1..9416cbeae3a34 100644
  	if (ret < 0) {
  		pr_err("%s: failed to create component %d (Not enough GPU mem?)\n",
 diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h
-index ae6c69ba16ee9..247521fbcc1d8 100644
+index ae6c69ba16ee..247521fbcc1d 100644
 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h
 +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h
 @@ -97,6 +97,7 @@ struct vchiq_mmal_component {
@@ -316310,7 +316325,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c
-index db1df40271c08..d4bf9e376318c 100644
+index db1df40271c0..d4bf9e376318 100644
 --- a/drivers/clk/bcm/clk-bcm2835.c
 +++ b/drivers/clk/bcm/clk-bcm2835.c
 @@ -2354,7 +2354,7 @@ static int bcm2835_clk_probe(struct platform_device *pdev)
@@ -316345,7 +316360,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/drivers/media/i2c/ov5647.c b/drivers/media/i2c/ov5647.c
-index 8a1a515388e0e..07550377be2ef 100644
+index 8a1a515388e0..07550377be2e 100644
 --- a/drivers/media/i2c/ov5647.c
 +++ b/drivers/media/i2c/ov5647.c
 @@ -373,7 +373,7 @@ static int ov5647_sensor_power(struct v4l2_subdev *sd, int on)
@@ -316402,7 +316417,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-index 4e4e4fb69ade1..4ef16379f2161 100644
+index 4e4e4fb69ade..4ef16379f216 100644
 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 @@ -634,6 +634,9 @@ static void op_buffer_cb(struct vchiq_mmal_instance *instance,
@@ -316444,7 +316459,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-index 4ef16379f2161..c26760faae2d6 100644
+index 4ef16379f216..c26760faae2d 100644
 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 @@ -743,7 +743,7 @@ static void device_run(void *priv)
@@ -316476,7 +316491,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  1 file changed, 27 insertions(+)
 
 diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-encodings.h b/drivers/staging/vc04_services/vchiq-mmal/mmal-encodings.h
-index 2be9941a1f30e..44ba91aa6d479 100644
+index 2be9941a1f30..44ba91aa6d47 100644
 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-encodings.h
 +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-encodings.h
 @@ -69,6 +69,33 @@
@@ -316540,7 +316555,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
-index 9416cbeae3a34..59a4d24140693 100644
+index 9416cbeae3a3..59a4d2414069 100644
 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
 +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
 @@ -1412,11 +1412,12 @@ static int port_parameter_get(struct vchiq_mmal_instance *instance,
@@ -316579,7 +316594,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
-index 59a4d24140693..cfc861d0a214e 100644
+index 59a4d2414069..cfc861d0a214 100644
 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
 +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
 @@ -1400,7 +1400,8 @@ static int port_parameter_get(struct vchiq_mmal_instance *instance,
@@ -316614,7 +316629,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  1 file changed, 327 insertions(+), 128 deletions(-)
 
 diff --git a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-index c26760faae2d6..7b8de26ca43b5 100644
+index c26760faae2d..7b8de26ca43b 100644
 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 @@ -88,17 +88,12 @@ struct bcm2835_codec_fmt {
@@ -317348,7 +317363,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  1 file changed, 92 insertions(+), 40 deletions(-)
 
 diff --git a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-index 7b8de26ca43b5..f9fd5e8ac9141 100644
+index 7b8de26ca43b..f9fd5e8ac914 100644
 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 @@ -54,10 +54,26 @@ static int encode_video_nr = 11;
@@ -317735,7 +317750,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  1 file changed, 28 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-index f9fd5e8ac9141..5141034835ca9 100644
+index f9fd5e8ac914..5141034835ca 100644
 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 @@ -58,6 +58,15 @@ static int isp_video_nr = 12;
@@ -317924,7 +317939,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  3 files changed, 73 insertions(+), 30 deletions(-)
 
 diff --git a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-index 5141034835ca9..67d42bf6251b1 100644
+index 5141034835ca..67d42bf6251b 100644
 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 @@ -1852,6 +1852,18 @@ static int bcm2835_codec_queue_setup(struct vb2_queue *vq,
@@ -318044,7 +318059,7 @@ index 5141034835ca9..67d42bf6251b1 100644
  
  	/* If both ports disabled, then disable the component */
 diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
-index cfc861d0a214e..2018c28daf686 100644
+index cfc861d0a214..2018c28daf68 100644
 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
 +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
 @@ -1784,13 +1784,9 @@ int mmal_vchi_buffer_init(struct vchiq_mmal_instance *instance,
@@ -318084,7 +318099,7 @@ index cfc861d0a214e..2018c28daf686 100644
  }
  EXPORT_SYMBOL_GPL(mmal_vchi_buffer_cleanup);
 diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h
-index 247521fbcc1d8..0a75c96f6d586 100644
+index 247521fbcc1d..0a75c96f6d58 100644
 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h
 +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h
 @@ -167,6 +167,8 @@ int vchiq_mmal_submit_buffer(struct vchiq_mmal_instance *instance,
@@ -318116,7 +318131,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  1 file changed, 31 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h b/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h
-index 80a99128f5f3e..926392d754c76 100644
+index 80a99128f5f3..926392d754c7 100644
 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h
 +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h
 @@ -580,7 +580,37 @@ enum mmal_parameter_video_type {
@@ -318179,7 +318194,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  1 file changed, 12 insertions(+)
 
 diff --git a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-index 67d42bf6251b1..eb5c07bc73d06 100644
+index 67d42bf6251b..eb5c07bc73d0 100644
 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 @@ -1785,6 +1785,8 @@ static int bcm2835_codec_create_component(struct bcm2835_codec_ctx *ctx)
@@ -318231,7 +318246,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  1 file changed, 13 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-index eb5c07bc73d06..ad555ceb8f63e 100644
+index eb5c07bc73d0..ad555ceb8f63 100644
 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 @@ -1776,13 +1776,21 @@ static int bcm2835_codec_create_component(struct bcm2835_codec_ctx *ctx)
@@ -318294,7 +318309,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  1 file changed, 8 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-index ad555ceb8f63e..837fbec5ab4f8 100644
+index ad555ceb8f63..837fbec5ab4f 100644
 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 @@ -77,6 +77,12 @@ enum bcm2835_codec_role {
@@ -318351,7 +318366,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  1 file changed, 40 insertions(+), 63 deletions(-)
 
 diff --git a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-index 837fbec5ab4f8..4b67c9ea73e13 100644
+index 837fbec5ab4f..4b67c9ea73e1 100644
 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 @@ -578,10 +578,17 @@ static void job_abort(void *priv)
@@ -318509,7 +318524,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-index 4b67c9ea73e13..97b1f2b953eca 100644
+index 4b67c9ea73e1..97b1f2b953ec 100644
 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 @@ -605,8 +605,8 @@ static void setup_mmal_port_format(struct bcm2835_codec_ctx *ctx,
@@ -318543,7 +318558,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  1 file changed, 8 insertions(+), 5 deletions(-)
 
 diff --git a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-index 97b1f2b953eca..22588f78287e5 100644
+index 97b1f2b953ec..22588f78287e 100644
 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 @@ -1015,7 +1015,8 @@ static int vidioc_g_fmt_vid_cap(struct file *file, void *priv,
@@ -318612,7 +318627,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  1 file changed, 2 insertions(+)
 
 diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
-index 2018c28daf686..4d9d7beb91446 100644
+index 2018c28daf68..4d9d7beb9144 100644
 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
 +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
 @@ -1981,6 +1981,8 @@ int vchiq_mmal_component_finalise(struct vchiq_mmal_instance *instance,
@@ -318643,7 +318658,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  1 file changed, 20 insertions(+), 9 deletions(-)
 
 diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
-index 4d9d7beb91446..61a3593cdcfc3 100644
+index 4d9d7beb9144..61a3593cdcfc 100644
 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
 +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
 @@ -1847,9 +1847,26 @@ static void free_event_context(struct vchiq_mmal_port *port)
@@ -318725,7 +318740,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  1 file changed, 7 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-index 22588f78287e5..5c7fc39cd9218 100644
+index 22588f78287e..5c7fc39cd921 100644
 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 @@ -823,7 +823,8 @@ static void op_buffer_cb(struct vchiq_mmal_instance *instance,
@@ -318777,7 +318792,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  1 file changed, 48 insertions(+), 4 deletions(-)
 
 diff --git a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-index 5c7fc39cd9218..708f76b7aa92b 100644
+index 5c7fc39cd921..708f76b7aa92 100644
 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 @@ -447,6 +447,8 @@ struct bcm2835_codec_ctx {
@@ -318903,7 +318918,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/w1/masters/w1-gpio.c b/drivers/w1/masters/w1-gpio.c
-index d4632aace4022..4832cd8c2596a 100644
+index d4632aace402..4832cd8c2596 100644
 --- a/drivers/w1/masters/w1-gpio.c
 +++ b/drivers/w1/masters/w1-gpio.c
 @@ -30,7 +30,7 @@ static u8 w1_gpio_set_pullup(void *data, int delay)
@@ -318937,7 +318952,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  1 file changed, 15 insertions(+), 6 deletions(-)
 
 diff --git a/arch/arm/mach-bcm/board_bcm2835.c b/arch/arm/mach-bcm/board_bcm2835.c
-index 9b6c921106b56..9bd9842da59fa 100644
+index 9b6c921106b5..9bd9842da59f 100644
 --- a/arch/arm/mach-bcm/board_bcm2835.c
 +++ b/arch/arm/mach-bcm/board_bcm2835.c
 @@ -5,17 +5,20 @@
@@ -319016,7 +319031,7 @@ ARM processors.
  1 file changed, 6 insertions(+)
 
 diff --git a/arch/arm/lib/uaccess_with_memcpy.c b/arch/arm/lib/uaccess_with_memcpy.c
-index 296c2985ac176..ab150e8281f3e 100644
+index 296c2985ac17..ab150e8281f3 100644
 --- a/arch/arm/lib/uaccess_with_memcpy.c
 +++ b/arch/arm/lib/uaccess_with_memcpy.c
 @@ -254,6 +254,7 @@ arm_copy_to_user(void __user *to, const void *from, unsigned long n)
@@ -319071,7 +319086,7 @@ Signed-off-by: Jim Quinlan <jim2101024@gmail.com>
  create mode 100644 include/soc/brcmstb/memory_api.h
 
 diff --git a/drivers/pci/controller/Kconfig b/drivers/pci/controller/Kconfig
-index 70e078238899f..e57bbd0ec9a71 100644
+index 70e078238899..e57bbd0ec9a7 100644
 --- a/drivers/pci/controller/Kconfig
 +++ b/drivers/pci/controller/Kconfig
 @@ -288,5 +288,14 @@ config PCI_HYPERV_INTERFACE
@@ -319090,7 +319105,7 @@ index 70e078238899f..e57bbd0ec9a71 100644
  source "drivers/pci/controller/dwc/Kconfig"
  endmenu
 diff --git a/drivers/pci/controller/Makefile b/drivers/pci/controller/Makefile
-index a2a22c9d91afc..66c36e20f3291 100644
+index a2a22c9d91af..66c36e20f329 100644
 --- a/drivers/pci/controller/Makefile
 +++ b/drivers/pci/controller/Makefile
 @@ -29,11 +29,11 @@ obj-$(CONFIG_PCIE_ROCKCHIP_HOST) += pcie-rockchip-host.o
@@ -319108,7 +319123,7 @@ index a2a22c9d91afc..66c36e20f3291 100644
  # They contain MCFG quirks to replace the generic ECAM accessors with
 diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c
 new file mode 100644
-index 0000000000000..babef9191e88c
+index 000000000000..babef9191e88
 --- /dev/null
 +++ b/drivers/pci/controller/pcie-brcmstb.c
 @@ -0,0 +1,1097 @@
@@ -320211,7 +320226,7 @@ index 0000000000000..babef9191e88c
 +MODULE_AUTHOR("Broadcom");
 diff --git a/include/soc/brcmstb/memory_api.h b/include/soc/brcmstb/memory_api.h
 new file mode 100644
-index 0000000000000..d922906790671
+index 000000000000..d92290679067
 --- /dev/null
 +++ b/include/soc/brcmstb/memory_api.h
 @@ -0,0 +1,25 @@
@@ -320323,7 +320338,7 @@ Signed-off-by: Jim Quinlan <jim2101024@gmail.com>
  1 file changed, 411 insertions(+), 9 deletions(-)
 
 diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c
-index babef9191e88c..27bcf83c99d7e 100644
+index babef9191e88..27bcf83c99d7 100644
 --- a/drivers/pci/controller/pcie-brcmstb.c
 +++ b/drivers/pci/controller/pcie-brcmstb.c
 @@ -4,6 +4,7 @@
@@ -320840,7 +320855,7 @@ Signed-off-by: Jim Quinlan <jim2101024@gmail.com>
  1 file changed, 353 insertions(+), 21 deletions(-)
 
 diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c
-index 27bcf83c99d7e..b028d4be81a23 100644
+index 27bcf83c99d7..b028d4be81a2 100644
 --- a/drivers/pci/controller/pcie-brcmstb.c
 +++ b/drivers/pci/controller/pcie-brcmstb.c
 @@ -1,6 +1,7 @@
@@ -321386,7 +321401,7 @@ Signed-off-by: Jim Quinlan <jim2101024@gmail.com>
 
 diff --git a/Documentation/devicetree/bindings/pci/brcmstb-pcie.txt b/Documentation/devicetree/bindings/pci/brcmstb-pcie.txt
 new file mode 100644
-index 0000000000000..a1a9ad5e70cab
+index 000000000000..a1a9ad5e70ca
 --- /dev/null
 +++ b/Documentation/devicetree/bindings/pci/brcmstb-pcie.txt
 @@ -0,0 +1,59 @@
@@ -321476,7 +321491,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  create mode 100644 drivers/soc/bcm/brcmstb/memory.c
 
 diff --git a/drivers/dma/bcm2835-dma.c b/drivers/dma/bcm2835-dma.c
-index 1e5d6f1bed4ec..f59b099233dc0 100644
+index 1e5d6f1bed4e..f59b099233dc 100644
 --- a/drivers/dma/bcm2835-dma.c
 +++ b/drivers/dma/bcm2835-dma.c
 @@ -64,6 +64,17 @@ struct bcm2835_dma_cb {
@@ -321615,7 +321630,7 @@ index 1e5d6f1bed4ec..f59b099233dc0 100644
  	for (i = 0; i <= BCM2835_DMA_MAX_DMA_CHAN_SUPPORTED; i++) {
  		/* skip masked out channels */
 diff --git a/drivers/pci/controller/Makefile b/drivers/pci/controller/Makefile
-index 66c36e20f3291..be98ebfdb1737 100644
+index 66c36e20f329..be98ebfdb173 100644
 --- a/drivers/pci/controller/Makefile
 +++ b/drivers/pci/controller/Makefile
 @@ -30,6 +30,10 @@ obj-$(CONFIG_PCIE_MEDIATEK) += pcie-mediatek.o
@@ -321631,7 +321646,7 @@ index 66c36e20f3291..be98ebfdb1737 100644
  obj-y				+= dwc/
 diff --git a/drivers/pci/controller/pcie-brcmstb-bounce.c b/drivers/pci/controller/pcie-brcmstb-bounce.c
 new file mode 100644
-index 0000000000000..d8007631a54cf
+index 000000000000..d8007631a54c
 --- /dev/null
 +++ b/drivers/pci/controller/pcie-brcmstb-bounce.c
 @@ -0,0 +1,558 @@
@@ -322195,7 +322210,7 @@ index 0000000000000..d8007631a54cf
 +MODULE_LICENSE("GPL");
 diff --git a/drivers/pci/controller/pcie-brcmstb-bounce.h b/drivers/pci/controller/pcie-brcmstb-bounce.h
 new file mode 100644
-index 0000000000000..5d07f679dc71b
+index 000000000000..5d07f679dc71
 --- /dev/null
 +++ b/drivers/pci/controller/pcie-brcmstb-bounce.h
 @@ -0,0 +1,32 @@
@@ -322232,7 +322247,7 @@ index 0000000000000..5d07f679dc71b
 +
 +#endif /* _PCIE_BRCMSTB_BOUNCE_H */
 diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c
-index b028d4be81a23..782725e3adad5 100644
+index b028d4be81a2..782725e3adad 100644
 --- a/drivers/pci/controller/pcie-brcmstb.c
 +++ b/drivers/pci/controller/pcie-brcmstb.c
 @@ -29,6 +29,7 @@
@@ -322726,7 +322741,7 @@ index b028d4be81a23..782725e3adad5 100644
  		.pm = &brcm_pcie_pm_ops,
  	},
 diff --git a/drivers/soc/bcm/brcmstb/Makefile b/drivers/soc/bcm/brcmstb/Makefile
-index fe5c43d26dce3..28b3a3be0ee36 100644
+index fe5c43d26dce..28b3a3be0ee3 100644
 --- a/drivers/soc/bcm/brcmstb/Makefile
 +++ b/drivers/soc/bcm/brcmstb/Makefile
 @@ -1,3 +1,3 @@
@@ -322736,7 +322751,7 @@ index fe5c43d26dce3..28b3a3be0ee36 100644
  obj-$(CONFIG_BRCMSTB_PM)	+= pm/
 diff --git a/drivers/soc/bcm/brcmstb/memory.c b/drivers/soc/bcm/brcmstb/memory.c
 new file mode 100644
-index 0000000000000..254783d1065f7
+index 000000000000..254783d1065f
 --- /dev/null
 +++ b/drivers/soc/bcm/brcmstb/memory.c
 @@ -0,0 +1,158 @@
@@ -322916,7 +322931,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  1 file changed, 3 insertions(+)
 
 diff --git a/arch/arm/mach-bcm/board_bcm2835.c b/arch/arm/mach-bcm/board_bcm2835.c
-index 9bd9842da59fa..7d59a93641757 100644
+index 9bd9842da59f..7d59a9364175 100644
 --- a/arch/arm/mach-bcm/board_bcm2835.c
 +++ b/arch/arm/mach-bcm/board_bcm2835.c
 @@ -114,6 +114,9 @@ static const char * const bcm2835_compat[] = {
@@ -322950,10 +322965,10 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  1 file changed, 4 insertions(+)
 
 diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
-index a1aeb2e105641..c140c8dfd56ef 100644
+index 92709232529a..1142d4c3fd69 100644
 --- a/drivers/mmc/host/sdhci.c
 +++ b/drivers/mmc/host/sdhci.c
-@@ -3106,6 +3106,10 @@ static irqreturn_t sdhci_irq(int irq, void *dev_id)
+@@ -3108,6 +3108,10 @@ static irqreturn_t sdhci_irq(int irq, void *dev_id)
  			result = IRQ_WAKE_THREAD;
  		}
  
@@ -322983,7 +322998,7 @@ Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
  2 files changed, 79 insertions(+), 6 deletions(-)
 
 diff --git a/drivers/char/hw_random/Kconfig b/drivers/char/hw_random/Kconfig
-index 59f25286befef..31e243fc6c77f 100644
+index 59f25286befe..31e243fc6c77 100644
 --- a/drivers/char/hw_random/Kconfig
 +++ b/drivers/char/hw_random/Kconfig
 @@ -90,11 +90,11 @@ config HW_RANDOM_BCM2835
@@ -323001,7 +323016,7 @@ index 59f25286befef..31e243fc6c77f 100644
  	  To compile this driver as a module, choose M here: the
  	  module will be called iproc-rng200
 diff --git a/drivers/char/hw_random/iproc-rng200.c b/drivers/char/hw_random/iproc-rng200.c
-index 92be1c0ab99f3..f971a4cb8951c 100644
+index 92be1c0ab99f..f971a4cb8951 100644
 --- a/drivers/char/hw_random/iproc-rng200.c
 +++ b/drivers/char/hw_random/iproc-rng200.c
 @@ -29,6 +29,7 @@
@@ -323149,7 +323164,7 @@ Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
  2 files changed, 54 insertions(+), 9 deletions(-)
 
 diff --git a/drivers/thermal/broadcom/Kconfig b/drivers/thermal/broadcom/Kconfig
-index cf43e1520de9f..54a9748feac5d 100644
+index cf43e1520de9..54a9748feac5 100644
 --- a/drivers/thermal/broadcom/Kconfig
 +++ b/drivers/thermal/broadcom/Kconfig
 @@ -9,7 +9,7 @@ config BCM2835_THERMAL
@@ -323162,7 +323177,7 @@ index cf43e1520de9f..54a9748feac5d 100644
  	  Enable this driver if you have a Broadcom STB SoC and would like
  	  thermal framework support.
 diff --git a/drivers/thermal/broadcom/brcmstb_thermal.c b/drivers/thermal/broadcom/brcmstb_thermal.c
-index 680f1a0706065..7a7c6ad7b8a04 100644
+index 680f1a070606..7a7c6ad7b8a0 100644
 --- a/drivers/thermal/broadcom/brcmstb_thermal.c
 +++ b/drivers/thermal/broadcom/brcmstb_thermal.c
 @@ -10,6 +10,7 @@
@@ -323311,7 +323326,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  3 files changed, 75 insertions(+), 22 deletions(-)
 
 diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
-index 2722e73fe0fa3..230e1b1144a9d 100644
+index 2722e73fe0fa..230e1b1144a9 100644
 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
 +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
 @@ -16,6 +16,8 @@
@@ -323461,7 +323476,7 @@ index 2722e73fe0fa3..230e1b1144a9d 100644
  
  	/* Partial cache lines (fragments) require special measures */
 diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
-index 006566ae27754..4e684ccd9346a 100644
+index 006566ae2775..4e684ccd9346 100644
 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
 +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
 @@ -149,6 +149,11 @@ static struct vchiq_drvdata bcm2836_drvdata = {
@@ -323485,7 +323500,7 @@ index 006566ae27754..4e684ccd9346a 100644
  };
  MODULE_DEVICE_TABLE(of, vchiq_of_match);
 diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h
-index b424323e96134..5448918f0f364 100644
+index b424323e9613..5448918f0f36 100644
 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h
 +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h
 @@ -97,6 +97,7 @@ struct vchiq_arm_state {
@@ -323510,7 +323525,7 @@ Subject: [PATCH 0219/1225] bcm2835-pcm.c: Support multichannel audio
  1 file changed, 9 insertions(+), 8 deletions(-)
 
 diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c
-index 8708f97b46f3a..db889f6da395b 100644
+index 8708f97b46f3..db889f6da395 100644
 --- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c
 +++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c
 @@ -14,9 +14,9 @@ static const struct snd_pcm_hardware snd_bcm2835_playback_hw = {
@@ -323562,7 +323577,7 @@ Subject: [PATCH 0220/1225] bcmgenet: constrain max DMA burst length
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.h b/drivers/net/ethernet/broadcom/genet/bcmgenet.h
-index 5b7c2f9241d0f..e59f53c582ca5 100644
+index 5b7c2f9241d0..e59f53c582ca 100644
 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.h
 +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.h
 @@ -29,7 +29,7 @@
@@ -323597,7 +323612,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  1 file changed, 5 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
-index b27da024aa9d9..8cd9d5a9e7f5b 100644
+index b27da024aa9d..8cd9d5a9e7f5 100644
 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
 +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
 @@ -2149,7 +2149,7 @@ static void bcmgenet_init_tx_ring(struct bcmgenet_priv *priv,
@@ -323648,7 +323663,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
  1 file changed, 2 insertions(+)
 
 diff --git a/drivers/net/ethernet/broadcom/genet/bcmmii.c b/drivers/net/ethernet/broadcom/genet/bcmmii.c
-index dbe18cdf6c1b8..3ba7332957186 100644
+index dbe18cdf6c1b..3ba733295718 100644
 --- a/drivers/net/ethernet/broadcom/genet/bcmmii.c
 +++ b/drivers/net/ethernet/broadcom/genet/bcmmii.c
 @@ -316,6 +316,8 @@ int bcmgenet_mii_probe(struct net_device *dev)
@@ -323681,7 +323696,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
  2 files changed, 14 insertions(+), 3 deletions(-)
 
 diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c
-index 5e956089bf525..e7a4cbb66e1fd 100644
+index 5e956089bf52..e7a4cbb66e1f 100644
 --- a/drivers/net/phy/broadcom.c
 +++ b/drivers/net/phy/broadcom.c
 @@ -213,7 +213,8 @@ static void bcm54xx_adjust_rxrefclk(struct phy_device *phydev)
@@ -323727,7 +323742,7 @@ index 5e956089bf525..e7a4cbb66e1fd 100644
  	{ PHY_ID_BCM54612E, 0xfffffff0 },
  	{ PHY_ID_BCM54616S, 0xfffffff0 },
 diff --git a/include/linux/brcmphy.h b/include/linux/brcmphy.h
-index 6db2d9a6e5031..bfb37218f435c 100644
+index 6db2d9a6e503..bfb37218f435 100644
 --- a/include/linux/brcmphy.h
 +++ b/include/linux/brcmphy.h
 @@ -20,6 +20,7 @@
@@ -323761,7 +323776,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
  2 files changed, 21 insertions(+)
 
 diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c
-index e7a4cbb66e1fd..f5881fb95a5bf 100644
+index e7a4cbb66e1f..f5881fb95a5b 100644
 --- a/drivers/net/phy/broadcom.c
 +++ b/drivers/net/phy/broadcom.c
 @@ -43,6 +43,21 @@ static int bcm54210e_config_init(struct phy_device *phydev)
@@ -323796,7 +323811,7 @@ index e7a4cbb66e1fd..f5881fb95a5bf 100644
  		err = bcm54612e_config_init(phydev);
  		if (err)
 diff --git a/include/linux/brcmphy.h b/include/linux/brcmphy.h
-index bfb37218f435c..d7ebafbb32218 100644
+index bfb37218f435..d7ebafbb3221 100644
 --- a/include/linux/brcmphy.h
 +++ b/include/linux/brcmphy.h
 @@ -185,6 +185,10 @@
@@ -323831,7 +323846,7 @@ on the first boot.
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
-index b5080bc1689e4..e89229a6bc24a 100644
+index a3813c75a3de..a946c9e01af5 100644
 --- a/drivers/usb/host/xhci.c
 +++ b/drivers/usb/host/xhci.c
 @@ -196,8 +196,9 @@ int xhci_reset(struct xhci_hcd *xhci)
@@ -323860,10 +323875,10 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  1 file changed, 4 insertions(+)
 
 diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c
-index 71ef473df585f..c0e1c321bb6b3 100644
+index d242779297ba..eaf13f6d8883 100644
 --- a/drivers/usb/host/xhci-pci.c
 +++ b/drivers/usb/host/xhci-pci.c
-@@ -255,6 +255,10 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci)
+@@ -257,6 +257,10 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci)
  			pdev->device == 0x3432)
  		xhci->quirks |= XHCI_BROKEN_STREAMS;
  
@@ -323891,7 +323906,7 @@ Signed-off-by: Martin Sperl <kernel@martin.sperl.org>
  1 file changed, 6 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/spi/spi-bcm2835.c b/drivers/spi/spi-bcm2835.c
-index b5efa2236b614..7ac3563f458b1 100644
+index 27dee3416a25..cebc6f016614 100644
 --- a/drivers/spi/spi-bcm2835.c
 +++ b/drivers/spi/spi-bcm2835.c
 @@ -379,6 +379,10 @@ static irqreturn_t bcm2835_spi_interrupt(int irq, void *dev_id)
@@ -323905,7 +323920,7 @@ index b5efa2236b614..7ac3563f458b1 100644
  	/* Read as many bytes as possible from FIFO */
  	bcm2835_rd_fifo(bs);
  	/* Write as many bytes as possible to FIFO */
-@@ -1355,7 +1359,8 @@ static int bcm2835_spi_probe(struct platform_device *pdev)
+@@ -1361,7 +1365,8 @@ static int bcm2835_spi_probe(struct platform_device *pdev)
  	bcm2835_wr(bs, BCM2835_SPI_CS,
  		   BCM2835_SPI_CS_CLEAR_RX | BCM2835_SPI_CS_CLEAR_TX);
  
@@ -323930,7 +323945,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  1 file changed, 10 insertions(+), 8 deletions(-)
 
 diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c
-index d4bf9e376318c..b83a963eceab6 100644
+index d4bf9e376318..b83a963eceab 100644
 --- a/drivers/clk/bcm/clk-bcm2835.c
 +++ b/drivers/clk/bcm/clk-bcm2835.c
 @@ -643,15 +643,17 @@ static int bcm2835_pll_on(struct clk_hw *hw)
@@ -323984,7 +323999,7 @@ Signed-off-by: Eric Anholt <eric@anholt.net>
  3 files changed, 34 insertions(+)
 
 diff --git a/drivers/mfd/bcm2835-pm.c b/drivers/mfd/bcm2835-pm.c
-index 42fe67f1538e7..ab1e9cbc50b1b 100644
+index 42fe67f1538e..ab1e9cbc50b1 100644
 --- a/drivers/mfd/bcm2835-pm.c
 +++ b/drivers/mfd/bcm2835-pm.c
 @@ -50,6 +50,17 @@ static int bcm2835_pm_probe(struct platform_device *pdev)
@@ -324006,7 +324021,7 @@ index 42fe67f1538e7..ab1e9cbc50b1b 100644
  	 * bcm2835-pm binding as the key for whether we can reference
  	 * the full PM register range and support power domains.
 diff --git a/drivers/soc/bcm/bcm2835-power.c b/drivers/soc/bcm/bcm2835-power.c
-index 1e0041ec81323..c0618a9c26fac 100644
+index 1e0041ec8132..c0618a9c26fa 100644
 --- a/drivers/soc/bcm/bcm2835-power.c
 +++ b/drivers/soc/bcm/bcm2835-power.c
 @@ -143,6 +143,8 @@ struct bcm2835_power {
@@ -324060,7 +324075,7 @@ index 1e0041ec81323..c0618a9c26fac 100644
  	if (id != 0x62726467 /* "BRDG" */) {
  		dev_err(dev, "ASB register ID returned 0x%08x\n", id);
 diff --git a/include/linux/mfd/bcm2835-pm.h b/include/linux/mfd/bcm2835-pm.h
-index ed37dc40e82a8..b2d157091e12b 100644
+index ed37dc40e82a..b2d157091e12 100644
 --- a/include/linux/mfd/bcm2835-pm.h
 +++ b/include/linux/mfd/bcm2835-pm.h
 @@ -9,6 +9,7 @@ struct bcm2835_pm {
@@ -324086,7 +324101,7 @@ Subject: [PATCH 0230/1225] config: Permit LPAE and PCIE_BRCMSTB on BCM2835
  2 files changed, 6 insertions(+), 2 deletions(-)
 
 diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig
-index 5742092f8c09e..e25dfc9494462 100644
+index 5742092f8c09..e25dfc949446 100644
 --- a/arch/arm/mach-bcm/Kconfig
 +++ b/arch/arm/mach-bcm/Kconfig
 @@ -161,6 +161,7 @@ config ARCH_BCM2835
@@ -324108,7 +324123,7 @@ index 5742092f8c09e..e25dfc9494462 100644
  	  This enables support for the Broadcom BCM2835 and BCM2836 SoCs.
  	  This SoC is used in the Raspberry Pi and Roku 2 devices.
 diff --git a/drivers/pci/controller/Kconfig b/drivers/pci/controller/Kconfig
-index e57bbd0ec9a71..650b3b56153cb 100644
+index e57bbd0ec9a7..650b3b56153c 100644
 --- a/drivers/pci/controller/Kconfig
 +++ b/drivers/pci/controller/Kconfig
 @@ -290,9 +290,9 @@ config PCI_HYPERV_INTERFACE
@@ -324142,7 +324157,7 @@ Signed-off-by: Eric Anholt <eric@anholt.net>
  1 file changed, 13 insertions(+), 9 deletions(-)
 
 diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c
-index b83a963eceab6..47ead0f239d68 100644
+index b83a963eceab..47ead0f239d6 100644
 --- a/drivers/clk/bcm/clk-bcm2835.c
 +++ b/drivers/clk/bcm/clk-bcm2835.c
 @@ -1114,15 +1114,19 @@ static int bcm2835_clock_set_rate(struct clk_hw *hw,
@@ -324202,7 +324217,7 @@ Signed-off-by: Eric Anholt <eric@anholt.net>
  1 file changed, 16 insertions(+), 3 deletions(-)
 
 diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c
-index 47ead0f239d68..079748e686863 100644
+index 47ead0f239d6..079748e68686 100644
 --- a/drivers/clk/bcm/clk-bcm2835.c
 +++ b/drivers/clk/bcm/clk-bcm2835.c
 @@ -1103,8 +1103,10 @@ static int bcm2835_clock_on(struct clk_hw *hw)
@@ -324291,7 +324306,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
  4 files changed, 34 insertions(+)
 
 diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
-index d0f45600b6698..4d6cff941445c 100644
+index d0f45600b669..4d6cff941445 100644
 --- a/drivers/usb/core/hcd.c
 +++ b/drivers/usb/core/hcd.c
 @@ -1941,6 +1941,16 @@ int usb_hcd_alloc_bandwidth(struct usb_device *udev,
@@ -324312,7 +324327,7 @@ index d0f45600b6698..4d6cff941445c 100644
   * endpoint state is gone from hardware.  usb_hcd_flush_endpoint() must
   * have been called previously.  Use for set_configuration, set_interface,
 diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
-index 61d9e2a1a4e5a..9940558a0c038 100644
+index 61d9e2a1a4e5..9940558a0c03 100644
 --- a/drivers/usb/core/message.c
 +++ b/drivers/usb/core/message.c
 @@ -1120,6 +1120,21 @@ static void remove_intf_ep_devs(struct usb_interface *intf)
@@ -324338,7 +324353,7 @@ index 61d9e2a1a4e5a..9940558a0c038 100644
   * usb_disable_endpoint -- Disable an endpoint by address
   * @dev: the device whose endpoint is being disabled
 diff --git a/include/linux/usb.h b/include/linux/usb.h
-index e656e7b4b1e44..3ac4b26b12fff 100644
+index e656e7b4b1e4..3ac4b26b12ff 100644
 --- a/include/linux/usb.h
 +++ b/include/linux/usb.h
 @@ -1816,6 +1816,8 @@ extern int usb_clear_halt(struct usb_device *dev, int pipe);
@@ -324351,7 +324366,7 @@ index e656e7b4b1e44..3ac4b26b12fff 100644
  /* this request isn't really synchronous, but it belongs with the others */
  extern int usb_driver_set_configuration(struct usb_device *udev, int config);
 diff --git a/include/linux/usb/hcd.h b/include/linux/usb/hcd.h
-index 712b2a603645f..879b59e4f013c 100644
+index 712b2a603645..879b59e4f013 100644
 --- a/include/linux/usb/hcd.h
 +++ b/include/linux/usb/hcd.h
 @@ -382,6 +382,11 @@ struct hc_driver {
@@ -324395,10 +324410,10 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
  1 file changed, 98 insertions(+)
 
 diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
-index e89229a6bc24a..4b1893a44d23a 100644
+index a946c9e01af5..4c403f1005f5 100644
 --- a/drivers/usb/host/xhci.c
 +++ b/drivers/usb/host/xhci.c
-@@ -1463,6 +1463,103 @@ static int xhci_check_maxpacket(struct xhci_hcd *xhci, unsigned int slot_id,
+@@ -1467,6 +1467,103 @@ static int xhci_check_maxpacket(struct xhci_hcd *xhci, unsigned int slot_id,
  	return ret;
  }
  
@@ -324502,7 +324517,7 @@ index e89229a6bc24a..4b1893a44d23a 100644
  /*
   * non-error returns are a promise to giveback() the urb later
   * we drop ownership so next owner (or urb unlink) can get it
-@@ -5345,6 +5442,7 @@ static const struct hc_driver xhci_hc_driver = {
+@@ -5357,6 +5454,7 @@ static const struct hc_driver xhci_hc_driver = {
  	.endpoint_reset =	xhci_endpoint_reset,
  	.check_bandwidth =	xhci_check_bandwidth,
  	.reset_bandwidth =	xhci_reset_bandwidth,
@@ -324528,7 +324543,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
  1 file changed, 1 insertion(+)
 
 diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c
-index ce8ef69307951..4b73a15fdfae3 100644
+index c5251b01f619..80b8b0e8c461 100644
 --- a/drivers/hid/usbhid/hid-core.c
 +++ b/drivers/hid/usbhid/hid-core.c
 @@ -1128,6 +1128,7 @@ static int usbhid_start(struct hid_device *hid)
@@ -324554,7 +324569,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  1 file changed, 1 insertion(+)
 
 diff --git a/arch/arm/mach-bcm/board_bcm2835.c b/arch/arm/mach-bcm/board_bcm2835.c
-index 7d59a93641757..282a023027fc0 100644
+index 7d59a9364175..282a023027fc 100644
 --- a/arch/arm/mach-bcm/board_bcm2835.c
 +++ b/arch/arm/mach-bcm/board_bcm2835.c
 @@ -109,6 +109,7 @@ static const char * const bcm2835_compat[] = {
@@ -324580,7 +324595,7 @@ Signed-off-by: Eric Anholt <eric@anholt.net>
  1 file changed, 3 insertions(+)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_kms.c b/drivers/gpu/drm/vc4/vc4_kms.c
-index 57124fe942472..92aafec3d57af 100644
+index 57124fe94247..92aafec3d57a 100644
 --- a/drivers/gpu/drm/vc4/vc4_kms.c
 +++ b/drivers/gpu/drm/vc4/vc4_kms.c
 @@ -116,6 +116,9 @@ vc4_ctm_commit(struct vc4_dev *vc4, struct drm_atomic_state *state)
@@ -324608,7 +324623,7 @@ Signed-off-by: Eric Anholt <eric@anholt.net>
  1 file changed, 1 insertion(+)
 
 diff --git a/drivers/gpu/drm/v3d/v3d_drv.c b/drivers/gpu/drm/v3d/v3d_drv.c
-index 3506ae2723ae1..cb60018f799ea 100644
+index 3506ae2723ae..cb60018f799e 100644
 --- a/drivers/gpu/drm/v3d/v3d_drv.c
 +++ b/drivers/gpu/drm/v3d/v3d_drv.c
 @@ -221,6 +221,7 @@ static struct drm_driver v3d_drm_driver = {
@@ -324640,7 +324655,7 @@ Signed-off-by: Eric Anholt <eric@anholt.net>
  1 file changed, 13 insertions(+)
 
 diff --git a/drivers/gpu/drm/v3d/v3d_mmu.c b/drivers/gpu/drm/v3d/v3d_mmu.c
-index 395e81d971632..6cc67cab320ea 100644
+index 395e81d97163..6cc67cab320e 100644
 --- a/drivers/gpu/drm/v3d/v3d_mmu.c
 +++ b/drivers/gpu/drm/v3d/v3d_mmu.c
 @@ -18,6 +18,8 @@
@@ -324697,7 +324712,7 @@ Signed-off-by: Eric Anholt <eric@anholt.net>
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/gpu/drm/v3d/v3d_drv.c b/drivers/gpu/drm/v3d/v3d_drv.c
-index cb60018f799ea..d225152e7e36e 100644
+index cb60018f799e..d225152e7e36 100644
 --- a/drivers/gpu/drm/v3d/v3d_drv.c
 +++ b/drivers/gpu/drm/v3d/v3d_drv.c
 @@ -69,7 +69,7 @@ static int v3d_runtime_resume(struct device *dev)
@@ -324738,7 +324753,7 @@ Signed-off-by: Eric Anholt <eric@anholt.net>
  1 file changed, 3 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
-index 85e273665836d..ee0e6afa211b9 100644
+index 85e273665836..ee0e6afa211b 100644
 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 @@ -15,6 +15,7 @@
@@ -324789,7 +324804,7 @@ Signed-off-by: Eric Anholt <eric@anholt.net>
  1 file changed, 32 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
-index ee0e6afa211b9..93bf71f983139 100644
+index ee0e6afa211b..93bf71f98313 100644
 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 @@ -281,6 +281,27 @@ static void vc4_plane_destroy(struct drm_plane *plane)
@@ -324876,7 +324891,7 @@ Signed-off-by: Eric Anholt <eric@anholt.net>
  2 files changed, 7 insertions(+), 3 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c
-index 7b22d4f2ae573..f1f0a7c877713 100644
+index 7b22d4f2ae57..f1f0a7c87771 100644
 --- a/drivers/gpu/drm/vc4/vc4_crtc.c
 +++ b/drivers/gpu/drm/vc4/vc4_crtc.c
 @@ -97,9 +97,6 @@ bool vc4_crtc_get_scanoutpos(struct drm_device *dev, unsigned int crtc_id,
@@ -324890,7 +324905,7 @@ index 7b22d4f2ae573..f1f0a7c877713 100644
  
  	/* Get optional system timestamp before query. */
 diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
-index 93bf71f983139..eb5eb67b70f5d 100644
+index 93bf71f98313..eb5eb67b70f5 100644
 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 @@ -20,6 +20,7 @@
@@ -324937,7 +324952,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  1 file changed, 57 insertions(+), 52 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
-index eb5eb67b70f5d..512036c82db0a 100644
+index eb5eb67b70f5..512036c82db0 100644
 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 @@ -30,6 +30,25 @@
@@ -325125,7 +325140,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  create mode 100644 drivers/gpu/drm/vc4/vc_image_types.h
 
 diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
-index 512036c82db0a..54bb885a86dc2 100644
+index 512036c82db0..54bb885a86dc 100644
 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 @@ -28,8 +28,46 @@
@@ -325792,7 +325807,7 @@ index 512036c82db0a..54bb885a86dc2 100644
  		dev_err(dev, "failed to construct cursor plane\n");
  		ret = PTR_ERR(cursor_plane);
 diff --git a/drivers/gpu/drm/vc4/vc4_kms.c b/drivers/gpu/drm/vc4/vc4_kms.c
-index 92aafec3d57af..cd37209694428 100644
+index 92aafec3d57a..cd3720969442 100644
 --- a/drivers/gpu/drm/vc4/vc4_kms.c
 +++ b/drivers/gpu/drm/vc4/vc4_kms.c
 @@ -542,6 +542,7 @@ int vc4_kms_load(struct drm_device *dev)
@@ -325805,7 +325820,7 @@ index 92aafec3d57af..cd37209694428 100644
  
 diff --git a/drivers/gpu/drm/vc4/vc_image_types.h b/drivers/gpu/drm/vc4/vc_image_types.h
 new file mode 100644
-index 0000000000000..669a70fdb8913
+index 000000000000..669a70fdb891
 --- /dev/null
 +++ b/drivers/gpu/drm/vc4/vc_image_types.h
 @@ -0,0 +1,143 @@
@@ -325953,7 +325968,7 @@ index 0000000000000..669a70fdb8913
 +	VC_IMAGE_FORCE_ENUM_16BIT = 0xffff,
 +};
 diff --git a/include/soc/bcm2835/raspberrypi-firmware.h b/include/soc/bcm2835/raspberrypi-firmware.h
-index 9c6027fc25dae..f0c15eefa3aa2 100644
+index 9c6027fc25da..f0c15eefa3aa 100644
 --- a/include/soc/bcm2835/raspberrypi-firmware.h
 +++ b/include/soc/bcm2835/raspberrypi-firmware.h
 @@ -147,6 +147,8 @@ enum rpi_firmware_property_tag {
@@ -325983,7 +325998,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_kms.c b/drivers/gpu/drm/vc4/vc4_kms.c
-index cd37209694428..9e20e1ac77f8a 100644
+index cd3720969442..9e20e1ac77f8 100644
 --- a/drivers/gpu/drm/vc4/vc4_kms.c
 +++ b/drivers/gpu/drm/vc4/vc4_kms.c
 @@ -536,8 +536,8 @@ int vc4_kms_load(struct drm_device *dev)
@@ -326016,7 +326031,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  1 file changed, 113 insertions(+), 49 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
-index 54bb885a86dc2..d8e278a0b7892 100644
+index 54bb885a86dc..d8e278a0b789 100644
 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 @@ -31,6 +31,8 @@
@@ -326300,7 +326315,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  1 file changed, 2 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
-index d8e278a0b7892..b952f27e41682 100644
+index d8e278a0b789..b952f27e4168 100644
 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 @@ -933,8 +933,6 @@ static int vc4_fkms_create_screen(struct device *dev, struct drm_device *drm,
@@ -326330,7 +326345,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  1 file changed, 14 insertions(+), 4 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
-index b952f27e41682..099124575435b 100644
+index b952f27e4168..099124575435 100644
 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 @@ -89,6 +89,13 @@ struct fb_alloc_tags {
@@ -326390,7 +326405,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  1 file changed, 19 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
-index 099124575435b..1155680fdfc69 100644
+index 099124575435..1155680fdfc6 100644
 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 @@ -70,25 +70,6 @@ struct mailbox_set_plane {
@@ -326440,7 +326455,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  2 files changed, 14 insertions(+), 3 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
-index 1155680fdfc69..38b09f5ad2b27 100644
+index 1155680fdfc6..38b09f5ad2b2 100644
 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 @@ -944,7 +944,7 @@ static int vc4_fkms_bind(struct device *dev, struct device *master, void *data)
@@ -326474,7 +326489,7 @@ index 1155680fdfc69..38b09f5ad2b27 100644
  		if (ret)
  			DRM_ERROR("Oh dear, failed to create display %u\n",
 diff --git a/include/soc/bcm2835/raspberrypi-firmware.h b/include/soc/bcm2835/raspberrypi-firmware.h
-index f0c15eefa3aa2..10f5dc53fd34d 100644
+index f0c15eefa3aa..10f5dc53fd34 100644
 --- a/include/soc/bcm2835/raspberrypi-firmware.h
 +++ b/include/soc/bcm2835/raspberrypi-firmware.h
 @@ -114,6 +114,7 @@ enum rpi_firmware_property_tag {
@@ -326504,7 +326519,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  1 file changed, 27 insertions(+), 10 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
-index 38b09f5ad2b27..b15c001621d84 100644
+index 38b09f5ad2b2..b15c001621d8 100644
 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 @@ -77,6 +77,13 @@ struct mailbox_blank_display {
@@ -326616,7 +326631,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  1 file changed, 7 insertions(+)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
-index b15c001621d84..b86c9d98df4d5 100644
+index b15c001621d8..b86c9d98df4d 100644
 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 @@ -21,6 +21,7 @@
@@ -326674,7 +326689,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  1 file changed, 36 insertions(+)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
-index b86c9d98df4d5..bb98a8a71555b 100644
+index b86c9d98df4d..bb98a8a71555 100644
 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 @@ -64,8 +64,21 @@ struct set_plane {
@@ -326768,7 +326783,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  2 files changed, 21 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_drv.h b/drivers/gpu/drm/vc4/vc4_drv.h
-index fbcdb44ccf010..b582ed26924f3 100644
+index fbcdb44ccf01..b582ed26924f 100644
 --- a/drivers/gpu/drm/vc4/vc4_drv.h
 +++ b/drivers/gpu/drm/vc4/vc4_drv.h
 @@ -795,7 +795,6 @@ extern const struct dma_fence_ops vc4_fence_ops;
@@ -326780,7 +326795,7 @@ index fbcdb44ccf010..b582ed26924f3 100644
  /* vc4_gem.c */
  void vc4_gem_init(struct drm_device *dev);
 diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
-index bb98a8a71555b..fe966ebb045af 100644
+index bb98a8a71555..fe966ebb045a 100644
 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 @@ -741,26 +741,6 @@ static const struct drm_crtc_helper_funcs vc4_crtc_helper_funcs = {
@@ -326828,7 +326843,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  1 file changed, 11 insertions(+), 9 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
-index fe966ebb045af..81afd7782f65e 100644
+index fe966ebb045a..81afd7782f65 100644
 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 @@ -600,6 +600,8 @@ static void vc4_crtc_mode_set_nofb(struct drm_crtc *crtc)
@@ -326891,7 +326906,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  1 file changed, 13 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
-index 81afd7782f65e..97ab24d0cbde4 100644
+index 81afd7782f65..97ab24d0cbde 100644
 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 @@ -627,7 +627,17 @@ static void vc4_crtc_enable(struct drm_crtc *crtc, struct drm_crtc_state *old_st
@@ -326945,7 +326960,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_kms.c b/drivers/gpu/drm/vc4/vc4_kms.c
-index 9e20e1ac77f8a..8b4bec771a146 100644
+index 9e20e1ac77f8..8b4bec771a14 100644
 --- a/drivers/gpu/drm/vc4/vc4_kms.c
 +++ b/drivers/gpu/drm/vc4/vc4_kms.c
 @@ -536,8 +536,8 @@ int vc4_kms_load(struct drm_device *dev)
@@ -326979,7 +326994,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  2 files changed, 302 insertions(+), 34 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
-index 97ab24d0cbde4..e4b978ce85efd 100644
+index 97ab24d0cbde..e4b978ce85ef 100644
 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 @@ -91,11 +91,60 @@ struct mailbox_blank_display {
@@ -327505,7 +327520,7 @@ index 97ab24d0cbde4..e4b978ce85efd 100644
  		ret = PTR_ERR(vc4_crtc->connector);
  		goto err_destroy_encoder;
 diff --git a/include/soc/bcm2835/raspberrypi-firmware.h b/include/soc/bcm2835/raspberrypi-firmware.h
-index 10f5dc53fd34d..1a5dd091dfd96 100644
+index 10f5dc53fd34..1a5dd091dfd9 100644
 --- a/include/soc/bcm2835/raspberrypi-firmware.h
 +++ b/include/soc/bcm2835/raspberrypi-firmware.h
 @@ -75,6 +75,7 @@ enum rpi_firmware_property_tag {
@@ -327546,7 +327561,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  1 file changed, 15 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
-index e4b978ce85efd..71889e0e334aa 100644
+index e4b978ce85ef..71889e0e334a 100644
 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 @@ -235,7 +235,6 @@ struct vc4_crtc {
@@ -327603,7 +327618,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  1 file changed, 3 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
-index 71889e0e334aa..b18cb9d5e3456 100644
+index 71889e0e334a..b18cb9d5e345 100644
 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 @@ -687,12 +687,13 @@ static void vc4_crtc_mode_set_nofb(struct drm_crtc *crtc)
@@ -327641,7 +327656,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
-index b18cb9d5e3456..9fbdcd3538b31 100644
+index b18cb9d5e345..9fbdcd3538b3 100644
 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 @@ -1005,7 +1005,7 @@ static const struct drm_display_mode lcd_mode = {
@@ -327676,7 +327691,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  2 files changed, 49 insertions(+), 16 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
-index 9fbdcd3538b31..0b0a155bc3b56 100644
+index 9fbdcd3538b3..0b0a155bc3b5 100644
 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 @@ -248,7 +248,6 @@ static inline struct vc4_crtc *to_vc4_crtc(struct drm_crtc *crtc)
@@ -327788,7 +327803,7 @@ index 9fbdcd3538b31..0b0a155bc3b56 100644
  		DRM_ERROR("Failed to create a new display mode\n");
  		return -ENOMEM;
 diff --git a/include/soc/bcm2835/raspberrypi-firmware.h b/include/soc/bcm2835/raspberrypi-firmware.h
-index 1a5dd091dfd96..ca1344c957eae 100644
+index 1a5dd091dfd9..ca1344c957ea 100644
 --- a/include/soc/bcm2835/raspberrypi-firmware.h
 +++ b/include/soc/bcm2835/raspberrypi-firmware.h
 @@ -150,6 +150,7 @@ enum rpi_firmware_property_tag {
@@ -327819,7 +327834,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
  1 file changed, 18 insertions(+), 14 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
-index 0b0a155bc3b56..04b929a6cb0fc 100644
+index 0b0a155bc3b5..04b929a6cb0f 100644
 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 @@ -1303,13 +1303,13 @@ static int vc4_fkms_bind(struct device *dev, struct device *master, void *data)
@@ -327890,7 +327905,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  1 file changed, 15 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
-index 04b929a6cb0fc..f1306752da3dc 100644
+index 04b929a6cb0f..f1306752da3d 100644
 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 @@ -128,6 +128,7 @@ struct set_timings {
@@ -327957,7 +327972,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  1 file changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
-index f1306752da3dc..1081878ecfdd7 100644
+index f1306752da3d..1081878ecfdd 100644
 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 @@ -718,19 +718,19 @@ static void vc4_crtc_mode_set_nofb(struct drm_crtc *crtc)
@@ -328004,7 +328019,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
-index 1081878ecfdd7..3b9dc3e892bb7 100644
+index 1081878ecfdd..3b9dc3e892bb 100644
 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 @@ -546,7 +546,6 @@ static bool vc4_fkms_format_mod_supported(struct drm_plane *plane,
@@ -328054,7 +328069,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  3 files changed, 50 insertions(+)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_drv.h b/drivers/gpu/drm/vc4/vc4_drv.h
-index b582ed26924f3..308f0473592a6 100644
+index b582ed26924f..308f0473592a 100644
 --- a/drivers/gpu/drm/vc4/vc4_drv.h
 +++ b/drivers/gpu/drm/vc4/vc4_drv.h
 @@ -81,6 +81,7 @@ struct vc4_dev {
@@ -328066,7 +328081,7 @@ index b582ed26924f3..308f0473592a6 100644
  	struct vc4_hang_state *hang_state;
  
 diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
-index 3b9dc3e892bb7..cb2f24dece9f5 100644
+index 3b9dc3e892bb..cb2f24dece9f 100644
 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 @@ -32,6 +32,14 @@
@@ -328165,7 +328180,7 @@ index 3b9dc3e892bb7..cb2f24dece9f5 100644
  
  	return 0;
 diff --git a/include/soc/bcm2835/raspberrypi-firmware.h b/include/soc/bcm2835/raspberrypi-firmware.h
-index ca1344c957eae..102c2e5dd2f2c 100644
+index ca1344c957ea..102c2e5dd2f2 100644
 --- a/include/soc/bcm2835/raspberrypi-firmware.h
 +++ b/include/soc/bcm2835/raspberrypi-firmware.h
 @@ -152,6 +152,7 @@ enum rpi_firmware_property_tag {
@@ -328200,7 +328215,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  1 file changed, 9 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_kms.c b/drivers/gpu/drm/vc4/vc4_kms.c
-index 8b4bec771a146..7e31e2ca726c1 100644
+index 8b4bec771a14..7e31e2ca726c 100644
 --- a/drivers/gpu/drm/vc4/vc4_kms.c
 +++ b/drivers/gpu/drm/vc4/vc4_kms.c
 @@ -18,6 +18,7 @@
@@ -328246,7 +328261,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
-index cb2f24dece9f5..339c8768f4464 100644
+index cb2f24dece9f..339c8768f446 100644
 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 @@ -460,10 +460,10 @@ static void vc4_plane_atomic_update(struct drm_plane *plane,
@@ -328281,7 +328296,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  1 file changed, 6 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
-index 339c8768f4464..fdbd1d1cf7965 100644
+index 339c8768f446..fdbd1d1cf796 100644
 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 @@ -831,12 +831,6 @@ vc4_crtc_mode_valid(struct drm_crtc *crtc, const struct drm_display_mode *mode)
@@ -328323,7 +328338,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  1 file changed, 36 insertions(+), 5 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
-index fdbd1d1cf7965..8ca9cb202f5e8 100644
+index fdbd1d1cf796..8ca9cb202f5e 100644
 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 @@ -233,8 +233,13 @@ static const struct vc_image_format *vc4_get_vc_image_fmt(u32 drm_format)
@@ -328408,7 +328423,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
-index 8ca9cb202f5e8..4fd2629e430a3 100644
+index 8ca9cb202f5e..4fd2629e430a 100644
 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 @@ -462,7 +462,7 @@ static void vc4_plane_atomic_update(struct drm_plane *plane,
@@ -328448,7 +328463,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  1 file changed, 4 insertions(+)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
-index 4fd2629e430a3..b97798c823710 100644
+index 4fd2629e430a..b97798c82371 100644
 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 @@ -823,6 +823,10 @@ vc4_crtc_mode_valid(struct drm_crtc *crtc, const struct drm_display_mode *mode)
@@ -328487,7 +328502,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  2 files changed, 3 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c
-index f1f0a7c877713..d00756635257e 100644
+index f1f0a7c87771..d00756635257 100644
 --- a/drivers/gpu/drm/vc4/vc4_crtc.c
 +++ b/drivers/gpu/drm/vc4/vc4_crtc.c
 @@ -801,7 +801,8 @@ static void vc4_crtc_handle_page_flip(struct vc4_crtc *vc4_crtc)
@@ -328501,7 +328516,7 @@ index f1f0a7c877713..d00756635257e 100644
  	spin_unlock_irqrestore(&dev->event_lock, flags);
  }
 diff --git a/drivers/gpu/drm/vc4/vc4_kms.c b/drivers/gpu/drm/vc4/vc4_kms.c
-index 7e31e2ca726c1..1b921e114c034 100644
+index 7e31e2ca726c..1b921e114c03 100644
 --- a/drivers/gpu/drm/vc4/vc4_kms.c
 +++ b/drivers/gpu/drm/vc4/vc4_kms.c
 @@ -156,7 +156,7 @@ vc4_atomic_complete_commit(struct drm_atomic_state *state)
@@ -328529,7 +328544,7 @@ Signed-off-by: Chris G Miller <chris@creative-electronics.net>
  1 file changed, 24 insertions(+), 11 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_dsi.c b/drivers/gpu/drm/vc4/vc4_dsi.c
-index c78fa8144776e..3448b314d3617 100644
+index c78fa8144776..3448b314d361 100644
 --- a/drivers/gpu/drm/vc4/vc4_dsi.c
 +++ b/drivers/gpu/drm/vc4/vc4_dsi.c
 @@ -1485,9 +1485,11 @@ static int vc4_dsi_bind(struct device *dev, struct device *master, void *data)
@@ -328674,7 +328689,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  2 files changed, 59 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
-index b97798c823710..862e89b8c4789 100644
+index b97798c82371..862e89b8c478 100644
 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 @@ -69,7 +69,7 @@ struct set_plane {
@@ -328731,7 +328746,7 @@ index b97798c823710..862e89b8c4789 100644
  	/*
  	 * Default frame buffer setup is with FB on -127, and raspistill etc
 diff --git a/drivers/gpu/drm/vc4/vc_image_types.h b/drivers/gpu/drm/vc4/vc_image_types.h
-index 669a70fdb8913..0bdffe5dd1e9a 100644
+index 669a70fdb891..0bdffe5dd1e9 100644
 --- a/drivers/gpu/drm/vc4/vc_image_types.h
 +++ b/drivers/gpu/drm/vc4/vc_image_types.h
 @@ -4,6 +4,8 @@
@@ -328812,7 +328827,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  1 file changed, 6 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
-index ba2029bf1e639..83676bc79a195 100644
+index ba2029bf1e63..83676bc79a19 100644
 --- a/drivers/tty/serial/amba-pl011.c
 +++ b/drivers/tty/serial/amba-pl011.c
 @@ -270,6 +270,7 @@ struct uart_amba_port {
@@ -328892,10 +328907,10 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
  3 files changed, 29 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c
-index c0e1c321bb6b3..7797980a99aed 100644
+index eaf13f6d8883..0f2aee679572 100644
 --- a/drivers/usb/host/xhci-pci.c
 +++ b/drivers/usb/host/xhci-pci.c
-@@ -256,8 +256,10 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci)
+@@ -258,8 +258,10 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci)
  		xhci->quirks |= XHCI_BROKEN_STREAMS;
  
  	if (pdev->vendor == PCI_VENDOR_ID_VIA &&
@@ -328908,7 +328923,7 @@ index c0e1c321bb6b3..7797980a99aed 100644
  	if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA &&
  		pdev->device == PCI_DEVICE_ID_ASMEDIA_1042_XHCI)
 diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
-index f6b5010deb735..5ef6d94ecd0f7 100644
+index f6b5010deb73..5ef6d94ecd0f 100644
 --- a/drivers/usb/host/xhci-ring.c
 +++ b/drivers/usb/host/xhci-ring.c
 @@ -527,7 +527,10 @@ void xhci_find_new_dequeue_state(struct xhci_hcd *xhci,
@@ -328953,7 +328968,7 @@ index f6b5010deb735..5ef6d94ecd0f7 100644
  
  	/*
 diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
-index 8798ed0317864..2f4933b2b84ca 100644
+index 8798ed031786..2f4933b2b84c 100644
 --- a/drivers/usb/host/xhci.h
 +++ b/drivers/usb/host/xhci.h
 @@ -1873,6 +1873,7 @@ struct xhci_hcd {
@@ -328988,7 +329003,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  1 file changed, 12 insertions(+)
 
 diff --git a/drivers/i2c/busses/i2c-bcm2835.c b/drivers/i2c/busses/i2c-bcm2835.c
-index beb67afa6a3c6..9f4f4964a5076 100644
+index beb67afa6a3c..9f4f4964a507 100644
 --- a/drivers/i2c/busses/i2c-bcm2835.c
 +++ b/drivers/i2c/busses/i2c-bcm2835.c
 @@ -188,6 +188,7 @@ static int clk_bcm2835_i2c_set_rate(struct clk_hw *hw, unsigned long rate,
@@ -329036,7 +329051,7 @@ Signed-off-by: Andrei Gherzan <andrei@balena.io>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c
-index cbcac03c0e0da..1898739ec5b79 100644
+index cbcac03c0e0d..1898739ec5b7 100644
 --- a/arch/arm64/mm/init.c
 +++ b/arch/arm64/mm/init.c
 @@ -171,7 +171,7 @@ static void __init reserve_elfcorehdr(void)
@@ -329072,7 +329087,7 @@ Signed-off-by: Marek Behún <marek.behun@nic.cz>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/staging/vc04_services/bcm2835-codec/Makefile b/drivers/staging/vc04_services/bcm2835-codec/Makefile
-index 5820ec1f89ece..7fb908d824b2f 100644
+index 5820ec1f89ec..7fb908d824b2 100644
 --- a/drivers/staging/vc04_services/bcm2835-codec/Makefile
 +++ b/drivers/staging/vc04_services/bcm2835-codec/Makefile
 @@ -4,5 +4,5 @@ bcm2835-codec-objs := bcm2835-v4l2-codec.o
@@ -329104,7 +329119,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  4 files changed, 369 insertions(+), 126 deletions(-)
 
 diff --git a/drivers/dma/bcm2835-dma.c b/drivers/dma/bcm2835-dma.c
-index f59b099233dc0..87fd58272e95f 100644
+index f59b099233dc..87fd58272e95 100644
 --- a/drivers/dma/bcm2835-dma.c
 +++ b/drivers/dma/bcm2835-dma.c
 @@ -38,6 +38,11 @@
@@ -329850,7 +329865,7 @@ index f59b099233dc0..87fd58272e95f 100644
  
  	return 0;
 diff --git a/drivers/pci/controller/pcie-brcmstb-bounce.c b/drivers/pci/controller/pcie-brcmstb-bounce.c
-index d8007631a54cf..fa81a98f6a813 100644
+index d8007631a54c..fa81a98f6a81 100644
 --- a/drivers/pci/controller/pcie-brcmstb-bounce.c
 +++ b/drivers/pci/controller/pcie-brcmstb-bounce.c
 @@ -91,7 +91,7 @@ struct dmabounce_device_info {
@@ -329935,7 +329950,7 @@ index d8007631a54cf..fa81a98f6a813 100644
  MODULE_AUTHOR("Phil Elwell <phil@raspberrypi.org>");
  MODULE_DESCRIPTION("Dedicate DMA bounce support for pcie-brcmstb");
 diff --git a/drivers/pci/controller/pcie-brcmstb-bounce.h b/drivers/pci/controller/pcie-brcmstb-bounce.h
-index 5d07f679dc71b..2fe20a14d0352 100644
+index 5d07f679dc71..2fe20a14d035 100644
 --- a/drivers/pci/controller/pcie-brcmstb-bounce.h
 +++ b/drivers/pci/controller/pcie-brcmstb-bounce.h
 @@ -8,21 +8,26 @@
@@ -329974,7 +329989,7 @@ index 5d07f679dc71b..2fe20a14d0352 100644
  	return 0;
  }
 diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c
-index 782725e3adad5..746cfb405ad38 100644
+index 782725e3adad..746cfb405ad3 100644
 --- a/drivers/pci/controller/pcie-brcmstb.c
 +++ b/drivers/pci/controller/pcie-brcmstb.c
 @@ -644,6 +644,7 @@ static void brcm_set_dma_ops(struct device *dev)
@@ -330055,7 +330070,7 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
  1 file changed, 5 insertions(+), 3 deletions(-)
 
 diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c
-index 079748e686863..f1d73d83ee16b 100644
+index 079748e68686..f1d73d83ee16 100644
 --- a/drivers/clk/bcm/clk-bcm2835.c
 +++ b/drivers/clk/bcm/clk-bcm2835.c
 @@ -2280,9 +2280,11 @@ static bool bcm2835_clk_is_claimed(const char *name)
@@ -330093,7 +330108,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c
-index 746cfb405ad38..87fd40ae31400 100644
+index 746cfb405ad3..87fd40ae3140 100644
 --- a/drivers/pci/controller/pcie-brcmstb.c
 +++ b/drivers/pci/controller/pcie-brcmstb.c
 @@ -665,8 +665,8 @@ static int brcmstb_platform_notifier(struct notifier_block *nb,
@@ -330130,7 +330145,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  1 file changed, 32 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
-index 862e89b8c4789..ff96ba01144d6 100644
+index 862e89b8c478..ff96ba01144d 100644
 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 @@ -561,6 +561,20 @@ static int vc4_plane_atomic_check(struct drm_plane *plane,
@@ -330205,7 +330220,7 @@ Signed-off-by: Hui Wang <hui.wang@canonical.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/Makefile b/drivers/net/wireless/realtek/rtl8192cu/Makefile
-index c399011a3e377..ef6156c0f3687 100644
+index c399011a3e37..ef6156c0f368 100644
 --- a/drivers/net/wireless/realtek/rtl8192cu/Makefile
 +++ b/drivers/net/wireless/realtek/rtl8192cu/Makefile
 @@ -16,7 +16,7 @@ EXTRA_CFLAGS += -Wno-unused
@@ -330239,7 +330254,7 @@ Signed-off-by: Eric Anholt <eric@anholt.net>
  2 files changed, 1 insertion(+), 24 deletions(-)
 
 diff --git a/drivers/gpu/drm/v3d/v3d_debugfs.c b/drivers/gpu/drm/v3d/v3d_debugfs.c
-index 9e953ce64ef75..449317371795e 100644
+index 9e953ce64ef7..449317371795 100644
 --- a/drivers/gpu/drm/v3d/v3d_debugfs.c
 +++ b/drivers/gpu/drm/v3d/v3d_debugfs.c
 @@ -4,7 +4,6 @@
@@ -330295,7 +330310,7 @@ index 9e953ce64ef75..449317371795e 100644
  	return 0;
  }
 diff --git a/drivers/gpu/drm/v3d/v3d_drv.c b/drivers/gpu/drm/v3d/v3d_drv.c
-index d225152e7e36e..15a5f92aa7b4e 100644
+index d225152e7e36..15a5f92aa7b4 100644
 --- a/drivers/gpu/drm/v3d/v3d_drv.c
 +++ b/drivers/gpu/drm/v3d/v3d_drv.c
 @@ -78,7 +78,6 @@ static int v3d_get_param_ioctl(struct drm_device *dev, void *data,
@@ -330354,7 +330369,7 @@ Signed-off-by: Eric Anholt <eric@anholt.net>
  3 files changed, 72 insertions(+), 5 deletions(-)
 
 diff --git a/drivers/gpu/drm/v3d/v3d_drv.c b/drivers/gpu/drm/v3d/v3d_drv.c
-index 15a5f92aa7b4e..00e4419dc208e 100644
+index 15a5f92aa7b4..00e4419dc208 100644
 --- a/drivers/gpu/drm/v3d/v3d_drv.c
 +++ b/drivers/gpu/drm/v3d/v3d_drv.c
 @@ -282,6 +282,21 @@ static int v3d_platform_drm_probe(struct platform_device *pdev)
@@ -330390,7 +330405,7 @@ index 15a5f92aa7b4e..00e4419dc208e 100644
  
  irq_disable:
 diff --git a/drivers/gpu/drm/v3d/v3d_drv.h b/drivers/gpu/drm/v3d/v3d_drv.h
-index 9a35c555ec522..15bc4e28b6ccd 100644
+index 9a35c555ec52..15bc4e28b6cc 100644
 --- a/drivers/gpu/drm/v3d/v3d_drv.h
 +++ b/drivers/gpu/drm/v3d/v3d_drv.h
 @@ -54,6 +54,12 @@ struct v3d_dev {
@@ -330407,7 +330422,7 @@ index 9a35c555ec522..15bc4e28b6ccd 100644
  
  	/* Virtual and DMA addresses of the single shared page table. */
 diff --git a/drivers/gpu/drm/v3d/v3d_gem.c b/drivers/gpu/drm/v3d/v3d_gem.c
-index 19c092d75266b..28f8eb664a581 100644
+index 19c092d75266..28f8eb664a58 100644
 --- a/drivers/gpu/drm/v3d/v3d_gem.c
 +++ b/drivers/gpu/drm/v3d/v3d_gem.c
 @@ -4,6 +4,7 @@
@@ -330520,7 +330535,7 @@ Subject: [PATCH 0290/1225] According to 5713 pdf doc CLOCK_CTRL is a readonly
  1 file changed, 1 insertion(+), 4 deletions(-)
 
 diff --git a/sound/soc/codecs/tas5713.c b/sound/soc/codecs/tas5713.c
-index 9c1c92e57bbfa..53acd2b355d63 100644
+index 9c1c92e57bbf..53acd2b355d6 100644
 --- a/sound/soc/codecs/tas5713.c
 +++ b/sound/soc/codecs/tas5713.c
 @@ -190,10 +190,6 @@ static int tas5713_probe(struct snd_soc_component *component)
@@ -330563,7 +330578,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  1 file changed, 2 insertions(+)
 
 diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
-index 61a3593cdcfc3..341594ab669f3 100644
+index 61a3593cdcfc..341594ab669f 100644
 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
 +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
 @@ -268,6 +268,8 @@ static void buffer_work_cb(struct work_struct *work)
@@ -330599,7 +330614,7 @@ Signed-off-by: Yaroslav Rosomakho <yaroslavros@gmail.com>
  create mode 100644 drivers/pci/controller/pcie-brcmstb-bounce64.c
 
 diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c
-index 9239416e93d4e..e17e3b2f11c6e 100644
+index 9239416e93d4..e17e3b2f11c6 100644
 --- a/arch/arm64/mm/dma-mapping.c
 +++ b/arch/arm64/mm/dma-mapping.c
 @@ -31,6 +31,35 @@ void arch_dma_prep_coherent(struct page *page, size_t size)
@@ -330639,7 +330654,7 @@ index 9239416e93d4e..e17e3b2f11c6e 100644
  {
  	dev->dma_ops = NULL;
 diff --git a/drivers/pci/controller/Makefile b/drivers/pci/controller/Makefile
-index be98ebfdb1737..d52bf54d579f3 100644
+index be98ebfdb173..d52bf54d579f 100644
 --- a/drivers/pci/controller/Makefile
 +++ b/drivers/pci/controller/Makefile
 @@ -33,6 +33,9 @@ obj-$(CONFIG_PCIE_BRCMSTB) += pcie-brcmstb.o
@@ -330653,7 +330668,7 @@ index be98ebfdb1737..d52bf54d579f3 100644
  obj-$(CONFIG_VMD) += vmd.o
  # pcie-hisi.o quirks are needed even without CONFIG_PCIE_DW
 diff --git a/drivers/pci/controller/pcie-brcmstb-bounce.h b/drivers/pci/controller/pcie-brcmstb-bounce.h
-index 2fe20a14d0352..7caa0781329b5 100644
+index 2fe20a14d035..7caa0781329b 100644
 --- a/drivers/pci/controller/pcie-brcmstb-bounce.h
 +++ b/drivers/pci/controller/pcie-brcmstb-bounce.h
 @@ -6,7 +6,7 @@
@@ -330667,7 +330682,7 @@ index 2fe20a14d0352..7caa0781329b5 100644
  			  dma_addr_t threshold);
 diff --git a/drivers/pci/controller/pcie-brcmstb-bounce64.c b/drivers/pci/controller/pcie-brcmstb-bounce64.c
 new file mode 100644
-index 0000000000000..6a872975ba9e1
+index 000000000000..6a872975ba9e
 --- /dev/null
 +++ b/drivers/pci/controller/pcie-brcmstb-bounce64.c
 @@ -0,0 +1,569 @@
@@ -331241,7 +331256,7 @@ index 0000000000000..6a872975ba9e1
 +MODULE_DESCRIPTION("Dedicate DMA bounce support for pcie-brcmstb");
 +MODULE_LICENSE("GPL");
 diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c
-index 87fd40ae31400..e8c8b355548a5 100644
+index 87fd40ae3140..e8c8b355548a 100644
 --- a/drivers/pci/controller/pcie-brcmstb.c
 +++ b/drivers/pci/controller/pcie-brcmstb.c
 @@ -611,28 +611,6 @@ static const struct dma_map_ops brcm_dma_ops = {
@@ -331321,7 +331336,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  1 file changed, 75 insertions(+), 55 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
-index ff96ba01144d6..3ea7974a4ed3a 100644
+index ff96ba01144d..3ea7974a4ed3 100644
 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 @@ -1066,6 +1066,56 @@ vc4_fkms_connector_detect(struct drm_connector *connector, bool force)
@@ -331508,7 +331523,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
-index 3ea7974a4ed3a..6bf51f45cadbb 100644
+index 3ea7974a4ed3..6bf51f45cadb 100644
 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 @@ -768,8 +768,8 @@ static void vc4_crtc_mode_set_nofb(struct drm_crtc *crtc)
@@ -331550,7 +331565,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  1 file changed, 190 insertions(+), 51 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
-index 6bf51f45cadbb..5526b7dd52ee5 100644
+index 6bf51f45cadb..5526b7dd52ee 100644
 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 @@ -259,6 +259,23 @@ static inline struct vc4_crtc *to_vc4_crtc(struct drm_crtc *crtc)
@@ -331886,7 +331901,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  1 file changed, 1 insertion(+)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
-index 5526b7dd52ee5..653c9f6d5ce5c 100644
+index 5526b7dd52ee..653c9f6d5ce5 100644
 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 @@ -804,6 +804,7 @@ static struct drm_plane *vc4_fkms_plane_init(struct drm_device *dev,
@@ -331916,7 +331931,7 @@ Signed-off-by: Joerg Schambacher joerg@i2audio.com
  create mode 100644 sound/soc/bcm/hifiberry_dacplusadcpro.c
 
 diff --git a/sound/soc/bcm/Kconfig b/sound/soc/bcm/Kconfig
-index e6d1c6b3fb5be..4c38298df04b9 100644
+index e6d1c6b3fb5b..4c38298df04b 100644
 --- a/sound/soc/bcm/Kconfig
 +++ b/sound/soc/bcm/Kconfig
 @@ -38,6 +38,7 @@ config SND_BCM2708_SOC_HIFIBERRY_DACPLUS
@@ -331943,7 +331958,7 @@ index e6d1c6b3fb5be..4c38298df04b9 100644
          tristate "Support for HifiBerry Digi"
          depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
 diff --git a/sound/soc/bcm/Makefile b/sound/soc/bcm/Makefile
-index e0e2645d76584..0e8b60f61b31a 100644
+index e0e2645d7658..0e8b60f61b31 100644
 --- a/sound/soc/bcm/Makefile
 +++ b/sound/soc/bcm/Makefile
 @@ -15,6 +15,7 @@ snd-soc-googlevoicehat-codec-objs := googlevoicehat-codec.o
@@ -331964,7 +331979,7 @@ index e0e2645d76584..0e8b60f61b31a 100644
  obj-$(CONFIG_SND_BCM2708_SOC_RPI_PROTO) += snd-soc-rpi-proto.o
 diff --git a/sound/soc/bcm/hifiberry_dacplusadcpro.c b/sound/soc/bcm/hifiberry_dacplusadcpro.c
 new file mode 100644
-index 0000000000000..ed080b24eb494
+index 000000000000..ed080b24eb49
 --- /dev/null
 +++ b/sound/soc/bcm/hifiberry_dacplusadcpro.c
 @@ -0,0 +1,538 @@
@@ -332527,7 +332542,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
-index 54435b72b7611..d59fd8714c5d8 100644
+index 54435b72b761..d59fd8714c5d 100644
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
 @@ -1066,10 +1066,12 @@ static int vc4_hdmi_audio_init(struct vc4_hdmi *hdmi)
@@ -332563,7 +332578,7 @@ second display is present prior to checking the interrupt flags.
  1 file changed, 10 insertions(+), 7 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
-index 653c9f6d5ce5c..14d660add41c8 100644
+index 653c9f6d5ce5..14d660add41c 100644
 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 @@ -1087,14 +1087,17 @@ static irqreturn_t vc4_crtc_irq_handler(int irq, void *data)
@@ -332618,7 +332633,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
  create mode 100644 drivers/char/broadcom/rpivid-mem.c
 
 diff --git a/drivers/char/broadcom/Kconfig b/drivers/char/broadcom/Kconfig
-index cffd17df6a1b6..6f9b37bf6b8a9 100644
+index cffd17df6a1b..6f9b37bf6b8a 100644
 --- a/drivers/char/broadcom/Kconfig
 +++ b/drivers/char/broadcom/Kconfig
 @@ -49,3 +49,11 @@ config BCM2835_SMI_DEV
@@ -332634,7 +332649,7 @@ index cffd17df6a1b6..6f9b37bf6b8a9 100644
 +		so userspace tools can access the control and status registers of the
 +		Raspberry Pi RPiVid video decoder hardware.
 diff --git a/drivers/char/broadcom/Makefile b/drivers/char/broadcom/Makefile
-index 7d9cb3e0b1c3c..e060265397193 100644
+index 7d9cb3e0b1c3..e06026539719 100644
 --- a/drivers/char/broadcom/Makefile
 +++ b/drivers/char/broadcom/Makefile
 @@ -4,3 +4,4 @@ obj-$(CONFIG_BCM_VC_SM)         += vc_sm/
@@ -332644,7 +332659,7 @@ index 7d9cb3e0b1c3c..e060265397193 100644
 +obj-$(CONFIG_RPIVID_MEM)	+= rpivid-mem.o
 diff --git a/drivers/char/broadcom/rpivid-mem.c b/drivers/char/broadcom/rpivid-mem.c
 new file mode 100644
-index 0000000000000..e4e5fb1fb8209
+index 000000000000..e4e5fb1fb820
 --- /dev/null
 +++ b/drivers/char/broadcom/rpivid-mem.c
 @@ -0,0 +1,286 @@
@@ -332935,7 +332950,7 @@ index 0000000000000..e4e5fb1fb8209
 +MODULE_DESCRIPTION("Driver for accessing RPiVid decoder registers from userspace");
 +MODULE_AUTHOR("Jonathan Bell <jonathan@raspberrypi.org>");
 diff --git a/drivers/mfd/bcm2835-pm.c b/drivers/mfd/bcm2835-pm.c
-index ab1e9cbc50b1b..f66f92fe28c34 100644
+index ab1e9cbc50b1..f66f92fe28c3 100644
 --- a/drivers/mfd/bcm2835-pm.c
 +++ b/drivers/mfd/bcm2835-pm.c
 @@ -50,14 +50,14 @@ static int bcm2835_pm_probe(struct platform_device *pdev)
@@ -332960,7 +332975,7 @@ index ab1e9cbc50b1b..f66f92fe28c34 100644
  	}
  
 diff --git a/drivers/soc/bcm/bcm2835-power.c b/drivers/soc/bcm/bcm2835-power.c
-index c0618a9c26fac..6059210170bc6 100644
+index c0618a9c26fa..6059210170bc 100644
 --- a/drivers/soc/bcm/bcm2835-power.c
 +++ b/drivers/soc/bcm/bcm2835-power.c
 @@ -637,15 +637,15 @@ static int bcm2835_power_probe(struct platform_device *pdev)
@@ -332983,7 +332998,7 @@ index c0618a9c26fac..6059210170bc6 100644
  	}
  
 diff --git a/include/linux/mfd/bcm2835-pm.h b/include/linux/mfd/bcm2835-pm.h
-index b2d157091e12b..f70a810c55f7d 100644
+index b2d157091e12..f70a810c55f7 100644
 --- a/include/linux/mfd/bcm2835-pm.h
 +++ b/include/linux/mfd/bcm2835-pm.h
 @@ -9,7 +9,7 @@ struct bcm2835_pm {
@@ -333023,7 +333038,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
  2 files changed, 8 insertions(+)
 
 diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
-index d004f5645b30c..0c0cb398bdcda 100644
+index 6ed6158d4f73..5843aa38f4e4 100644
 --- a/drivers/hid/hid-ids.h
 +++ b/drivers/hid/hid-ids.h
 @@ -223,6 +223,9 @@
@@ -333036,7 +333051,7 @@ index d004f5645b30c..0c0cb398bdcda 100644
  #define USB_VENDOR_ID_BELKIN		0x050d
  #define USB_DEVICE_ID_FLIP_KVM		0x3201
  
-@@ -1257,6 +1260,9 @@
+@@ -1261,6 +1264,9 @@
  #define USB_VENDOR_ID_XAT	0x2505
  #define USB_DEVICE_ID_XAT_CSR	0x0220
  
@@ -333047,7 +333062,7 @@ index d004f5645b30c..0c0cb398bdcda 100644
  #define USB_DEVICE_ID_XIN_MO_DUAL_ARCADE	0x05e1
  #define USB_DEVICE_ID_THT_2P_ARCADE		0x75e1
 diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c
-index f35d919c4ebab..10d5a2943a3b7 100644
+index efc9d0d28170..2e56bf39b370 100644
 --- a/drivers/hid/hid-quirks.c
 +++ b/drivers/hid/hid-quirks.c
 @@ -41,6 +41,7 @@ static const struct hid_device_id hid_quirks[] = {
@@ -333058,7 +333073,7 @@ index f35d919c4ebab..10d5a2943a3b7 100644
  	{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_MULTI_TOUCH), HID_QUIRK_MULTI_INPUT },
  	{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_PIXART_USB_OPTICAL_MOUSE), HID_QUIRK_ALWAYS_POLL },
  	{ HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_PIXART_USB_OPTICAL_MOUSE2), HID_QUIRK_ALWAYS_POLL },
-@@ -191,6 +192,7 @@ static const struct hid_device_id hid_quirks[] = {
+@@ -193,6 +194,7 @@ static const struct hid_device_id hid_quirks[] = {
  	{ HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_QUAD_USB_JOYPAD), HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT },
  	{ HID_USB_DEVICE(USB_VENDOR_ID_XIN_MO, USB_DEVICE_ID_XIN_MO_DUAL_ARCADE), HID_QUIRK_MULTI_INPUT },
  	{ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_GROUP_AUDIO), HID_QUIRK_NOGET },
@@ -333090,7 +333105,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  1 file changed, 177 insertions(+), 13 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
-index 14d660add41c8..bf882b38830a8 100644
+index 14d660add41c..bf882b38830a 100644
 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 @@ -287,6 +287,13 @@ to_vc4_fkms_encoder(struct drm_encoder *encoder)
@@ -333393,7 +333408,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  1 file changed, 7 insertions(+)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
-index bf882b38830a8..fa8a538f5d669 100644
+index bf882b38830a..fa8a538f5d66 100644
 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 @@ -1481,10 +1481,17 @@ int vc4_connector_atomic_set_property(struct drm_connector *connector,
@@ -333442,7 +333457,7 @@ Signed-off-by: Chen-Yu Tsai <wens@csie.org>
  1 file changed, 74 insertions(+), 67 deletions(-)
 
 diff --git a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-index 708f76b7aa92b..0ecf3e5c59a85 100644
+index 708f76b7aa92..0ecf3e5c59a8 100644
 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 @@ -504,7 +504,7 @@ static struct bcm2835_codec_fmt *find_format(struct v4l2_format *f,
@@ -333797,7 +333812,7 @@ Signed-off-by: Chen-Yu Tsai <wens@csie.org>
  1 file changed, 12 insertions(+)
 
 diff --git a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-index 0ecf3e5c59a85..d515bc75d5cb0 100644
+index 0ecf3e5c59a8..d515bc75d5cb 100644
 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 @@ -2357,6 +2357,18 @@ static int bcm2835_codec_open(struct file *file)
@@ -333845,7 +333860,7 @@ Signed-off-by: Chen-Yu Tsai <wens@csie.org>
  1 file changed, 1 insertion(+), 2 deletions(-)
 
 diff --git a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-index d515bc75d5cb0..47e79a0f0c3e8 100644
+index d515bc75d5cb..47e79a0f0c3e 100644
 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 @@ -945,8 +945,6 @@ static int vidioc_querycap(struct file *file, void *priv,
@@ -333883,7 +333898,7 @@ test those.
  2 files changed, 28 insertions(+), 5 deletions(-)
 
 diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c
-index b42917c250504..eb8a8a5b7ec8d 100644
+index b42917c25050..eb8a8a5b7ec8 100644
 --- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c
 +++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c
 @@ -79,7 +79,11 @@ static int bcm2835_audio_alsa_newpcm(struct bcm2835_chip *chip,
@@ -333944,7 +333959,7 @@ index b42917c250504..eb8a8a5b7ec8d 100644
  	},
  	{
 diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.h b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.h
-index ed0feb34b6c88..1a25cdad94dcd 100644
+index ed0feb34b6c8..1a25cdad94dc 100644
 --- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.h
 +++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.h
 @@ -33,7 +33,9 @@ enum {
@@ -333983,7 +333998,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  1 file changed, 33 insertions(+), 15 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
-index fa8a538f5d669..d9779b993c392 100644
+index fa8a538f5d66..d9779b993c39 100644
 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 @@ -964,6 +964,7 @@ static void vc4_crtc_mode_set_nofb(struct drm_crtc *crtc)
@@ -334086,7 +334101,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  1 file changed, 1 deletion(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
-index d9779b993c392..8b18389193777 100644
+index d9779b993c39..8b1838919377 100644
 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 @@ -525,7 +525,6 @@ static int vc4_plane_to_mb(struct drm_plane *plane,
@@ -334117,7 +334132,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  1 file changed, 7 insertions(+), 3 deletions(-)
 
 diff --git a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-index 47e79a0f0c3e8..eadc0fab2fb9c 100644
+index 47e79a0f0c3e..eadc0fab2fb9 100644
 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 @@ -753,6 +753,10 @@ static void handle_fmt_changed(struct bcm2835_codec_ctx *ctx,
@@ -334167,7 +334182,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-index eadc0fab2fb9c..24a8e7cc7de7e 100644
+index eadc0fab2fb9..24a8e7cc7de7 100644
 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 @@ -759,7 +759,9 @@ static void handle_fmt_changed(struct bcm2835_codec_ctx *ctx,
@@ -334202,7 +334217,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  1 file changed, 3 insertions(+)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
-index 8b18389193777..004a0bce94acb 100644
+index 8b1838919377..004a0bce94ac 100644
 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 @@ -1000,6 +1000,9 @@ static void vc4_crtc_consume_event(struct drm_crtc *crtc)
@@ -334247,7 +334262,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  1 file changed, 8 insertions(+)
 
 diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
-index 8cd9d5a9e7f5b..35816fe2ffd95 100644
+index 8cd9d5a9e7f5..35816fe2ffd9 100644
 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
 +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
 @@ -71,6 +71,9 @@
@@ -334299,10 +334314,10 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
  2 files changed, 7 insertions(+), 5 deletions(-)
 
 diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c
-index 9764122c9cdf2..ff6004b3f6b9b 100644
+index 7f9f302a73cd..9a304812af67 100644
 --- a/drivers/usb/host/xhci-mem.c
 +++ b/drivers/usb/host/xhci-mem.c
-@@ -2503,9 +2503,11 @@ int xhci_mem_init(struct xhci_hcd *xhci, gfp_t flags)
+@@ -2512,9 +2512,11 @@ int xhci_mem_init(struct xhci_hcd *xhci, gfp_t flags)
  	 * Event ring setup: Allocate a normal ring, but also setup
  	 * the event ring segment table (ERST).  Section 4.9.3.
  	 */
@@ -334316,7 +334331,7 @@ index 9764122c9cdf2..ff6004b3f6b9b 100644
  	if (!xhci->event_ring)
  		goto fail;
  	if (xhci_check_trb_in_td_math(xhci) < 0)
-@@ -2518,7 +2520,7 @@ int xhci_mem_init(struct xhci_hcd *xhci, gfp_t flags)
+@@ -2527,7 +2529,7 @@ int xhci_mem_init(struct xhci_hcd *xhci, gfp_t flags)
  	/* set ERST count with the number of entries in the segment table */
  	val = readl(&xhci->ir_set->erst_size);
  	val &= ERST_SIZE_MASK;
@@ -334326,7 +334341,7 @@ index 9764122c9cdf2..ff6004b3f6b9b 100644
  			"// Write ERST size = %i to ir_set 0 (some bits preserved)",
  			val);
 diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
-index 2f4933b2b84ca..bdffc05b0e748 100644
+index 2f4933b2b84c..bdffc05b0e74 100644
 --- a/drivers/usb/host/xhci.h
 +++ b/drivers/usb/host/xhci.h
 @@ -1649,8 +1649,8 @@ struct urb_priv {
@@ -334363,7 +334378,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  2 files changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig
-index 4719d38c4b4e5..33686cf34ff9c 100644
+index 4719d38c4b4e..33686cf34ff9 100644
 --- a/arch/arm64/configs/bcm2711_defconfig
 +++ b/arch/arm64/configs/bcm2711_defconfig
 @@ -1303,6 +1303,7 @@ CONFIG_VIDEO_CODEC_BCM2835=m
@@ -334375,7 +334390,7 @@ index 4719d38c4b4e5..33686cf34ff9c 100644
  CONFIG_EXTCON=m
  CONFIG_EXTCON_ARIZONA=m
 diff --git a/drivers/gpu/drm/v3d/Kconfig b/drivers/gpu/drm/v3d/Kconfig
-index 9a5c44606337e..b0e0486979642 100644
+index 9a5c44606337..b0e048697964 100644
 --- a/drivers/gpu/drm/v3d/Kconfig
 +++ b/drivers/gpu/drm/v3d/Kconfig
 @@ -1,7 +1,7 @@
@@ -334405,7 +334420,7 @@ Signed-off-by: Aman Gupta <aman@tmm1.net>
  1 file changed, 18 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-index 24a8e7cc7de7e..1a384e70eb98e 100644
+index 24a8e7cc7de7..1a384e70eb98 100644
 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 @@ -1587,6 +1587,20 @@ static int bcm2835_codec_s_ctrl(struct v4l2_ctrl *ctrl)
@@ -334466,7 +334481,7 @@ Signed-off-by: Aman Gupta <aman@tmm1.net>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-index 1a384e70eb98e..a82d7345389db 100644
+index 1a384e70eb98..a82d7345389d 100644
 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 @@ -1050,12 +1050,12 @@ static int vidioc_try_fmt(struct bcm2835_codec_ctx *ctx, struct v4l2_format *f,
@@ -334499,10 +334514,10 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  1 file changed, 10 insertions(+)
 
 diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
-index d0a464e317eac..d658d022f6a7c 100644
+index 43d6a6085d86..83aef438bf5b 100644
 --- a/arch/arm/kernel/setup.c
 +++ b/arch/arm/kernel/setup.c
-@@ -1240,6 +1240,8 @@ static int c_show(struct seq_file *m, void *v)
+@@ -1251,6 +1251,8 @@ static int c_show(struct seq_file *m, void *v)
  {
  	int i, j;
  	u32 cpuid;
@@ -334511,7 +334526,7 @@ index d0a464e317eac..d658d022f6a7c 100644
  
  	for_each_online_cpu(i) {
  		/*
-@@ -1299,6 +1301,14 @@ static int c_show(struct seq_file *m, void *v)
+@@ -1310,6 +1312,14 @@ static int c_show(struct seq_file *m, void *v)
  	seq_printf(m, "Revision\t: %04x\n", system_rev);
  	seq_printf(m, "Serial\t\t: %s\n", system_serial);
  
@@ -334541,7 +334556,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  1 file changed, 25 insertions(+)
 
 diff --git a/arch/arm64/kernel/cpuinfo.c b/arch/arm64/kernel/cpuinfo.c
-index 05933c065732b..86bbf8762dc95 100644
+index 05933c065732..86bbf8762dc9 100644
 --- a/arch/arm64/kernel/cpuinfo.c
 +++ b/arch/arm64/kernel/cpuinfo.c
 @@ -17,6 +17,7 @@
@@ -334611,7 +334626,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
 
 diff --git a/Documentation/devicetree/bindings/media/i2c/imx219.txt b/Documentation/devicetree/bindings/media/i2c/imx219.txt
 new file mode 100644
-index 0000000000000..a02f1ce1e1204
+index 000000000000..a02f1ce1e120
 --- /dev/null
 +++ b/Documentation/devicetree/bindings/media/i2c/imx219.txt
 @@ -0,0 +1,59 @@
@@ -334699,7 +334714,7 @@ Tested-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
  create mode 100644 drivers/media/i2c/imx219.c
 
 diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig
-index fcffcc31d168a..b28b82953e692 100644
+index fcffcc31d168..b28b82953e69 100644
 --- a/drivers/media/i2c/Kconfig
 +++ b/drivers/media/i2c/Kconfig
 @@ -578,6 +578,17 @@ config VIDEO_IMX214
@@ -334721,7 +334736,7 @@ index fcffcc31d168a..b28b82953e692 100644
  	tristate "Sony IMX258 sensor support"
  	depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API
 diff --git a/drivers/media/i2c/Makefile b/drivers/media/i2c/Makefile
-index beb170b002dc9..f461e6694f064 100644
+index beb170b002dc..f461e6694f06 100644
 --- a/drivers/media/i2c/Makefile
 +++ b/drivers/media/i2c/Makefile
 @@ -110,6 +110,7 @@ obj-$(CONFIG_VIDEO_ML86V7667)	+= ml86v7667.o
@@ -334734,7 +334749,7 @@ index beb170b002dc9..f461e6694f064 100644
  obj-$(CONFIG_VIDEO_IMX319)	+= imx319.o
 diff --git a/drivers/media/i2c/imx219.c b/drivers/media/i2c/imx219.c
 new file mode 100644
-index 0000000000000..682397a484922
+index 000000000000..682397a48492
 --- /dev/null
 +++ b/drivers/media/i2c/imx219.c
 @@ -0,0 +1,1093 @@
@@ -335852,7 +335867,7 @@ Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-index a82d7345389db..4c69087328c00 100644
+index a82d7345389d..4c69087328c0 100644
 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 @@ -557,7 +557,7 @@ static struct vchiq_mmal_port *get_port_data(struct bcm2835_codec_ctx *ctx,
@@ -335884,7 +335899,7 @@ Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-index 4c69087328c00..1a00c8d253700 100644
+index 4c69087328c0..1a00c8d25370 100644
 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 @@ -77,7 +77,7 @@ enum bcm2835_codec_role {
@@ -335921,7 +335936,7 @@ Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
  1 file changed, 5 insertions(+), 3 deletions(-)
 
 diff --git a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-index 1a00c8d253700..46b8dd782c465 100644
+index 1a00c8d25370..46b8dd782c46 100644
 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 @@ -947,8 +947,10 @@ static void device_run(void *priv)
@@ -335968,7 +335983,7 @@ Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
  1 file changed, 9 insertions(+), 4 deletions(-)
 
 diff --git a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-index 46b8dd782c465..a08a75d3ff88c 100644
+index 46b8dd782c46..a08a75d3ff88 100644
 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 @@ -457,6 +457,8 @@ struct bcm2835_codec_ctx {
@@ -336034,7 +336049,7 @@ Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
  2 files changed, 38 insertions(+), 5 deletions(-)
 
 diff --git a/drivers/staging/vc04_services/bcm2835-codec/Kconfig b/drivers/staging/vc04_services/bcm2835-codec/Kconfig
-index 951971b39ce0e..c104be9ad6da5 100644
+index 951971b39ce0..c104be9ad6da 100644
 --- a/drivers/staging/vc04_services/bcm2835-codec/Kconfig
 +++ b/drivers/staging/vc04_services/bcm2835-codec/Kconfig
 @@ -1,6 +1,6 @@
@@ -336046,7 +336061,7 @@ index 951971b39ce0e..c104be9ad6da5 100644
  	select BCM2835_VCHIQ_MMAL
  	select VIDEOBUF2_DMA_CONTIG
 diff --git a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-index a08a75d3ff88c..fb99bfb5bc1df 100644
+index a08a75d3ff88..fb99bfb5bc1d 100644
 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 @@ -458,6 +458,7 @@ struct bcm2835_codec_ctx {
@@ -336205,7 +336220,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  2 files changed, 2 insertions(+)
 
 diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c
-index 3fe99519fedfb..2161cc497abd7 100644
+index 7ac7a5063fb2..3796450cfee9 100644
 --- a/drivers/media/v4l2-core/v4l2-ctrls.c
 +++ b/drivers/media/v4l2-core/v4l2-ctrls.c
 @@ -271,6 +271,7 @@ const char * const *v4l2_ctrl_get_menu(u32 id)
@@ -336217,7 +336232,7 @@ index 3fe99519fedfb..2161cc497abd7 100644
  	};
  	static const char * const camera_iso_sensitivity_auto[] = {
 diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-controls.h
-index a2669b79b2949..616a7c64c4d20 100644
+index a2669b79b294..616a7c64c4d2 100644
 --- a/include/uapi/linux/v4l2-controls.h
 +++ b/include/uapi/linux/v4l2-controls.h
 @@ -850,6 +850,7 @@ enum v4l2_auto_n_preset_white_balance {
@@ -336247,7 +336262,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  2 files changed, 7 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/staging/vc04_services/bcm2835-camera/controls.c b/drivers/staging/vc04_services/bcm2835-camera/controls.c
-index 89786c2648679..296d0db6aa512 100644
+index 89786c264867..296d0db6aa51 100644
 --- a/drivers/staging/vc04_services/bcm2835-camera/controls.c
 +++ b/drivers/staging/vc04_services/bcm2835-camera/controls.c
 @@ -477,6 +477,10 @@ static int ctrl_set_awb_mode(struct bm2835_mmal_dev *dev,
@@ -336273,7 +336288,7 @@ index 89786c2648679..296d0db6aa512 100644
  		ctrl_set_awb_mode,
  		false
 diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h b/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h
-index 926392d754c76..d3d7828d1e56c 100644
+index 926392d754c7..d3d7828d1e56 100644
 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h
 +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h
 @@ -313,6 +313,7 @@ enum mmal_parameter_awbmode {
@@ -336303,7 +336318,7 @@ Signed-off-by: James Hughes <james.hughes@raspberrypi.org>
  1 file changed, 3 insertions(+), 8 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
-index 004a0bce94acb..a487fcf1eaf39 100644
+index 004a0bce94ac..a487fcf1eaf3 100644
 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 @@ -1612,14 +1612,9 @@ vc4_fkms_connector_init(struct drm_device *dev, struct drm_encoder *encoder,
@@ -336348,7 +336363,7 @@ Signed-off-by: Joerg Schambacher <joerg@i2audio.com>
  create mode 100644 sound/soc/bcm/hifiberry_dacplusdsp.c
 
 diff --git a/sound/soc/bcm/Kconfig b/sound/soc/bcm/Kconfig
-index 4c38298df04b9..8d50e52c1ebb2 100644
+index 4c38298df04b..8d50e52c1ebb 100644
 --- a/sound/soc/bcm/Kconfig
 +++ b/sound/soc/bcm/Kconfig
 @@ -59,6 +59,13 @@ config SND_BCM2708_SOC_HIFIBERRY_DACPLUSADCPRO
@@ -336366,7 +336381,7 @@ index 4c38298df04b9..8d50e52c1ebb2 100644
          tristate "Support for HifiBerry Digi"
          depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
 diff --git a/sound/soc/bcm/Makefile b/sound/soc/bcm/Makefile
-index 0e8b60f61b31a..4c0486c6da0da 100644
+index 0e8b60f61b31..4c0486c6da0d 100644
 --- a/sound/soc/bcm/Makefile
 +++ b/sound/soc/bcm/Makefile
 @@ -16,6 +16,7 @@ snd-soc-googlevoicehat-codec-objs := googlevoicehat-codec.o
@@ -336386,7 +336401,7 @@ index 0e8b60f61b31a..4c0486c6da0da 100644
  obj-$(CONFIG_SND_BCM2708_SOC_RPI_CIRRUS) += snd-soc-rpi-cirrus.o
  obj-$(CONFIG_SND_BCM2708_SOC_RPI_PROTO) += snd-soc-rpi-proto.o
 diff --git a/sound/soc/bcm/hifiberry_dacplusadcpro.c b/sound/soc/bcm/hifiberry_dacplusadcpro.c
-index ed080b24eb494..cc33d41748396 100644
+index ed080b24eb49..cc33d4174839 100644
 --- a/sound/soc/bcm/hifiberry_dacplusadcpro.c
 +++ b/sound/soc/bcm/hifiberry_dacplusadcpro.c
 @@ -445,29 +445,21 @@ static struct snd_soc_ops snd_rpi_hifiberry_dacplusadcpro_ops = {
@@ -336442,7 +336457,7 @@ index ed080b24eb494..cc33d41748396 100644
  	}
 diff --git a/sound/soc/bcm/hifiberry_dacplusdsp.c b/sound/soc/bcm/hifiberry_dacplusdsp.c
 new file mode 100644
-index 0000000000000..cda7ee5190930
+index 000000000000..cda7ee519093
 --- /dev/null
 +++ b/sound/soc/bcm/hifiberry_dacplusdsp.c
 @@ -0,0 +1,90 @@
@@ -336537,7 +336552,7 @@ index 0000000000000..cda7ee5190930
 +MODULE_DESCRIPTION("ASoC Driver for HiFiBerry DAC+DSP");
 +MODULE_LICENSE("GPL v2");
 diff --git a/sound/soc/bcm/rpi-simple-soundcard.c b/sound/soc/bcm/rpi-simple-soundcard.c
-index 2023b0a18a2c6..133b6d98f515f 100644
+index 2023b0a18a2c..133b6d98f515 100644
 --- a/sound/soc/bcm/rpi-simple-soundcard.c
 +++ b/sound/soc/bcm/rpi-simple-soundcard.c
 @@ -144,6 +144,27 @@ static struct snd_rpi_simple_drvdata drvdata_googlevoicehat = {
@@ -336598,7 +336613,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-index fb99bfb5bc1df..19d046767dbbd 100644
+index fb99bfb5bc1d..19d046767dbb 100644
 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 @@ -92,7 +92,7 @@ static const char * const components[] = {
@@ -336632,7 +336647,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  1 file changed, 47 insertions(+), 20 deletions(-)
 
 diff --git a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-index 19d046767dbbd..ce63643222667 100644
+index 19d046767dbb..ce6364322266 100644
 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 @@ -1260,17 +1260,30 @@ static int vidioc_g_selection(struct file *file, void *priv,
@@ -336742,7 +336757,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  2 files changed, 16 deletions(-)
 
 diff --git a/drivers/gpu/drm/v3d/v3d_gem.c b/drivers/gpu/drm/v3d/v3d_gem.c
-index 28f8eb664a581..e6a079f4b50db 100644
+index 28f8eb664a58..e6a079f4b50d 100644
 --- a/drivers/gpu/drm/v3d/v3d_gem.c
 +++ b/drivers/gpu/drm/v3d/v3d_gem.c
 @@ -478,10 +478,6 @@ v3d_job_init(struct v3d_dev *v3d, struct drm_file *file_priv,
@@ -336765,7 +336780,7 @@ index 28f8eb664a581..e6a079f4b50db 100644
  }
  
 diff --git a/drivers/gpu/drm/v3d/v3d_mmu.c b/drivers/gpu/drm/v3d/v3d_mmu.c
-index 6cc67cab320ea..5294dd884867a 100644
+index 6cc67cab320e..5294dd884867 100644
 --- a/drivers/gpu/drm/v3d/v3d_mmu.c
 +++ b/drivers/gpu/drm/v3d/v3d_mmu.c
 @@ -36,14 +36,6 @@ static int v3d_mmu_flush_all(struct v3d_dev *v3d)
@@ -336808,7 +336823,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  1 file changed, 1 deletion(-)
 
 diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig
-index 33686cf34ff9c..4719d38c4b4e5 100644
+index 33686cf34ff9..4719d38c4b4e 100644
 --- a/arch/arm64/configs/bcm2711_defconfig
 +++ b/arch/arm64/configs/bcm2711_defconfig
 @@ -1303,7 +1303,6 @@ CONFIG_VIDEO_CODEC_BCM2835=m
@@ -336836,7 +336851,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  create mode 100644 arch/arm64/boot/dts/broadcom/bcm2710-rpi-2-b.dts
 
 diff --git a/arch/arm64/boot/dts/broadcom/Makefile b/arch/arm64/boot/dts/broadcom/Makefile
-index 1004a9fb8bf45..c3eaf8d63ee4a 100644
+index 1004a9fb8bf4..c3eaf8d63ee4 100644
 --- a/arch/arm64/boot/dts/broadcom/Makefile
 +++ b/arch/arm64/boot/dts/broadcom/Makefile
 @@ -3,7 +3,9 @@ dtb-$(CONFIG_ARCH_BCM2835) += bcm2837-rpi-3-a-plus.dtb \
@@ -336851,7 +336866,7 @@ index 1004a9fb8bf45..c3eaf8d63ee4a 100644
  dtb-$(CONFIG_ARCH_BCM2835) += bcm2710-rpi-3-b-plus.dtb
 diff --git a/arch/arm64/boot/dts/broadcom/bcm2710-rpi-2-b.dts b/arch/arm64/boot/dts/broadcom/bcm2710-rpi-2-b.dts
 new file mode 100644
-index 0000000000000..116cdbf94b9b0
+index 000000000000..116cdbf94b9b
 --- /dev/null
 +++ b/arch/arm64/boot/dts/broadcom/bcm2710-rpi-2-b.dts
 @@ -0,0 +1,3 @@
@@ -336890,7 +336905,7 @@ Signed-off-by: Iago Toral Quiroga <itoral@igalia.com>
  3 files changed, 49 insertions(+), 8 deletions(-)
 
 diff --git a/drivers/gpu/drm/v3d/v3d_drv.c b/drivers/gpu/drm/v3d/v3d_drv.c
-index 00e4419dc208e..72da17e4963ee 100644
+index 00e4419dc208..72da17e4963e 100644
 --- a/drivers/gpu/drm/v3d/v3d_drv.c
 +++ b/drivers/gpu/drm/v3d/v3d_drv.c
 @@ -120,6 +120,9 @@ static int v3d_get_param_ioctl(struct drm_device *dev, void *data,
@@ -336904,7 +336919,7 @@ index 00e4419dc208e..72da17e4963ee 100644
  		DRM_DEBUG("Unknown parameter %d\n", args->param);
  		return -EINVAL;
 diff --git a/drivers/gpu/drm/v3d/v3d_gem.c b/drivers/gpu/drm/v3d/v3d_gem.c
-index e6a079f4b50db..035de14066d0b 100644
+index e6a079f4b50d..035de14066d0 100644
 --- a/drivers/gpu/drm/v3d/v3d_gem.c
 +++ b/drivers/gpu/drm/v3d/v3d_gem.c
 @@ -565,13 +565,16 @@ v3d_submit_cl_ioctl(struct drm_device *dev, void *data,
@@ -337002,7 +337017,7 @@ index e6a079f4b50db..035de14066d0b 100644
  	return ret;
  }
 diff --git a/include/uapi/drm/v3d_drm.h b/include/uapi/drm/v3d_drm.h
-index 58fbe48c91e90..b8c6f9d909424 100644
+index 58fbe48c91e9..b8c6f9d90942 100644
 --- a/include/uapi/drm/v3d_drm.h
 +++ b/include/uapi/drm/v3d_drm.h
 @@ -48,6 +48,8 @@ extern "C" {
@@ -337061,7 +337076,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  1 file changed, 3 insertions(+)
 
 diff --git a/Makefile b/Makefile
-index 25680098f51b2..23f487d10cb26 100644
+index 802520ad08cc..94e027c8e7bc 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -1269,6 +1269,9 @@ ifneq ($(dtstree),)
@@ -337091,7 +337106,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/kernel/dma/direct.c b/kernel/dma/direct.c
-index 0a093a675b632..d2b4628354698 100644
+index 0a093a675b63..d2b462835469 100644
 --- a/kernel/dma/direct.c
 +++ b/kernel/dma/direct.c
 @@ -398,7 +398,7 @@ int dma_direct_supported(struct device *dev, u64 mask)
@@ -337123,7 +337138,7 @@ Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/arch/arm/mach-bcm/board_bcm2835.c b/arch/arm/mach-bcm/board_bcm2835.c
-index 282a023027fc0..e538e0f899a58 100644
+index 282a023027fc..e538e0f899a5 100644
 --- a/arch/arm/mach-bcm/board_bcm2835.c
 +++ b/arch/arm/mach-bcm/board_bcm2835.c
 @@ -109,7 +109,7 @@ static const char * const bcm2835_compat[] = {
@@ -337165,7 +337180,7 @@ Acked-by: Eric Anholt <eric@anholt.net>
  1 file changed, 6 insertions(+)
 
 diff --git a/drivers/pinctrl/bcm/pinctrl-bcm2835.c b/drivers/pinctrl/bcm/pinctrl-bcm2835.c
-index 76fad11f2ad82..3cd4c4f1a47c2 100644
+index 76fad11f2ad8..3cd4c4f1a47c 100644
 --- a/drivers/pinctrl/bcm/pinctrl-bcm2835.c
 +++ b/drivers/pinctrl/bcm/pinctrl-bcm2835.c
 @@ -1168,6 +1168,12 @@ static int bcm2835_pinctrl_probe(struct platform_device *pdev)
@@ -337207,7 +337222,7 @@ Signed-off-by: Matteo Croce <mcroce@redhat.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
-index 230e1b1144a9d..2dfdee1f814f1 100644
+index 230e1b1144a9..2dfdee1f814f 100644
 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
 +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
 @@ -255,7 +255,7 @@ vchiq_prepare_bulk_data(struct vchiq_bulk *bulk, void *offset, int size,
@@ -337246,7 +337261,7 @@ Signed-off-by: James Hughes <james.hughes@raspberrypi.org>
  1 file changed, 63 insertions(+), 7 deletions(-)
 
 diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c
-index eb8a8a5b7ec8d..f926784c622de 100644
+index eb8a8a5b7ec8..f926784c622d 100644
 --- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c
 +++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c
 @@ -9,8 +9,9 @@
@@ -337384,7 +337399,7 @@ Closes #3266
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/pci/controller/pcie-brcmstb-bounce64.c b/drivers/pci/controller/pcie-brcmstb-bounce64.c
-index 6a872975ba9e1..ac8dde3c030b7 100644
+index 6a872975ba9e..ac8dde3c030b 100644
 --- a/drivers/pci/controller/pcie-brcmstb-bounce64.c
 +++ b/drivers/pci/controller/pcie-brcmstb-bounce64.c
 @@ -517,7 +517,7 @@ int brcm_pcie_bounce_init(struct device *dev,
@@ -337419,7 +337434,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  2 files changed, 72 insertions(+), 3 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c
-index 363f456ea7134..5ea6c84d7f6d7 100644
+index 363f456ea713..5ea6c84d7f6d 100644
 --- a/drivers/gpu/drm/vc4/vc4_plane.c
 +++ b/drivers/gpu/drm/vc4/vc4_plane.c
 @@ -585,6 +585,53 @@ static int vc4_plane_allocate_lbm(struct drm_plane_state *state)
@@ -337515,7 +337530,7 @@ index 363f456ea7134..5ea6c84d7f6d7 100644
  	return plane;
  }
 diff --git a/drivers/gpu/drm/vc4/vc4_regs.h b/drivers/gpu/drm/vc4/vc4_regs.h
-index b5a6b4cdd3328..8416fdaf2ec47 100644
+index b5a6b4cdd332..8416fdaf2ec4 100644
 --- a/drivers/gpu/drm/vc4/vc4_regs.h
 +++ b/drivers/gpu/drm/vc4/vc4_regs.h
 @@ -950,6 +950,7 @@ enum hvs_pixel_format {
@@ -337561,7 +337576,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  1 file changed, 38 insertions(+), 11 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c
-index 5ea6c84d7f6d7..68aa6db8ea053 100644
+index 5ea6c84d7f6d..68aa6db8ea05 100644
 --- a/drivers/gpu/drm/vc4/vc4_plane.c
 +++ b/drivers/gpu/drm/vc4/vc4_plane.c
 @@ -645,6 +645,7 @@ static int vc4_plane_mode_set(struct drm_plane *plane,
@@ -337677,7 +337692,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  1 file changed, 14 insertions(+), 23 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
-index a487fcf1eaf39..f3ec265a9798d 100644
+index a487fcf1eaf3..f3ec265a9798 100644
 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 @@ -82,11 +82,6 @@ struct set_plane {
@@ -337770,7 +337785,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  3 files changed, 9 insertions(+)
 
 diff --git a/arch/arm/mach-bcm/board_bcm2835.c b/arch/arm/mach-bcm/board_bcm2835.c
-index e538e0f899a58..0ec49d8571340 100644
+index e538e0f899a5..0ec49d857134 100644
 --- a/arch/arm/mach-bcm/board_bcm2835.c
 +++ b/arch/arm/mach-bcm/board_bcm2835.c
 @@ -110,6 +110,8 @@ static const char * const bcm2835_compat[] = {
@@ -337783,7 +337798,7 @@ index e538e0f899a58..0ec49d8571340 100644
  	NULL
  };
 diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c
-index f1d73d83ee16b..3921480d89fdd 100644
+index f1d73d83ee16..3921480d89fd 100644
 --- a/drivers/clk/bcm/clk-bcm2835.c
 +++ b/drivers/clk/bcm/clk-bcm2835.c
 @@ -2391,6 +2391,8 @@ static const struct cprman_plat_data cprman_bcm2711_plat_data = {
@@ -337796,7 +337811,7 @@ index f1d73d83ee16b..3921480d89fdd 100644
  };
  MODULE_DEVICE_TABLE(of, bcm2835_clk_of_match);
 diff --git a/drivers/pinctrl/bcm/pinctrl-bcm2835.c b/drivers/pinctrl/bcm/pinctrl-bcm2835.c
-index 3cd4c4f1a47c2..e77c3ea15fdea 100644
+index 3cd4c4f1a47c..e77c3ea15fde 100644
 --- a/drivers/pinctrl/bcm/pinctrl-bcm2835.c
 +++ b/drivers/pinctrl/bcm/pinctrl-bcm2835.c
 @@ -1078,6 +1078,11 @@ static const struct of_device_id bcm2835_pinctrl_match[] = {
@@ -337832,7 +337847,7 @@ Signed-off-by: Markus Proeller <markus.proeller@pieye.org>
 
 diff --git a/Documentation/devicetree/bindings/media/i2c/irs1125.txt b/Documentation/devicetree/bindings/media/i2c/irs1125.txt
 new file mode 100644
-index 0000000000000..25a48028c9577
+index 000000000000..25a48028c957
 --- /dev/null
 +++ b/Documentation/devicetree/bindings/media/i2c/irs1125.txt
 @@ -0,0 +1,48 @@
@@ -337910,7 +337925,7 @@ Signed-off-by: Markus Proeller <markus.proeller@pieye.org>
  create mode 100644 drivers/media/i2c/irs1125.h
 
 diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig
-index b28b82953e692..e57406240288d 100644
+index b28b82953e69..e57406240288 100644
 --- a/drivers/media/i2c/Kconfig
 +++ b/drivers/media/i2c/Kconfig
 @@ -850,6 +850,18 @@ config VIDEO_OV13858
@@ -337933,7 +337948,7 @@ index b28b82953e692..e57406240288d 100644
  	tristate "ST VS6624 sensor support"
  	depends on VIDEO_V4L2 && I2C
 diff --git a/drivers/media/i2c/Makefile b/drivers/media/i2c/Makefile
-index f461e6694f064..52e4c40263075 100644
+index f461e6694f06..52e4c4026307 100644
 --- a/drivers/media/i2c/Makefile
 +++ b/drivers/media/i2c/Makefile
 @@ -82,6 +82,7 @@ obj-$(CONFIG_VIDEO_OV8856) += ov8856.o
@@ -337946,7 +337961,7 @@ index f461e6694f064..52e4c40263075 100644
  obj-$(CONFIG_VIDEO_MT9M111) += mt9m111.o
 diff --git a/drivers/media/i2c/irs1125.c b/drivers/media/i2c/irs1125.c
 new file mode 100644
-index 0000000000000..25e1dd5a08efa
+index 000000000000..25e1dd5a08ef
 --- /dev/null
 +++ b/drivers/media/i2c/irs1125.c
 @@ -0,0 +1,1112 @@
@@ -339064,7 +339079,7 @@ index 0000000000000..25e1dd5a08efa
 +
 diff --git a/drivers/media/i2c/irs1125.h b/drivers/media/i2c/irs1125.h
 new file mode 100644
-index 0000000000000..dccaca23aa76a
+index 000000000000..dccaca23aa76
 --- /dev/null
 +++ b/drivers/media/i2c/irs1125.h
 @@ -0,0 +1,61 @@
@@ -339147,7 +339162,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  1 file changed, 44 insertions(+), 4 deletions(-)
 
 diff --git a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-index ce63643222667..09d662d1dee33 100644
+index ce6364322266..09d662d1dee3 100644
 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 @@ -496,9 +496,10 @@ struct bcm2835_codec_fmt *get_default_format(struct bcm2835_codec_dev *dev,
@@ -339252,7 +339267,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-index 09d662d1dee33..a0d4b0d006c64 100644
+index 09d662d1dee3..a0d4b0d006c6 100644
 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 @@ -1438,7 +1438,7 @@ static int vidioc_g_parm(struct file *file, void *priv,
@@ -339283,7 +339298,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  1 file changed, 7 insertions(+)
 
 diff --git a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-index a0d4b0d006c64..41fca575b3952 100644
+index a0d4b0d006c6..41fca575b395 100644
 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 @@ -1423,6 +1423,10 @@ static int vidioc_s_parm(struct file *file, void *priv,
@@ -339328,7 +339343,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  1 file changed, 5 insertions(+)
 
 diff --git a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-index 41fca575b3952..f5adaac765cdf 100644
+index 41fca575b395..f5adaac765cd 100644
 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 @@ -2112,6 +2112,11 @@ static int bcm2835_codec_buf_prepare(struct vb2_buffer *vb)
@@ -339362,7 +339377,7 @@ Signed-off-by: James Hughes <james.hughes@raspberrypi.org>
  2 files changed, 27 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
-index f3ec265a9798d..b0c1096efbe59 100644
+index f3ec265a9798..b0c1096efbe5 100644
 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 @@ -94,6 +94,12 @@ struct mailbox_blank_display {
@@ -339427,7 +339442,7 @@ index f3ec265a9798d..b0c1096efbe59 100644
  
  	drm_encoder_init(drm, &vc4_encoder->base, &vc4_fkms_encoder_funcs,
 diff --git a/include/soc/bcm2835/raspberrypi-firmware.h b/include/soc/bcm2835/raspberrypi-firmware.h
-index 102c2e5dd2f2c..ae71820af8e59 100644
+index 102c2e5dd2f2..ae71820af8e5 100644
 --- a/include/soc/bcm2835/raspberrypi-firmware.h
 +++ b/include/soc/bcm2835/raspberrypi-firmware.h
 @@ -153,7 +153,7 @@ enum rpi_firmware_property_tag {
@@ -339453,7 +339468,7 @@ Subject: [PATCH 0355/1225] configs: Rebuild with savedefconfig
  1 file changed, 8 deletions(-)
 
 diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig
-index ec25f919fe4b9..0775637872ca7 100644
+index ec25f919fe4b..0775637872ca 100644
 --- a/arch/arm/configs/bcm2711_defconfig
 +++ b/arch/arm/configs/bcm2711_defconfig
 @@ -403,7 +403,6 @@ CONFIG_DEVTMPFS=y
@@ -339529,7 +339544,7 @@ This reverts commit 73345a18d464b1b945b29f54f630ace6873344e2.
  1 file changed, 30 insertions(+), 25 deletions(-)
 
 diff --git a/drivers/pinctrl/bcm/pinctrl-bcm2835.c b/drivers/pinctrl/bcm/pinctrl-bcm2835.c
-index e77c3ea15fdea..4ce2dd704c130 100644
+index e77c3ea15fde..4ce2dd704c13 100644
 --- a/drivers/pinctrl/bcm/pinctrl-bcm2835.c
 +++ b/drivers/pinctrl/bcm/pinctrl-bcm2835.c
 @@ -78,6 +78,7 @@
@@ -339651,7 +339666,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  1 file changed, 1 insertion(+), 4 deletions(-)
 
 diff --git a/drivers/gpu/drm/v3d/v3d_irq.c b/drivers/gpu/drm/v3d/v3d_irq.c
-index 662e67279a7bb..fe2060c6b495a 100644
+index 662e67279a7b..fe2060c6b495 100644
 --- a/drivers/gpu/drm/v3d/v3d_irq.c
 +++ b/drivers/gpu/drm/v3d/v3d_irq.c
 @@ -178,10 +178,7 @@ v3d_hub_irq(int irq, void *arg)
@@ -339684,7 +339699,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  1 file changed, 3 insertions(+)
 
 diff --git a/drivers/gpu/drm/v3d/v3d_irq.c b/drivers/gpu/drm/v3d/v3d_irq.c
-index fe2060c6b495a..7dde90d846f19 100644
+index fe2060c6b495..7dde90d846f1 100644
 --- a/drivers/gpu/drm/v3d/v3d_irq.c
 +++ b/drivers/gpu/drm/v3d/v3d_irq.c
 @@ -177,6 +177,7 @@ v3d_hub_irq(int irq, void *arg)
@@ -339732,7 +339747,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  1 file changed, 3 insertions(+)
 
 diff --git a/drivers/gpu/drm/v3d/v3d_gem.c b/drivers/gpu/drm/v3d/v3d_gem.c
-index 035de14066d0b..8b5dc2b20e387 100644
+index 035de14066d0..8b5dc2b20e38 100644
 --- a/drivers/gpu/drm/v3d/v3d_gem.c
 +++ b/drivers/gpu/drm/v3d/v3d_gem.c
 @@ -410,6 +410,9 @@ v3d_job_free(struct kref *ref)
@@ -339764,7 +339779,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 3 insertions(+)
 
 diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
-index 4e684ccd9346a..2b859b98e17ba 100644
+index 4e684ccd9346..2b859b98e17b 100644
 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
 +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
 @@ -140,6 +140,7 @@ static struct class  *vchiq_class;
@@ -339810,7 +339825,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 3 insertions(+)
 
 diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
-index 2b859b98e17ba..1e8b2c460783c 100644
+index 2b859b98e17b..1e8b2c460783 100644
 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
 +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
 @@ -140,6 +140,7 @@ static struct class  *vchiq_class;
@@ -339858,7 +339873,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 4 insertions(+)
 
 diff --git a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-index f5adaac765cdf..50395795c3dba 100644
+index f5adaac765cd..50395795c3db 100644
 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 @@ -2841,6 +2841,10 @@ static int bcm2835_codec_probe(struct platform_device *pdev)
@@ -339894,7 +339909,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 1 insertion(+), 2 deletions(-)
 
 diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
-index 1e8b2c460783c..d9492e24e07d0 100644
+index 1e8b2c460783..d9492e24e07d 100644
 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
 +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
 @@ -3269,8 +3269,7 @@ static int vchiq_probe(struct platform_device *pdev)
@@ -339925,7 +339940,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/gpu/drm/v3d/v3d_irq.c b/drivers/gpu/drm/v3d/v3d_irq.c
-index 7dde90d846f19..586fb850f00fe 100644
+index 7dde90d846f1..586fb850f00f 100644
 --- a/drivers/gpu/drm/v3d/v3d_irq.c
 +++ b/drivers/gpu/drm/v3d/v3d_irq.c
 @@ -217,7 +217,7 @@ v3d_irq_init(struct v3d_dev *v3d)
@@ -339955,7 +339970,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
-index 35816fe2ffd95..aba145a144b46 100644
+index 35816fe2ffd9..aba145a144b4 100644
 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
 +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
 @@ -3473,7 +3473,7 @@ static int bcmgenet_probe(struct platform_device *pdev)
@@ -339988,7 +340003,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c b/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c
-index 9a150d6fdeb43..70cce7abfb8d8 100644
+index 9a150d6fdeb4..70cce7abfb8d 100644
 --- a/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c
 +++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c
 @@ -138,7 +138,7 @@ static struct hc_driver dwc_otg_hc_driver = {
@@ -340015,7 +340030,7 @@ Signed-off-by: Serge Schneider <serge@raspberrypi.org>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/hwmon/rpi-poe-fan.c b/drivers/hwmon/rpi-poe-fan.c
-index 3effaf2eb86db..c9654e9e9f2d0 100644
+index 3effaf2eb86d..c9654e9e9f2d 100644
 --- a/drivers/hwmon/rpi-poe-fan.c
 +++ b/drivers/hwmon/rpi-poe-fan.c
 @@ -110,7 +110,7 @@ static int  __set_def_pwm(struct rpi_poe_fan_ctx *ctx, u32 def_pwm)
@@ -340049,7 +340064,7 @@ Signed-off-by: James Hughes <james.hughes@raspberrypi.org>
  4 files changed, 31 insertions(+), 10 deletions(-)
 
 diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
-index ccdc274665c09..6ce9a58a6ed57 100644
+index ccdc274665c0..6ce9a58a6ed5 100644
 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
 +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
 @@ -334,5 +334,8 @@
@@ -340062,7 +340077,7 @@ index ccdc274665c09..6ce9a58a6ed57 100644
  	};
  };
 diff --git a/arch/arm/boot/dts/bcm2838.dtsi b/arch/arm/boot/dts/bcm2838.dtsi
-index a8614cc3ad6ae..88615a5afdb65 100644
+index a8614cc3ad6a..88615a5afdb6 100644
 --- a/arch/arm/boot/dts/bcm2838.dtsi
 +++ b/arch/arm/boot/dts/bcm2838.dtsi
 @@ -380,6 +380,7 @@
@@ -340074,7 +340089,7 @@ index a8614cc3ad6ae..88615a5afdb65 100644
  			};
  		};
 diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
-index 8ce8cf05a2c86..00a70a49a3524 100644
+index 8ce8cf05a2c8..00a70a49a352 100644
 --- a/arch/arm/boot/dts/overlays/README
 +++ b/arch/arm/boot/dts/overlays/README
 @@ -102,26 +102,38 @@ Params:
@@ -340125,7 +340140,7 @@ index 8ce8cf05a2c86..00a70a49a3524 100644
          i2c_arm                 Set to "on" to enable the ARM's i2c interface
                                  (default "off")
 diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c
-index f5881fb95a5bf..8f26eaf2280c9 100644
+index f5881fb95a5b..8f26eaf2280c 100644
 --- a/drivers/net/phy/broadcom.c
 +++ b/drivers/net/phy/broadcom.c
 @@ -283,6 +283,9 @@ static void bcm54xx_adjust_rxrefclk(struct phy_device *phydev)
@@ -340175,7 +340190,7 @@ Signed-off-by: Pierre-Jean Texier <pjtexier@koncepto.io>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/arch/arm/boot/dts/overlays/smi-overlay.dts b/arch/arm/boot/dts/overlays/smi-overlay.dts
-index 70104c11627cf..bb8c7830df23f 100644
+index 70104c11627c..bb8c7830df23 100644
 --- a/arch/arm/boot/dts/overlays/smi-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/smi-overlay.dts
 @@ -24,7 +24,7 @@
@@ -340204,7 +340219,7 @@ releases.
  1 file changed, 1 insertion(+), 5 deletions(-)
 
 diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c
-index 8f26eaf2280c9..ed394d48ea247 100644
+index 8f26eaf2280c..ed394d48ea24 100644
 --- a/drivers/net/phy/broadcom.c
 +++ b/drivers/net/phy/broadcom.c
 @@ -284,7 +284,7 @@ static int bcm54xx_config_init(struct phy_device *phydev)
@@ -340248,7 +340263,7 @@ Signed-off-by: Michael Kaplan <m.kaplan@evva.com>
  create mode 100644 arch/arm/boot/dts/overlays/apds9960-overlay.dts
 
 diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile
-index e9cd9722bb94b..f7f5f0c3d4640 100644
+index e9cd9722bb94..f7f5f0c3d464 100644
 --- a/arch/arm/boot/dts/overlays/Makefile
 +++ b/arch/arm/boot/dts/overlays/Makefile
 @@ -15,6 +15,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
@@ -340260,7 +340275,7 @@ index e9cd9722bb94b..f7f5f0c3d4640 100644
  	at86rf233.dtbo \
  	audioinjector-addons.dtbo \
 diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
-index 00a70a49a3524..bacebaaac9d3e 100644
+index 00a70a49a352..bacebaaac9d3 100644
 --- a/arch/arm/boot/dts/overlays/README
 +++ b/arch/arm/boot/dts/overlays/README
 @@ -441,6 +441,14 @@ Params: 24db_digital_gain       Allow gain to be applied via the PCM512x codec
@@ -340280,7 +340295,7 @@ index 00a70a49a3524..bacebaaac9d3e 100644
  Load:   dtoverlay=applepi-dac
 diff --git a/arch/arm/boot/dts/overlays/apds9960-overlay.dts b/arch/arm/boot/dts/overlays/apds9960-overlay.dts
 new file mode 100644
-index 0000000000000..c216932278ab7
+index 000000000000..c216932278ab
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/apds9960-overlay.dts
 @@ -0,0 +1,57 @@
@@ -340360,7 +340375,7 @@ Signed-off-by: Michael Kaplan <m.kaplan@evva.com>
  5 files changed, 5 insertions(+), 2 deletions(-)
 
 diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig
-index fbaccfbd0ed3a..1e5ac31fc8cb6 100644
+index fbaccfbd0ed3..1e5ac31fc8cb 100644
 --- a/arch/arm/configs/bcm2709_defconfig
 +++ b/arch/arm/configs/bcm2709_defconfig
 @@ -1294,6 +1294,7 @@ CONFIG_DHT11=m
@@ -340372,7 +340387,7 @@ index fbaccfbd0ed3a..1e5ac31fc8cb6 100644
  CONFIG_VEML6070=m
  CONFIG_BMP280=m
 diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig
-index 0775637872ca7..5f08fcdb02b19 100644
+index 0775637872ca..5f08fcdb02b1 100644
 --- a/arch/arm/configs/bcm2711_defconfig
 +++ b/arch/arm/configs/bcm2711_defconfig
 @@ -1280,6 +1280,7 @@ CONFIG_DHT11=m
@@ -340384,7 +340399,7 @@ index 0775637872ca7..5f08fcdb02b19 100644
  CONFIG_VEML6070=m
  CONFIG_BMP280=m
 diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig
-index b4f93d8fd86f3..75530fd19685e 100644
+index b4f93d8fd86f..75530fd19685 100644
 --- a/arch/arm/configs/bcmrpi_defconfig
 +++ b/arch/arm/configs/bcmrpi_defconfig
 @@ -1304,6 +1304,7 @@ CONFIG_DHT11=m
@@ -340396,7 +340411,7 @@ index b4f93d8fd86f3..75530fd19685e 100644
  CONFIG_VEML6070=m
  CONFIG_BMP280=m
 diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig
-index 4719d38c4b4e5..3878dede1c515 100644
+index 4719d38c4b4e..3878dede1c51 100644
 --- a/arch/arm64/configs/bcm2711_defconfig
 +++ b/arch/arm64/configs/bcm2711_defconfig
 @@ -1315,6 +1315,7 @@ CONFIG_DHT11=m
@@ -340408,7 +340423,7 @@ index 4719d38c4b4e5..3878dede1c515 100644
  CONFIG_VEML6070=m
  CONFIG_BMP280=m
 diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig
-index ca7668f549bcd..d87831d79a03d 100644
+index ca7668f549bc..d87831d79a03 100644
 --- a/arch/arm64/configs/bcmrpi3_defconfig
 +++ b/arch/arm64/configs/bcmrpi3_defconfig
 @@ -1094,13 +1094,12 @@ CONFIG_RASPBERRYPI_POWER=y
@@ -340450,7 +340465,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  1 file changed, 6 insertions(+), 7 deletions(-)
 
 diff --git a/arch/arm/boot/dts/overlays/uart0-overlay.dts b/arch/arm/boot/dts/overlays/uart0-overlay.dts
-index 57ba7745d0233..73d563bbaabfa 100755
+index 57ba7745d023..73d563bbaabf 100755
 --- a/arch/arm/boot/dts/overlays/uart0-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/uart0-overlay.dts
 @@ -17,17 +17,16 @@
@@ -340501,7 +340516,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  1 file changed, 1 insertion(+), 3 deletions(-)
 
 diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
-index b80dde1050ff9..2478da59c58d2 100644
+index b80dde1050ff..2478da59c58d 100644
 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
 @@ -2769,8 +2769,6 @@ brcmf_cfg80211_set_power_mgmt(struct wiphy *wiphy, struct net_device *ndev,
@@ -340543,7 +340558,7 @@ Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/arch/arm/boot/dts/overlays/pitft35-resistive-overlay.dts b/arch/arm/boot/dts/overlays/pitft35-resistive-overlay.dts
-index a69b6c2c76081..37629f18a7400 100644
+index a69b6c2c7608..37629f18a740 100644
 --- a/arch/arm/boot/dts/overlays/pitft35-resistive-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/pitft35-resistive-overlay.dts
 @@ -49,7 +49,7 @@
@@ -340570,7 +340585,7 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/drivers/gpu/drm/v3d/v3d_drv.c b/drivers/gpu/drm/v3d/v3d_drv.c
-index 72da17e4963ee..8b08ad828fe72 100644
+index 72da17e4963e..8b08ad828fe7 100644
 --- a/drivers/gpu/drm/v3d/v3d_drv.c
 +++ b/drivers/gpu/drm/v3d/v3d_drv.c
 @@ -286,9 +286,9 @@ static int v3d_platform_drm_probe(struct platform_device *pdev)
@@ -340601,7 +340616,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/gpu/drm/v3d/v3d_drv.c b/drivers/gpu/drm/v3d/v3d_drv.c
-index 8b08ad828fe72..2f50268c0159c 100644
+index 8b08ad828fe7..2f50268c0159 100644
 --- a/drivers/gpu/drm/v3d/v3d_drv.c
 +++ b/drivers/gpu/drm/v3d/v3d_drv.c
 @@ -285,7 +285,9 @@ static int v3d_platform_drm_probe(struct platform_device *pdev)
@@ -340634,7 +340649,7 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
  1 file changed, 4 insertions(+)
 
 diff --git a/drivers/gpu/drm/v3d/v3d_gem.c b/drivers/gpu/drm/v3d/v3d_gem.c
-index 8b5dc2b20e387..2d0626a527063 100644
+index 8b5dc2b20e38..2d0626a52706 100644
 --- a/drivers/gpu/drm/v3d/v3d_gem.c
 +++ b/drivers/gpu/drm/v3d/v3d_gem.c
 @@ -918,6 +918,10 @@ v3d_gem_init(struct drm_device *dev)
@@ -340667,7 +340682,7 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/clk/bcm/clk-raspberrypi.c b/drivers/clk/bcm/clk-raspberrypi.c
-index 1654fd0eedc94..e4e1392403406 100644
+index 1654fd0eedc9..e4e139240340 100644
 --- a/drivers/clk/bcm/clk-raspberrypi.c
 +++ b/drivers/clk/bcm/clk-raspberrypi.c
 @@ -70,7 +70,7 @@ static int raspberrypi_clock_property(struct rpi_firmware *firmware, u32 tag,
@@ -340694,7 +340709,7 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
  1 file changed, 412 insertions(+), 89 deletions(-)
 
 diff --git a/drivers/clk/bcm/clk-raspberrypi.c b/drivers/clk/bcm/clk-raspberrypi.c
-index e4e1392403406..8daf26df54308 100644
+index e4e139240340..8daf26df5430 100644
 --- a/drivers/clk/bcm/clk-raspberrypi.c
 +++ b/drivers/clk/bcm/clk-raspberrypi.c
 @@ -15,33 +15,103 @@
@@ -341349,7 +341364,7 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
  1 file changed, 12 insertions(+), 18 deletions(-)
 
 diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c
-index 3921480d89fdd..8175ecea0fd9f 100644
+index 3921480d89fd..8175ecea0fd9 100644
 --- a/drivers/clk/bcm/clk-bcm2835.c
 +++ b/drivers/clk/bcm/clk-bcm2835.c
 @@ -1734,16 +1734,12 @@ static const struct bcm2835_clk_desc clk_desc_array[] = {
@@ -341411,7 +341426,7 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
  1 file changed, 4 insertions(+)
 
 diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig
-index 5f08fcdb02b19..3d437a331698a 100644
+index 5f08fcdb02b1..3d437a331698 100644
 --- a/arch/arm/configs/bcm2711_defconfig
 +++ b/arch/arm/configs/bcm2711_defconfig
 @@ -50,6 +50,9 @@ CONFIG_CPU_FREQ_GOV_USERSPACE=y
@@ -341447,7 +341462,7 @@ Subject: [PATCH 0383/1225] raspberrypi-cpufreq: Only report integer pll
  1 file changed, 6 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/cpufreq/raspberrypi-cpufreq.c b/drivers/cpufreq/raspberrypi-cpufreq.c
-index 2bc7d9734272a..8bcfab2749a8d 100644
+index 2bc7d9734272..8bcfab2749a8 100644
 --- a/drivers/cpufreq/raspberrypi-cpufreq.c
 +++ b/drivers/cpufreq/raspberrypi-cpufreq.c
 @@ -8,6 +8,7 @@
@@ -341496,7 +341511,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  4 files changed, 29 deletions(-)
 
 diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig
-index 1e5ac31fc8cb6..909de3fdfc6bf 100644
+index 1e5ac31fc8cb..909de3fdfc6b 100644
 --- a/arch/arm/configs/bcm2709_defconfig
 +++ b/arch/arm/configs/bcm2709_defconfig
 @@ -435,7 +435,6 @@ CONFIG_DEVTMPFS=y
@@ -341557,7 +341572,7 @@ index 1e5ac31fc8cb6..909de3fdfc6bf 100644
  CONFIG_SND_BCM2835=m
  CONFIG_VIDEO_BCM2835=m
 diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig
-index 75530fd19685e..2fbd60cbea04c 100644
+index 75530fd19685..2fbd60cbea04 100644
 --- a/arch/arm/configs/bcmrpi_defconfig
 +++ b/arch/arm/configs/bcmrpi_defconfig
 @@ -428,7 +428,6 @@ CONFIG_DEVTMPFS=y
@@ -341618,7 +341633,7 @@ index 75530fd19685e..2fbd60cbea04c 100644
  CONFIG_SND_BCM2835=m
  CONFIG_VIDEO_BCM2835=m
 diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig
-index 3878dede1c515..edab9acd21c8b 100644
+index 3878dede1c51..edab9acd21c8 100644
 --- a/arch/arm64/configs/bcm2711_defconfig
 +++ b/arch/arm64/configs/bcm2711_defconfig
 @@ -435,7 +435,6 @@ CONFIG_DEVTMPFS=y
@@ -341679,7 +341694,7 @@ index 3878dede1c515..edab9acd21c8b 100644
  CONFIG_SND_BCM2835=m
  CONFIG_VIDEO_BCM2835=m
 diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig
-index d87831d79a03d..7a29553d08d66 100644
+index d87831d79a03..7a29553d08d6 100644
 --- a/arch/arm64/configs/bcmrpi3_defconfig
 +++ b/arch/arm64/configs/bcmrpi3_defconfig
 @@ -728,7 +728,6 @@ CONFIG_VIDEO_EM28XX_V4L2=m
@@ -341735,7 +341750,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  1 file changed, 2 insertions(+)
 
 diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig
-index edab9acd21c8b..cbdad7c47bf33 100644
+index edab9acd21c8..cbdad7c47bf3 100644
 --- a/arch/arm64/configs/bcm2711_defconfig
 +++ b/arch/arm64/configs/bcm2711_defconfig
 @@ -53,6 +53,7 @@ CONFIG_CPU_FREQ_GOV_USERSPACE=y
@@ -341776,7 +341791,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/arch/arm/boot/dts/bcm2838.dtsi b/arch/arm/boot/dts/bcm2838.dtsi
-index 88615a5afdb65..41a31cacdffed 100644
+index 88615a5afdb6..41a31cacdffe 100644
 --- a/arch/arm/boot/dts/bcm2838.dtsi
 +++ b/arch/arm/boot/dts/bcm2838.dtsi
 @@ -380,7 +380,7 @@
@@ -341789,7 +341804,7 @@ index 88615a5afdb65..41a31cacdffed 100644
  			};
  		};
 diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
-index bacebaaac9d3e..d9a09e1296569 100644
+index bacebaaac9d3..d9a09e129656 100644
 --- a/arch/arm/boot/dts/overlays/README
 +++ b/arch/arm/boot/dts/overlays/README
 @@ -128,7 +128,7 @@ Params:
@@ -341820,7 +341835,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/gpu/drm/v3d/v3d_drv.c b/drivers/gpu/drm/v3d/v3d_drv.c
-index 2f50268c0159c..87ce683f3c04d 100644
+index 2f50268c0159..87ce683f3c04 100644
 --- a/drivers/gpu/drm/v3d/v3d_drv.c
 +++ b/drivers/gpu/drm/v3d/v3d_drv.c
 @@ -259,8 +259,8 @@ static int v3d_platform_drm_probe(struct platform_device *pdev)
@@ -341853,7 +341868,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  1 file changed, 1 insertion(+)
 
 diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
-index 6ce9a58a6ed57..a967a7b86f2c1 100644
+index 6ce9a58a6ed5..a967a7b86f2c 100644
 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
 +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
 @@ -30,6 +30,7 @@
@@ -341885,7 +341900,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 11 insertions(+), 38 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c
-index 68aa6db8ea053..5ea6c84d7f6d7 100644
+index 68aa6db8ea05..5ea6c84d7f6d 100644
 --- a/drivers/gpu/drm/vc4/vc4_plane.c
 +++ b/drivers/gpu/drm/vc4/vc4_plane.c
 @@ -645,7 +645,6 @@ static int vc4_plane_mode_set(struct drm_plane *plane,
@@ -342001,7 +342016,7 @@ Signed-off-by: Matthias Reichl <hias@horus.com>
  1 file changed, 30 insertions(+), 10 deletions(-)
 
 diff --git a/arch/arm/boot/dts/overlays/rpi-cirrus-wm5102-overlay.dts b/arch/arm/boot/dts/overlays/rpi-cirrus-wm5102-overlay.dts
-index e2c25a0535e68..1cbf5812af35e 100644
+index e2c25a0535e6..1cbf5812af35 100644
 --- a/arch/arm/boot/dts/overlays/rpi-cirrus-wm5102-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/rpi-cirrus-wm5102-overlay.dts
 @@ -18,19 +18,31 @@
@@ -342131,7 +342146,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  1 file changed, 6 insertions(+)
 
 diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
-index d9492e24e07d0..d556f42f575a1 100644
+index d9492e24e07d..d556f42f575a 100644
 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
 +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
 @@ -3195,6 +3195,12 @@ vchiq_register_child(struct platform_device *pdev, const char *name)
@@ -342169,7 +342184,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  1 file changed, 14 insertions(+), 3 deletions(-)
 
 diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
-index d556f42f575a1..d84f7324fe148 100644
+index d556f42f575a..d84f7324fe14 100644
 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
 +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
 @@ -3181,6 +3181,7 @@ vchiq_register_child(struct platform_device *pdev, const char *name)
@@ -342225,7 +342240,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 2 deletions(-)
 
 diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
-index 341594ab669f3..61a3593cdcfc3 100644
+index 341594ab669f..61a3593cdcfc 100644
 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
 +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
 @@ -268,8 +268,6 @@ static void buffer_work_cb(struct work_struct *work)
@@ -342274,7 +342289,7 @@ Signed-off-by: Hui Wang <hui.wang@canonical.com>
  1 file changed, 7 insertions(+), 4 deletions(-)
 
 diff --git a/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c b/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c
-index 70cce7abfb8d8..eda7a33908b33 100644
+index 70cce7abfb8d..eda7a33908b3 100644
 --- a/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c
 +++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c
 @@ -821,10 +821,6 @@ static int dwc_otg_urb_enqueue(struct usb_hcd *hcd,
@@ -342325,7 +342340,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  1 file changed, 102 insertions(+), 31 deletions(-)
 
 diff --git a/arch/arm/boot/dts/overlays/mcp342x-overlay.dts b/arch/arm/boot/dts/overlays/mcp342x-overlay.dts
-index 7bbb528f804f5..714eca5a4b5e0 100644
+index 7bbb528f804f..714eca5a4b5e 100644
 --- a/arch/arm/boot/dts/overlays/mcp342x-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/mcp342x-overlay.dts
 @@ -8,14 +8,15 @@
@@ -342532,7 +342547,7 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
  1 file changed, 2 insertions(+)
 
 diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig
-index cbdad7c47bf33..7c14f88445a84 100644
+index cbdad7c47bf3..7c14f88445a8 100644
 --- a/arch/arm64/configs/bcm2711_defconfig
 +++ b/arch/arm64/configs/bcm2711_defconfig
 @@ -53,7 +53,9 @@ CONFIG_CPU_FREQ_GOV_USERSPACE=y
@@ -342565,7 +342580,7 @@ Signed-off-by: Matthias Reichl <hias@horus.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/arch/arm/boot/dts/overlays/rpi-cirrus-wm5102-overlay.dts b/arch/arm/boot/dts/overlays/rpi-cirrus-wm5102-overlay.dts
-index 1cbf5812af35e..ed0c2745399f6 100644
+index 1cbf5812af35..ed0c2745399f 100644
 --- a/arch/arm/boot/dts/overlays/rpi-cirrus-wm5102-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/rpi-cirrus-wm5102-overlay.dts
 @@ -104,7 +104,7 @@
@@ -342597,7 +342612,7 @@ Signed-off-by: Johannes Krude <johannes@krude.de>
  1 file changed, 9 insertions(+), 1 deletion(-)
 
 diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
-index 0b9f9a06bdb52..dd7fdb53cd643 100644
+index 0b9f9a06bdb5..dd7fdb53cd64 100644
 --- a/sound/soc/soc-core.c
 +++ b/sound/soc/soc-core.c
 @@ -1656,7 +1656,15 @@ int snd_soc_runtime_set_dai_fmt(struct snd_soc_pcm_runtime *rtd,
@@ -342644,7 +342659,7 @@ Signed-off-by: Johannes Krude <johannes@krude.de>
  create mode 100644 sound/soc/bcm/justboom-both.c
 
 diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile
-index f7f5f0c3d4640..e149956a45d3c 100644
+index f7f5f0c3d464..e149956a45d3 100644
 --- a/arch/arm/boot/dts/overlays/Makefile
 +++ b/arch/arm/boot/dts/overlays/Makefile
 @@ -86,6 +86,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
@@ -342656,7 +342671,7 @@ index f7f5f0c3d4640..e149956a45d3c 100644
  	justboom-digi.dtbo \
  	ltc294x.dtbo \
 diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
-index d9a09e1296569..26b0b9bf559db 100644
+index d9a09e129656..26b0b9bf559d 100644
 --- a/arch/arm/boot/dts/overlays/README
 +++ b/arch/arm/boot/dts/overlays/README
 @@ -1388,6 +1388,26 @@ Params: flash-spi<n>-<m>        Enables flash device on SPI<n>, CS#<m>.
@@ -342688,7 +342703,7 @@ index d9a09e1296569..26b0b9bf559db 100644
          cards
 diff --git a/arch/arm/boot/dts/overlays/justboom-both-overlay.dts b/arch/arm/boot/dts/overlays/justboom-both-overlay.dts
 new file mode 100644
-index 0000000000000..9c42670631c0e
+index 000000000000..9c42670631c0
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/justboom-both-overlay.dts
 @@ -0,0 +1,65 @@
@@ -342758,7 +342773,7 @@ index 0000000000000..9c42670631c0e
 +	};
 +};
 diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig
-index 909de3fdfc6bf..75ec875028ffa 100644
+index 909de3fdfc6b..75ec875028ff 100644
 --- a/arch/arm/configs/bcm2709_defconfig
 +++ b/arch/arm/configs/bcm2709_defconfig
 @@ -957,6 +957,7 @@ CONFIG_SND_BCM2708_SOC_HIFIBERRY_AMP=m
@@ -342770,7 +342785,7 @@ index 909de3fdfc6bf..75ec875028ffa 100644
  CONFIG_SND_BCM2708_SOC_JUSTBOOM_DIGI=m
  CONFIG_SND_BCM2708_SOC_IQAUDIO_CODEC=m
 diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig
-index 3d437a331698a..8b57f1e1a54da 100644
+index 3d437a331698..8b57f1e1a54d 100644
 --- a/arch/arm/configs/bcm2711_defconfig
 +++ b/arch/arm/configs/bcm2711_defconfig
 @@ -933,6 +933,7 @@ CONFIG_SND_BCM2708_SOC_HIFIBERRY_AMP=m
@@ -342782,7 +342797,7 @@ index 3d437a331698a..8b57f1e1a54da 100644
  CONFIG_SND_BCM2708_SOC_JUSTBOOM_DIGI=m
  CONFIG_SND_BCM2708_SOC_IQAUDIO_CODEC=m
 diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig
-index 2fbd60cbea04c..428fa1cb5aaf8 100644
+index 2fbd60cbea04..428fa1cb5aaf 100644
 --- a/arch/arm/configs/bcmrpi_defconfig
 +++ b/arch/arm/configs/bcmrpi_defconfig
 @@ -949,6 +949,7 @@ CONFIG_SND_BCM2708_SOC_HIFIBERRY_AMP=m
@@ -342794,7 +342809,7 @@ index 2fbd60cbea04c..428fa1cb5aaf8 100644
  CONFIG_SND_BCM2708_SOC_JUSTBOOM_DIGI=m
  CONFIG_SND_BCM2708_SOC_IQAUDIO_CODEC=m
 diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig
-index 7c14f88445a84..b5bd18c6e07db 100644
+index 7c14f88445a8..b5bd18c6e07d 100644
 --- a/arch/arm64/configs/bcm2711_defconfig
 +++ b/arch/arm64/configs/bcm2711_defconfig
 @@ -960,6 +960,7 @@ CONFIG_SND_BCM2708_SOC_HIFIBERRY_AMP=m
@@ -342806,7 +342821,7 @@ index 7c14f88445a84..b5bd18c6e07db 100644
  CONFIG_SND_BCM2708_SOC_JUSTBOOM_DIGI=m
  CONFIG_SND_BCM2708_SOC_IQAUDIO_CODEC=m
 diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig
-index 7a29553d08d66..cfef51db953ab 100644
+index 7a29553d08d6..cfef51db953a 100644
 --- a/arch/arm64/configs/bcmrpi3_defconfig
 +++ b/arch/arm64/configs/bcmrpi3_defconfig
 @@ -799,6 +799,7 @@ CONFIG_SND_BCM2708_SOC_HIFIBERRY_DIGI=m
@@ -342818,7 +342833,7 @@ index 7a29553d08d66..cfef51db953ab 100644
  CONFIG_SND_BCM2708_SOC_JUSTBOOM_DIGI=m
  CONFIG_SND_BCM2708_SOC_IQAUDIO_CODEC=m
 diff --git a/sound/soc/bcm/Kconfig b/sound/soc/bcm/Kconfig
-index 8d50e52c1ebb2..57efe06bac746 100644
+index 8d50e52c1ebb..57efe06bac74 100644
 --- a/sound/soc/bcm/Kconfig
 +++ b/sound/soc/bcm/Kconfig
 @@ -105,6 +105,18 @@ config SND_BCM2708_SOC_RPI_PROTO
@@ -342841,7 +342856,7 @@ index 8d50e52c1ebb2..57efe06bac746 100644
  	tristate "Support for JustBoom DAC"
  	depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
 diff --git a/sound/soc/bcm/Makefile b/sound/soc/bcm/Makefile
-index 4c0486c6da0da..53909a7f33975 100644
+index 4c0486c6da0d..53909a7f3397 100644
 --- a/sound/soc/bcm/Makefile
 +++ b/sound/soc/bcm/Makefile
 @@ -17,6 +17,7 @@ snd-soc-hifiberry-dacplus-objs := hifiberry_dacplus.o
@@ -342862,7 +342877,7 @@ index 4c0486c6da0da..53909a7f33975 100644
  obj-$(CONFIG_SND_BCM2708_SOC_RPI_PROTO) += snd-soc-rpi-proto.o
 diff --git a/sound/soc/bcm/justboom-both.c b/sound/soc/bcm/justboom-both.c
 new file mode 100644
-index 0000000000000..3d0194c1cab8b
+index 000000000000..3d0194c1cab8
 --- /dev/null
 +++ b/sound/soc/bcm/justboom-both.c
 @@ -0,0 +1,266 @@
@@ -343150,7 +343165,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/arch/arm/boot/dts/overlays/dht11-overlay.dts b/arch/arm/boot/dts/overlays/dht11-overlay.dts
-index 8de67527e3179..6feeeb402493e 100644
+index 8de67527e317..6feeeb402493 100644
 --- a/arch/arm/boot/dts/overlays/dht11-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/dht11-overlay.dts
 @@ -24,7 +24,7 @@
@@ -343193,7 +343208,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  5 files changed, 5 insertions(+)
 
 diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig
-index 75ec875028ffa..375b13b5590a7 100644
+index 75ec875028ff..375b13b5590a 100644
 --- a/arch/arm/configs/bcm2709_defconfig
 +++ b/arch/arm/configs/bcm2709_defconfig
 @@ -352,6 +352,7 @@ CONFIG_NET_SCH_CHOKE=m
@@ -343205,7 +343220,7 @@ index 75ec875028ffa..375b13b5590a7 100644
  CONFIG_NET_SCH_HHF=m
  CONFIG_NET_SCH_PIE=m
 diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig
-index 8b57f1e1a54da..a4ee29493baba 100644
+index 8b57f1e1a54d..a4ee29493bab 100644
 --- a/arch/arm/configs/bcm2711_defconfig
 +++ b/arch/arm/configs/bcm2711_defconfig
 @@ -318,6 +318,7 @@ CONFIG_NET_SCH_CHOKE=m
@@ -343217,7 +343232,7 @@ index 8b57f1e1a54da..a4ee29493baba 100644
  CONFIG_NET_SCH_HHF=m
  CONFIG_NET_SCH_PIE=m
 diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig
-index 428fa1cb5aaf8..552cfe30f9c23 100644
+index 428fa1cb5aaf..552cfe30f9c2 100644
 --- a/arch/arm/configs/bcmrpi_defconfig
 +++ b/arch/arm/configs/bcmrpi_defconfig
 @@ -345,6 +345,7 @@ CONFIG_NET_SCH_CHOKE=m
@@ -343229,7 +343244,7 @@ index 428fa1cb5aaf8..552cfe30f9c23 100644
  CONFIG_NET_SCH_HHF=m
  CONFIG_NET_SCH_PIE=m
 diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig
-index b5bd18c6e07db..7016eff0d4ea2 100644
+index b5bd18c6e07d..7016eff0d4ea 100644
 --- a/arch/arm64/configs/bcm2711_defconfig
 +++ b/arch/arm64/configs/bcm2711_defconfig
 @@ -353,6 +353,7 @@ CONFIG_NET_SCH_CHOKE=m
@@ -343241,7 +343256,7 @@ index b5bd18c6e07db..7016eff0d4ea2 100644
  CONFIG_NET_SCH_HHF=m
  CONFIG_NET_SCH_PIE=m
 diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig
-index cfef51db953ab..10cf5ac4b833c 100644
+index cfef51db953a..10cf5ac4b833 100644
 --- a/arch/arm64/configs/bcmrpi3_defconfig
 +++ b/arch/arm64/configs/bcmrpi3_defconfig
 @@ -305,6 +305,7 @@ CONFIG_NET_SCH_CHOKE=m
@@ -343273,7 +343288,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  5 files changed, 5 insertions(+)
 
 diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig
-index 375b13b5590a7..6ac0eccf7094f 100644
+index 375b13b5590a..6ac0eccf7094 100644
 --- a/arch/arm/configs/bcm2709_defconfig
 +++ b/arch/arm/configs/bcm2709_defconfig
 @@ -1201,6 +1201,7 @@ CONFIG_RTC_DRV_ISL1208=m
@@ -343285,7 +343300,7 @@ index 375b13b5590a7..6ac0eccf7094f 100644
  CONFIG_RTC_DRV_PCF8583=m
  CONFIG_RTC_DRV_M41T80=m
 diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig
-index a4ee29493baba..79c5c0d9ff61a 100644
+index a4ee29493bab..79c5c0d9ff61 100644
 --- a/arch/arm/configs/bcm2711_defconfig
 +++ b/arch/arm/configs/bcm2711_defconfig
 @@ -1198,6 +1198,7 @@ CONFIG_RTC_DRV_ISL1208=m
@@ -343297,7 +343312,7 @@ index a4ee29493baba..79c5c0d9ff61a 100644
  CONFIG_RTC_DRV_PCF8583=m
  CONFIG_RTC_DRV_M41T80=m
 diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig
-index 552cfe30f9c23..5e9a2a59c8757 100644
+index 552cfe30f9c2..5e9a2a59c875 100644
 --- a/arch/arm/configs/bcmrpi_defconfig
 +++ b/arch/arm/configs/bcmrpi_defconfig
 @@ -1211,6 +1211,7 @@ CONFIG_RTC_DRV_ISL1208=m
@@ -343309,7 +343324,7 @@ index 552cfe30f9c23..5e9a2a59c8757 100644
  CONFIG_RTC_DRV_PCF8583=m
  CONFIG_RTC_DRV_M41T80=m
 diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig
-index 7016eff0d4ea2..9ee06bd5932e7 100644
+index 7016eff0d4ea..9ee06bd5932e 100644
 --- a/arch/arm64/configs/bcm2711_defconfig
 +++ b/arch/arm64/configs/bcm2711_defconfig
 @@ -1225,6 +1225,7 @@ CONFIG_RTC_DRV_ISL1208=m
@@ -343321,7 +343336,7 @@ index 7016eff0d4ea2..9ee06bd5932e7 100644
  CONFIG_RTC_DRV_PCF8583=m
  CONFIG_RTC_DRV_M41T80=m
 diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig
-index 10cf5ac4b833c..d8efa2d79d10a 100644
+index 10cf5ac4b833..d8efa2d79d10 100644
 --- a/arch/arm64/configs/bcmrpi3_defconfig
 +++ b/arch/arm64/configs/bcmrpi3_defconfig
 @@ -1016,6 +1016,7 @@ CONFIG_RTC_DRV_ISL1208=m
@@ -343350,7 +343365,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  2 files changed, 18 insertions(+)
 
 diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
-index 26b0b9bf559db..e40ab828022cb 100644
+index 26b0b9bf559d..e40ab828022c 100644
 --- a/arch/arm/boot/dts/overlays/README
 +++ b/arch/arm/boot/dts/overlays/README
 @@ -1078,6 +1078,8 @@ Params: abx80x                  Select one of the ABx80x family:
@@ -343363,7 +343378,7 @@ index 26b0b9bf559db..e40ab828022cb 100644
  
          rv3028                  Select the Micro Crystal RV3028 device
 diff --git a/arch/arm/boot/dts/overlays/i2c-rtc-overlay.dts b/arch/arm/boot/dts/overlays/i2c-rtc-overlay.dts
-index af5ca042de75a..5df390b52a7bb 100644
+index af5ca042de75..5df390b52a7b 100644
 --- a/arch/arm/boot/dts/overlays/i2c-rtc-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/i2c-rtc-overlay.dts
 @@ -188,6 +188,21 @@
@@ -343415,7 +343430,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/pinctrl/bcm/pinctrl-bcm2835.c b/drivers/pinctrl/bcm/pinctrl-bcm2835.c
-index 4ce2dd704c130..c8db202f239da 100644
+index 4ce2dd704c13..c8db202f239d 100644
 --- a/drivers/pinctrl/bcm/pinctrl-bcm2835.c
 +++ b/drivers/pinctrl/bcm/pinctrl-bcm2835.c
 @@ -1140,7 +1140,7 @@ static int bcm2835_pinctrl_probe(struct platform_device *pdev)
@@ -343454,7 +343469,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  1 file changed, 17 insertions(+), 23 deletions(-)
 
 diff --git a/drivers/pinctrl/bcm/pinctrl-bcm2835.c b/drivers/pinctrl/bcm/pinctrl-bcm2835.c
-index c8db202f239da..cf308212fecab 100644
+index c8db202f239d..cf308212feca 100644
 --- a/drivers/pinctrl/bcm/pinctrl-bcm2835.c
 +++ b/drivers/pinctrl/bcm/pinctrl-bcm2835.c
 @@ -1140,9 +1140,25 @@ static int bcm2835_pinctrl_probe(struct platform_device *pdev)
@@ -343545,7 +343560,7 @@ Signed-off-by: Giedrius Trainavičius <giedrius@blokas.io>
  1 file changed, 18 insertions(+), 13 deletions(-)
 
 diff --git a/sound/soc/bcm/pisound.c b/sound/soc/bcm/pisound.c
-index 6af9921b55c71..c9a881cf8f7c7 100644
+index 6af9921b55c7..c9a881cf8f7c 100644
 --- a/sound/soc/bcm/pisound.c
 +++ b/sound/soc/bcm/pisound.c
 @@ -1,6 +1,6 @@
@@ -343648,7 +343663,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  1 file changed, 22 insertions(+), 21 deletions(-)
 
 diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c
-index e8c8b355548a5..e646818ff21c3 100644
+index e8c8b355548a..e646818ff21c 100644
 --- a/drivers/pci/controller/pcie-brcmstb.c
 +++ b/drivers/pci/controller/pcie-brcmstb.c
 @@ -633,16 +633,17 @@ static int brcmstb_platform_notifier(struct notifier_block *nb,
@@ -343797,7 +343812,7 @@ causing problems for some users.
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
-index 2478da59c58d2..b80dde1050ff9 100644
+index 2478da59c58d..b80dde1050ff 100644
 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
 @@ -2769,6 +2769,8 @@ brcmf_cfg80211_set_power_mgmt(struct wiphy *wiphy, struct net_device *ndev,
@@ -343836,10 +343851,10 @@ Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
  1 file changed, 4 deletions(-)
 
 diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
-index c140c8dfd56ef..a1aeb2e105641 100644
+index 1142d4c3fd69..92709232529a 100644
 --- a/drivers/mmc/host/sdhci.c
 +++ b/drivers/mmc/host/sdhci.c
-@@ -3106,10 +3106,6 @@ static irqreturn_t sdhci_irq(int irq, void *dev_id)
+@@ -3108,10 +3108,6 @@ static irqreturn_t sdhci_irq(int irq, void *dev_id)
  			result = IRQ_WAKE_THREAD;
  		}
  
@@ -343879,7 +343894,7 @@ Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
  1 file changed, 2 insertions(+), 8 deletions(-)
 
 diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi
-index f0dbd6af90fae..701123c5f6ee2 100644
+index f0dbd6af90fa..701123c5f6ee 100644
 --- a/arch/arm/boot/dts/bcm283x.dtsi
 +++ b/arch/arm/boot/dts/bcm283x.dtsi
 @@ -635,22 +635,16 @@
@@ -343929,7 +343944,7 @@ Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
  3 files changed, 18 insertions(+), 11 deletions(-)
 
 diff --git a/arch/arm/boot/dts/bcm2835-common.dtsi b/arch/arm/boot/dts/bcm2835-common.dtsi
-index eceb170fd5b7b..c0f389ee010b6 100644
+index eceb170fd5b7..c0f389ee010b 100644
 --- a/arch/arm/boot/dts/bcm2835-common.dtsi
 +++ b/arch/arm/boot/dts/bcm2835-common.dtsi
 @@ -6,17 +6,6 @@
@@ -343951,7 +343966,7 @@ index eceb170fd5b7b..c0f389ee010b6 100644
  			compatible = "brcm,bcm2835-armctrl-ic";
  			reg = <0x7e00b200 0x200>;
 diff --git a/arch/arm/boot/dts/bcm2838.dtsi b/arch/arm/boot/dts/bcm2838.dtsi
-index 41a31cacdffed..7c5334c848b72 100644
+index 41a31cacdffe..7c5334c848b7 100644
 --- a/arch/arm/boot/dts/bcm2838.dtsi
 +++ b/arch/arm/boot/dts/bcm2838.dtsi
 @@ -711,6 +711,13 @@
@@ -343969,7 +343984,7 @@ index 41a31cacdffed..7c5334c848b72 100644
  	interrupts = <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>;
  };
 diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi
-index 701123c5f6ee2..c9f405a0f5ecb 100644
+index 701123c5f6ee..c9f405a0f5ec 100644
 --- a/arch/arm/boot/dts/bcm283x.dtsi
 +++ b/arch/arm/boot/dts/bcm283x.dtsi
 @@ -56,6 +56,17 @@
@@ -344011,7 +344026,7 @@ Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
  3 files changed, 18 insertions(+), 30 deletions(-)
 
 diff --git a/arch/arm/boot/dts/bcm2835-common.dtsi b/arch/arm/boot/dts/bcm2835-common.dtsi
-index c0f389ee010b6..96ca0660dce16 100644
+index c0f389ee010b..96ca0660dce1 100644
 --- a/arch/arm/boot/dts/bcm2835-common.dtsi
 +++ b/arch/arm/boot/dts/bcm2835-common.dtsi
 @@ -13,6 +13,18 @@
@@ -344047,7 +344062,7 @@ index c0f389ee010b6..96ca0660dce16 100644
  			compatible = "brcm,bcm2835-v3d";
  			reg = <0x7ec00000 0x1000>;
 diff --git a/arch/arm/boot/dts/bcm2838.dtsi b/arch/arm/boot/dts/bcm2838.dtsi
-index 7c5334c848b72..f7b64e0770431 100644
+index 7c5334c848b7..f7b64e077043 100644
 --- a/arch/arm/boot/dts/bcm2838.dtsi
 +++ b/arch/arm/boot/dts/bcm2838.dtsi
 @@ -188,14 +188,6 @@
@@ -344077,7 +344092,7 @@ index 7c5334c848b72..f7b64e0770431 100644
  
  	arm-pmu {
 diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi
-index c9f405a0f5ecb..1a78bd08c19ee 100644
+index c9f405a0f5ec..1a78bd08c19e 100644
 --- a/arch/arm/boot/dts/bcm283x.dtsi
 +++ b/arch/arm/boot/dts/bcm283x.dtsi
 @@ -432,18 +432,6 @@
@@ -344131,7 +344146,7 @@ Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/arch/arm/boot/dts/bcm2838-rpi-4-b.dts b/arch/arm/boot/dts/bcm2838-rpi-4-b.dts
-index 7170a97bd3e4f..35502763882e0 100644
+index 7170a97bd3e4..35502763882e 100644
 --- a/arch/arm/boot/dts/bcm2838-rpi-4-b.dts
 +++ b/arch/arm/boot/dts/bcm2838-rpi-4-b.dts
 @@ -14,7 +14,8 @@
@@ -344164,7 +344179,7 @@ Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/arch/arm/boot/dts/bcm2838-rpi-4-b.dts b/arch/arm/boot/dts/bcm2838-rpi-4-b.dts
-index 35502763882e0..e65f924e1fd29 100644
+index 35502763882e..e65f924e1fd2 100644
 --- a/arch/arm/boot/dts/bcm2838-rpi-4-b.dts
 +++ b/arch/arm/boot/dts/bcm2838-rpi-4-b.dts
 @@ -101,7 +101,8 @@
@@ -344196,7 +344211,7 @@ Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/arch/arm/boot/dts/bcm2838.dtsi b/arch/arm/boot/dts/bcm2838.dtsi
-index f7b64e0770431..9b6edd6af4f27 100644
+index f7b64e077043..9b6edd6af4f2 100644
 --- a/arch/arm/boot/dts/bcm2838.dtsi
 +++ b/arch/arm/boot/dts/bcm2838.dtsi
 @@ -27,7 +27,7 @@
@@ -344246,7 +344261,7 @@ Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
  2 files changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/arch/arm/boot/dts/bcm2835-common.dtsi b/arch/arm/boot/dts/bcm2835-common.dtsi
-index 96ca0660dce16..dc67679a3a041 100644
+index 96ca0660dce1..dc67679a3a04 100644
 --- a/arch/arm/boot/dts/bcm2835-common.dtsi
 +++ b/arch/arm/boot/dts/bcm2835-common.dtsi
 @@ -5,6 +5,8 @@
@@ -344259,7 +344274,7 @@ index 96ca0660dce16..dc67679a3a041 100644
  		intc: interrupt-controller@7e00b200 {
  			compatible = "brcm,bcm2835-armctrl-ic";
 diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi
-index 1a78bd08c19ee..3706a795b586c 100644
+index 1a78bd08c19e..3706a795b586 100644
 --- a/arch/arm/boot/dts/bcm283x.dtsi
 +++ b/arch/arm/boot/dts/bcm283x.dtsi
 @@ -18,7 +18,6 @@
@@ -344289,7 +344304,7 @@ Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
  1 file changed, 1 deletion(-)
 
 diff --git a/arch/arm/boot/dts/bcm2838.dtsi b/arch/arm/boot/dts/bcm2838.dtsi
-index 9b6edd6af4f27..bfde2a2ad3d00 100644
+index 9b6edd6af4f2..bfde2a2ad3d0 100644
 --- a/arch/arm/boot/dts/bcm2838.dtsi
 +++ b/arch/arm/boot/dts/bcm2838.dtsi
 @@ -231,7 +231,6 @@
@@ -344317,7 +344332,7 @@ This reverts commit 0f6693225eee62ee01c479c86fff76442979f906.
  2 files changed, 21 deletions(-)
 
 diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c
-index ed394d48ea247..405f5ff394be6 100644
+index ed394d48ea24..405f5ff394be 100644
 --- a/drivers/net/phy/broadcom.c
 +++ b/drivers/net/phy/broadcom.c
 @@ -43,21 +43,6 @@ static int bcm54210e_config_init(struct phy_device *phydev)
@@ -344352,7 +344367,7 @@ index ed394d48ea247..405f5ff394be6 100644
  		err = bcm54612e_config_init(phydev);
  		if (err)
 diff --git a/include/linux/brcmphy.h b/include/linux/brcmphy.h
-index d7ebafbb32218..bfb37218f435c 100644
+index d7ebafbb3221..bfb37218f435 100644
 --- a/include/linux/brcmphy.h
 +++ b/include/linux/brcmphy.h
 @@ -185,10 +185,6 @@
@@ -344383,7 +344398,7 @@ This reverts commit a377688aa4f69ebfe75c9dfc986e7d19605eb39f.
  2 files changed, 3 insertions(+), 14 deletions(-)
 
 diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c
-index 405f5ff394be6..56f029579b24d 100644
+index 405f5ff394be..56f029579b24 100644
 --- a/drivers/net/phy/broadcom.c
 +++ b/drivers/net/phy/broadcom.c
 @@ -213,8 +213,7 @@ static void bcm54xx_adjust_rxrefclk(struct phy_device *phydev)
@@ -344429,7 +344444,7 @@ index 405f5ff394be6..56f029579b24d 100644
  	{ PHY_ID_BCM54612E, 0xfffffff0 },
  	{ PHY_ID_BCM54616S, 0xfffffff0 },
 diff --git a/include/linux/brcmphy.h b/include/linux/brcmphy.h
-index bfb37218f435c..6db2d9a6e5031 100644
+index bfb37218f435..6db2d9a6e503 100644
 --- a/include/linux/brcmphy.h
 +++ b/include/linux/brcmphy.h
 @@ -20,7 +20,6 @@
@@ -344458,7 +344473,7 @@ Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/net/ethernet/broadcom/genet/bcmmii.c b/drivers/net/ethernet/broadcom/genet/bcmmii.c
-index 3ba7332957186..0516d14f47035 100644
+index 3ba733295718..0516d14f4703 100644
 --- a/drivers/net/ethernet/broadcom/genet/bcmmii.c
 +++ b/drivers/net/ethernet/broadcom/genet/bcmmii.c
 @@ -274,10 +274,11 @@ int bcmgenet_mii_config(struct net_device *dev, bool init)
@@ -344494,7 +344509,7 @@ Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
  3 files changed, 32 insertions(+), 13 deletions(-)
 
 diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
-index a967a7b86f2c1..78273ec873ffe 100644
+index a967a7b86f2c..78273ec873ff 100644
 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
 +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
 @@ -134,6 +134,20 @@
@@ -344519,7 +344534,7 @@ index a967a7b86f2c1..78273ec873ffe 100644
  	act_led: act {
  		label = "led0";
 diff --git a/arch/arm/boot/dts/bcm2838-rpi-4-b.dts b/arch/arm/boot/dts/bcm2838-rpi-4-b.dts
-index e65f924e1fd29..7c3fc83fe66eb 100644
+index e65f924e1fd2..7c3fc83fe66e 100644
 --- a/arch/arm/boot/dts/bcm2838-rpi-4-b.dts
 +++ b/arch/arm/boot/dts/bcm2838-rpi-4-b.dts
 @@ -98,6 +98,20 @@
@@ -344544,7 +344559,7 @@ index e65f924e1fd29..7c3fc83fe66eb 100644
  &uart0 {
  	pinctrl-names = "default";
 diff --git a/arch/arm/boot/dts/bcm2838.dtsi b/arch/arm/boot/dts/bcm2838.dtsi
-index bfde2a2ad3d00..e6c79a2949e55 100644
+index bfde2a2ad3d0..e6c79a2949e5 100644
 --- a/arch/arm/boot/dts/bcm2838.dtsi
 +++ b/arch/arm/boot/dts/bcm2838.dtsi
 @@ -346,29 +346,20 @@
@@ -344600,7 +344615,7 @@ Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
  3 files changed, 20 insertions(+), 6 deletions(-)
 
 diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig
-index e25dfc9494462..6ff7c5694bd97 100644
+index e25dfc949446..6ff7c5694bd9 100644
 --- a/arch/arm/mach-bcm/Kconfig
 +++ b/arch/arm/mach-bcm/Kconfig
 @@ -161,7 +161,7 @@ config ARCH_BCM2835
@@ -344622,7 +344637,7 @@ index e25dfc9494462..6ff7c5694bd97 100644
  
  config ARCH_BCM_53573
 diff --git a/arch/arm/mach-bcm/board_bcm2835.c b/arch/arm/mach-bcm/board_bcm2835.c
-index 0ec49d8571340..b7491ddb68412 100644
+index 0ec49d857134..b7491ddb6841 100644
 --- a/arch/arm/mach-bcm/board_bcm2835.c
 +++ b/arch/arm/mach-bcm/board_bcm2835.c
 @@ -109,6 +109,19 @@ static const char * const bcm2835_compat[] = {
@@ -344661,7 +344676,7 @@ index 0ec49d8571340..b7491ddb68412 100644
  	.smp = smp_ops(bcm2836_smp_ops),
  MACHINE_END
 diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms
-index 9dccf4db319b1..a65d89ff6a374 100644
+index 9dccf4db319b..a65d89ff6a37 100644
 --- a/arch/arm64/Kconfig.platforms
 +++ b/arch/arm64/Kconfig.platforms
 @@ -37,11 +37,12 @@ config ARCH_BCM2835
@@ -344703,7 +344718,7 @@ Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
  1 file changed, 1 insertion(+)
 
 diff --git a/drivers/char/hw_random/iproc-rng200.c b/drivers/char/hw_random/iproc-rng200.c
-index f971a4cb8951c..7b6966b7f6028 100644
+index f971a4cb8951..7b6966b7f602 100644
 --- a/drivers/char/hw_random/iproc-rng200.c
 +++ b/drivers/char/hw_random/iproc-rng200.c
 @@ -292,6 +292,7 @@ static int iproc_rng200_probe(struct platform_device *pdev)
@@ -344732,7 +344747,7 @@ Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/arch/arm/boot/dts/bcm2838.dtsi b/arch/arm/boot/dts/bcm2838.dtsi
-index e6c79a2949e55..60c706b4def06 100644
+index e6c79a2949e5..60c706b4def0 100644
 --- a/arch/arm/boot/dts/bcm2838.dtsi
 +++ b/arch/arm/boot/dts/bcm2838.dtsi
 @@ -682,7 +682,7 @@
@@ -344765,7 +344780,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 1 insertion(+)
 
 diff --git a/drivers/char/broadcom/rpivid-mem.c b/drivers/char/broadcom/rpivid-mem.c
-index e4e5fb1fb8209..f69047d6f9644 100644
+index e4e5fb1fb820..f69047d6f964 100644
 --- a/drivers/char/broadcom/rpivid-mem.c
 +++ b/drivers/char/broadcom/rpivid-mem.c
 @@ -233,6 +233,7 @@ static int rpivid_mem_remove(struct platform_device *pdev)
@@ -344798,7 +344813,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 7 insertions(+), 10 deletions(-)
 
 diff --git a/drivers/char/broadcom/rpivid-mem.c b/drivers/char/broadcom/rpivid-mem.c
-index f69047d6f9644..ab42526ea8cf7 100644
+index f69047d6f964..ab42526ea8cf 100644
 --- a/drivers/char/broadcom/rpivid-mem.c
 +++ b/drivers/char/broadcom/rpivid-mem.c
 @@ -130,10 +130,8 @@ static const struct of_device_id rpivid_mem_of_match[];
@@ -344863,7 +344878,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 9 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/char/broadcom/rpivid-mem.c b/drivers/char/broadcom/rpivid-mem.c
-index ab42526ea8cf7..331e2e72aa4b1 100644
+index ab42526ea8cf..331e2e72aa4b 100644
 --- a/drivers/char/broadcom/rpivid-mem.c
 +++ b/drivers/char/broadcom/rpivid-mem.c
 @@ -201,9 +201,14 @@ static int rpivid_mem_probe(struct platform_device *pdev)
@@ -344910,7 +344925,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/char/broadcom/rpivid-mem.c b/drivers/char/broadcom/rpivid-mem.c
-index 331e2e72aa4b1..432fb05944f2a 100644
+index 331e2e72aa4b..432fb05944f2 100644
 --- a/drivers/char/broadcom/rpivid-mem.c
 +++ b/drivers/char/broadcom/rpivid-mem.c
 @@ -66,6 +66,7 @@ static int rpivid_mem_open(struct inode *inode, struct file *file)
@@ -344946,7 +344961,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 1 insertion(+)
 
 diff --git a/drivers/char/broadcom/rpivid-mem.c b/drivers/char/broadcom/rpivid-mem.c
-index 432fb05944f2a..fa97649b86c0b 100644
+index 432fb05944f2..fa97649b86c0 100644
 --- a/drivers/char/broadcom/rpivid-mem.c
 +++ b/drivers/char/broadcom/rpivid-mem.c
 @@ -1,3 +1,4 @@
@@ -344975,7 +344990,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/char/broadcom/rpivid-mem.c b/drivers/char/broadcom/rpivid-mem.c
-index fa97649b86c0b..fbf3d4f3fe0cb 100644
+index fa97649b86c0..fbf3d4f3fe0c 100644
 --- a/drivers/char/broadcom/rpivid-mem.c
 +++ b/drivers/char/broadcom/rpivid-mem.c
 @@ -229,7 +229,7 @@ static int rpivid_mem_probe(struct platform_device *pdev)
@@ -345002,7 +345017,7 @@ Subject: [PATCH 0431/1225] add BME680 to i2c-sensor overlay
  2 files changed, 23 insertions(+), 3 deletions(-)
 
 diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
-index e40ab828022cb..917ce600b4f44 100644
+index e40ab828022c..917ce600b4f4 100644
 --- a/arch/arm/boot/dts/overlays/README
 +++ b/arch/arm/boot/dts/overlays/README
 @@ -1159,12 +1159,15 @@ Name:   i2c-sensor
@@ -345024,7 +345039,7 @@ index e40ab828022cb..917ce600b4f44 100644
  
          bmp180                  Select the Bosch Sensortronic BMP180
 diff --git a/arch/arm/boot/dts/overlays/i2c-sensor-overlay.dts b/arch/arm/boot/dts/overlays/i2c-sensor-overlay.dts
-index 777e4a68190a4..40881d72a1574 100644
+index 777e4a68190a..40881d72a157 100644
 --- a/arch/arm/boot/dts/overlays/i2c-sensor-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/i2c-sensor-overlay.dts
 @@ -216,10 +216,26 @@
@@ -345080,7 +345095,7 @@ Subject: [PATCH 0432/1225] configs: Add BME680
  5 files changed, 5 insertions(+)
 
 diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig
-index 6ac0eccf7094f..d45d8ce837299 100644
+index 6ac0eccf7094..d45d8ce83729 100644
 --- a/arch/arm/configs/bcm2709_defconfig
 +++ b/arch/arm/configs/bcm2709_defconfig
 @@ -1285,6 +1285,7 @@ CONFIG_IIO_BUFFER_CB=m
@@ -345092,7 +345107,7 @@ index 6ac0eccf7094f..d45d8ce837299 100644
  CONFIG_HDC100X=m
  CONFIG_HTU21=m
 diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig
-index 79c5c0d9ff61a..5dc0164740085 100644
+index 79c5c0d9ff61..5dc016474008 100644
 --- a/arch/arm/configs/bcm2711_defconfig
 +++ b/arch/arm/configs/bcm2711_defconfig
 @@ -1283,6 +1283,7 @@ CONFIG_IIO_BUFFER_CB=m
@@ -345104,7 +345119,7 @@ index 79c5c0d9ff61a..5dc0164740085 100644
  CONFIG_HDC100X=m
  CONFIG_HTU21=m
 diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig
-index 5e9a2a59c8757..b1d7a3bb1ca0a 100644
+index 5e9a2a59c875..b1d7a3bb1ca0 100644
 --- a/arch/arm/configs/bcmrpi_defconfig
 +++ b/arch/arm/configs/bcmrpi_defconfig
 @@ -1295,6 +1295,7 @@ CONFIG_IIO_BUFFER_CB=m
@@ -345116,7 +345131,7 @@ index 5e9a2a59c8757..b1d7a3bb1ca0a 100644
  CONFIG_HDC100X=m
  CONFIG_HTU21=m
 diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig
-index 9ee06bd5932e7..acab5c6121f99 100644
+index 9ee06bd5932e..acab5c6121f9 100644
 --- a/arch/arm64/configs/bcm2711_defconfig
 +++ b/arch/arm64/configs/bcm2711_defconfig
 @@ -1310,6 +1310,7 @@ CONFIG_IIO_BUFFER_CB=m
@@ -345128,7 +345143,7 @@ index 9ee06bd5932e7..acab5c6121f99 100644
  CONFIG_HDC100X=m
  CONFIG_HTU21=m
 diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig
-index d8efa2d79d10a..48eb2e6e342b9 100644
+index d8efa2d79d10..48eb2e6e342b 100644
 --- a/arch/arm64/configs/bcmrpi3_defconfig
 +++ b/arch/arm64/configs/bcmrpi3_defconfig
 @@ -1095,6 +1095,7 @@ CONFIG_IIO=m
@@ -345167,7 +345182,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/usb/host/dwc_otg/dwc_otg_hcd.c b/drivers/usb/host/dwc_otg/dwc_otg_hcd.c
-index 9f2cd510c3015..cba2aa07e8b87 100644
+index 9f2cd510c301..cba2aa07e8b8 100644
 --- a/drivers/usb/host/dwc_otg/dwc_otg_hcd.c
 +++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd.c
 @@ -1813,7 +1813,7 @@ int fiq_fsm_queue_split_transaction(dwc_otg_hcd_t *hcd, dwc_otg_qh_t *qh)
@@ -345213,7 +345228,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
  2 files changed, 32 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/usb/host/dwc_otg/dwc_otg_hcd.c b/drivers/usb/host/dwc_otg/dwc_otg_hcd.c
-index cba2aa07e8b87..0f6645e2383c0 100644
+index cba2aa07e8b8..0f6645e2383c 100644
 --- a/drivers/usb/host/dwc_otg/dwc_otg_hcd.c
 +++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd.c
 @@ -175,6 +175,7 @@ static void kill_urbs_in_qh_list(dwc_otg_hcd_t * hcd, dwc_list_link_t * qh_list)
@@ -345280,7 +345295,7 @@ index cba2aa07e8b87..0f6645e2383c0 100644
  				dwc_otg_hc_halt(hcd->core_if, qh->channel,
  						DWC_OTG_HC_XFER_URB_DEQUEUE);
 diff --git a/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h b/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h
-index 0e9a34fe3a5c8..7a77977c9ddf9 100644
+index 0e9a34fe3a5c..7a77977c9ddf 100644
 --- a/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h
 +++ b/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h
 @@ -27,6 +27,7 @@
@@ -345323,7 +345338,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
  1 file changed, 6 insertions(+)
 
 diff --git a/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c b/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c
-index a86d8ed771409..490a7801e737e 100644
+index a86d8ed77140..490a7801e737 100644
 --- a/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c
 +++ b/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c
 @@ -1259,6 +1259,9 @@ void notrace dwc_otg_fiq_fsm(struct fiq_state *state, int num_channels)
@@ -345374,7 +345389,7 @@ Signed-off-by: Ed Spiridonov <edo.rus@gmail.com>
  create mode 100755 arch/arm/boot/dts/overlays/anyspi-overlay.dts
 
 diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile
-index e149956a45d3c..c2c4834f07225 100644
+index e149956a45d3..c2c4834f0722 100644
 --- a/arch/arm/boot/dts/overlays/Makefile
 +++ b/arch/arm/boot/dts/overlays/Makefile
 @@ -15,6 +15,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
@@ -345386,7 +345401,7 @@ index e149956a45d3c..c2c4834f07225 100644
  	applepi-dac.dtbo \
  	at86rf233.dtbo \
 diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
-index 917ce600b4f44..c19139d7ed0d5 100644
+index 917ce600b4f4..c19139d7ed0d 100644
 --- a/arch/arm/boot/dts/overlays/README
 +++ b/arch/arm/boot/dts/overlays/README
 @@ -441,6 +441,29 @@ Params: 24db_digital_gain       Allow gain to be applied via the PCM512x codec
@@ -345421,7 +345436,7 @@ index 917ce600b4f44..c19139d7ed0d5 100644
          gesture sensor
 diff --git a/arch/arm/boot/dts/overlays/anyspi-overlay.dts b/arch/arm/boot/dts/overlays/anyspi-overlay.dts
 new file mode 100755
-index 0000000000000..87523dcca318c
+index 000000000000..87523dcca318
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/anyspi-overlay.dts
 @@ -0,0 +1,205 @@
@@ -345665,7 +345680,7 @@ Signed-off-by: Joerg Schambacher <joerg@i2audio.com>
  create mode 100644 sound/soc/bcm/hifiberry_dacplushd.c
 
 diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile
-index c2c4834f07225..e5e7183d2cdbe 100644
+index c2c4834f0722..e5e7183d2cdb 100644
 --- a/arch/arm/boot/dts/overlays/Makefile
 +++ b/arch/arm/boot/dts/overlays/Makefile
 @@ -57,6 +57,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
@@ -345677,7 +345692,7 @@ index c2c4834f07225..e5e7183d2cdbe 100644
  	hifiberry-digi-pro.dtbo \
  	hy28a.dtbo \
 diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
-index c19139d7ed0d5..aacdbb4ca735a 100644
+index c19139d7ed0d..aacdbb4ca735 100644
 --- a/arch/arm/boot/dts/overlays/README
 +++ b/arch/arm/boot/dts/overlays/README
 @@ -956,6 +956,12 @@ Load:   dtoverlay=hifiberry-dacplusdsp
@@ -345695,7 +345710,7 @@ index c19139d7ed0d5..aacdbb4ca735a 100644
  Load:   dtoverlay=hifiberry-digi
 diff --git a/arch/arm/boot/dts/overlays/hifiberry-dacplushd-overlay.dts b/arch/arm/boot/dts/overlays/hifiberry-dacplushd-overlay.dts
 new file mode 100644
-index 0000000000000..7bf0317ea83bd
+index 000000000000..7bf0317ea83b
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/hifiberry-dacplushd-overlay.dts
 @@ -0,0 +1,106 @@
@@ -345806,7 +345821,7 @@ index 0000000000000..7bf0317ea83bd
 +
 +};
 diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig
-index d45d8ce837299..c17a505f9da52 100644
+index d45d8ce83729..c17a505f9da5 100644
 --- a/arch/arm/configs/bcm2709_defconfig
 +++ b/arch/arm/configs/bcm2709_defconfig
 @@ -950,6 +950,7 @@ CONFIG_SND_BCM2835_SOC_I2S=m
@@ -345818,7 +345833,7 @@ index d45d8ce837299..c17a505f9da52 100644
  CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSADCPRO=m
  CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSDSP=m
 diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig
-index 5dc0164740085..6cb1124733bc3 100644
+index 5dc016474008..6cb1124733bc 100644
 --- a/arch/arm/configs/bcm2711_defconfig
 +++ b/arch/arm/configs/bcm2711_defconfig
 @@ -926,6 +926,7 @@ CONFIG_SND_BCM2835_SOC_I2S=m
@@ -345830,7 +345845,7 @@ index 5dc0164740085..6cb1124733bc3 100644
  CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSADCPRO=m
  CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSDSP=m
 diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig
-index b1d7a3bb1ca0a..dddf9b16d463b 100644
+index b1d7a3bb1ca0..dddf9b16d463 100644
 --- a/arch/arm/configs/bcmrpi_defconfig
 +++ b/arch/arm/configs/bcmrpi_defconfig
 @@ -942,6 +942,7 @@ CONFIG_SND_BCM2835_SOC_I2S=m
@@ -345842,7 +345857,7 @@ index b1d7a3bb1ca0a..dddf9b16d463b 100644
  CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSADCPRO=m
  CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSDSP=m
 diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig
-index acab5c6121f99..a0605e2480afc 100644
+index acab5c6121f9..a0605e2480af 100644
 --- a/arch/arm64/configs/bcm2711_defconfig
 +++ b/arch/arm64/configs/bcm2711_defconfig
 @@ -953,6 +953,7 @@ CONFIG_SND_BCM2835_SOC_I2S=m
@@ -345854,7 +345869,7 @@ index acab5c6121f99..a0605e2480afc 100644
  CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSADCPRO=m
  CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSDSP=m
 diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig
-index 48eb2e6e342b9..3adf9e47b802c 100644
+index 48eb2e6e342b..3adf9e47b802 100644
 --- a/arch/arm64/configs/bcmrpi3_defconfig
 +++ b/arch/arm64/configs/bcmrpi3_defconfig
 @@ -796,6 +796,7 @@ CONFIG_SND_SOC=m
@@ -345866,7 +345881,7 @@ index 48eb2e6e342b9..3adf9e47b802c 100644
  CONFIG_SND_BCM2708_SOC_HIFIBERRY_AMP=m
  CONFIG_SND_BCM2708_SOC_RPI_DAC=m
 diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig
-index 98426fa4e1f92..53247319b0da7 100644
+index 98426fa4e1f9..53247319b0da 100644
 --- a/drivers/clk/Kconfig
 +++ b/drivers/clk/Kconfig
 @@ -70,6 +70,9 @@ config COMMON_CLK_HI655X
@@ -345880,7 +345895,7 @@ index 98426fa4e1f92..53247319b0da7 100644
  	tristate
  
 diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile
-index e01d58346f8a8..ed32a1e569f66 100644
+index e01d58346f8a..ed32a1e569f6 100644
 --- a/drivers/clk/Makefile
 +++ b/drivers/clk/Makefile
 @@ -36,6 +36,7 @@ obj-$(CONFIG_ARCH_HIGHBANK)		+= clk-highbank.o
@@ -345893,7 +345908,7 @@ index e01d58346f8a8..ed32a1e569f66 100644
  obj-$(CONFIG_ARCH_MILBEAUT_M10V)	+= clk-milbeaut.o
 diff --git a/drivers/clk/clk-hifiberry-dachd.c b/drivers/clk/clk-hifiberry-dachd.c
 new file mode 100644
-index 0000000000000..ec528a0aef36e
+index 000000000000..ec528a0aef36
 --- /dev/null
 +++ b/drivers/clk/clk-hifiberry-dachd.c
 @@ -0,0 +1,333 @@
@@ -346231,7 +346246,7 @@ index 0000000000000..ec528a0aef36e
 +MODULE_LICENSE("GPL v2");
 +MODULE_ALIAS("platform:clk-hifiberry-dachd");
 diff --git a/sound/soc/bcm/Kconfig b/sound/soc/bcm/Kconfig
-index 57efe06bac746..0067bae41e48f 100644
+index 57efe06bac74..0067bae41e48 100644
 --- a/sound/soc/bcm/Kconfig
 +++ b/sound/soc/bcm/Kconfig
 @@ -42,6 +42,14 @@ config SND_BCM2708_SOC_HIFIBERRY_DACPLUS
@@ -346258,7 +346273,7 @@ index 57efe06bac746..0067bae41e48f 100644
           Say Y or M if you want to add support for HifiBerry DAC+ADC PRO.
  
 diff --git a/sound/soc/bcm/Makefile b/sound/soc/bcm/Makefile
-index 53909a7f33975..6ab480dc25661 100644
+index 53909a7f3397..6ab480dc2566 100644
 --- a/sound/soc/bcm/Makefile
 +++ b/sound/soc/bcm/Makefile
 @@ -14,6 +14,7 @@ snd-soc-googlevoicehat-codec-objs := googlevoicehat-codec.o
@@ -346279,7 +346294,7 @@ index 53909a7f33975..6ab480dc25661 100644
  obj-$(CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSDSP) += snd-soc-hifiberry-dacplusdsp.o
 diff --git a/sound/soc/bcm/hifiberry_dacplushd.c b/sound/soc/bcm/hifiberry_dacplushd.c
 new file mode 100644
-index 0000000000000..79436dd0e06da
+index 000000000000..79436dd0e06d
 --- /dev/null
 +++ b/sound/soc/bcm/hifiberry_dacplushd.c
 @@ -0,0 +1,238 @@
@@ -346537,7 +346552,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  1 file changed, 3 insertions(+)
 
 diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig
-index 3adf9e47b802c..ff65bc543f61f 100644
+index 3adf9e47b802..ff65bc543f61 100644
 --- a/arch/arm64/configs/bcmrpi3_defconfig
 +++ b/arch/arm64/configs/bcmrpi3_defconfig
 @@ -797,6 +797,9 @@ CONFIG_SND_BCM2835_SOC_I2S=m
@@ -346580,7 +346595,7 @@ Co-authored-by: Phil Elwell <phil@raspberrypi.org>
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c
-index 8175ecea0fd9f..b12c63aa2b0b3 100644
+index 8175ecea0fd9..b12c63aa2b0b 100644
 --- a/drivers/clk/bcm/clk-bcm2835.c
 +++ b/drivers/clk/bcm/clk-bcm2835.c
 @@ -2403,7 +2403,7 @@ static int __init __bcm2835_clk_driver_init(void)
@@ -346593,7 +346608,7 @@ index 8175ecea0fd9f..b12c63aa2b0b3 100644
  MODULE_AUTHOR("Eric Anholt <eric@anholt.net>");
  MODULE_DESCRIPTION("BCM2835 clock driver");
 diff --git a/drivers/firmware/raspberrypi.c b/drivers/firmware/raspberrypi.c
-index 6ab3bec57532e..4f3ab14d275a2 100644
+index 6ab3bec57532..4f3ab14d275a 100644
 --- a/drivers/firmware/raspberrypi.c
 +++ b/drivers/firmware/raspberrypi.c
 @@ -416,7 +416,7 @@ static int __init rpi_firmware_init(void)
@@ -346625,7 +346640,7 @@ Signed-off-by: Joerg Schambacher <joerg@i2audio.com>
  1 file changed, 2 insertions(+)
 
 diff --git a/sound/soc/bcm/hifiberry_dacplusadcpro.c b/sound/soc/bcm/hifiberry_dacplusadcpro.c
-index cc33d41748396..06e0b6a8fda62 100644
+index cc33d4174839..06e0b6a8fda6 100644
 --- a/sound/soc/bcm/hifiberry_dacplusadcpro.c
 +++ b/sound/soc/bcm/hifiberry_dacplusadcpro.c
 @@ -285,6 +285,8 @@ static int snd_rpi_hifiberry_dacplusadcpro_init(struct snd_soc_pcm_runtime *rtd)
@@ -346659,7 +346674,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  5 files changed, 8 insertions(+), 2 deletions(-)
 
 diff --git a/arch/arm/boot/dts/overlays/hifiberry-dacplusadcpro-overlay.dts b/arch/arm/boot/dts/overlays/hifiberry-dacplusadcpro-overlay.dts
-index 00e5d450a88b1..07e70ab62cd48 100644
+index 00e5d450a88b..07e70ab62cd4 100644
 --- a/arch/arm/boot/dts/overlays/hifiberry-dacplusadcpro-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/hifiberry-dacplusadcpro-overlay.dts
 @@ -3,7 +3,7 @@
@@ -346672,7 +346687,7 @@ index 00e5d450a88b1..07e70ab62cd48 100644
  	fragment@0 {
  		target-path = "/clocks";
 diff --git a/arch/arm/boot/dts/overlays/iqaudio-codec-overlay.dts b/arch/arm/boot/dts/overlays/iqaudio-codec-overlay.dts
-index ff3ef3942c6c0..9110f5d342988 100644
+index ff3ef3942c6c..9110f5d34298 100644
 --- a/arch/arm/boot/dts/overlays/iqaudio-codec-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/iqaudio-codec-overlay.dts
 @@ -3,7 +3,7 @@
@@ -346685,7 +346700,7 @@ index ff3ef3942c6c0..9110f5d342988 100644
  	fragment@0 {
  		target = <&i2s>;
 diff --git a/arch/arm/boot/dts/overlays/pwm-2chan-overlay.dts b/arch/arm/boot/dts/overlays/pwm-2chan-overlay.dts
-index abdeddd0f2c87..4ddbbfa040658 100644
+index abdeddd0f2c8..4ddbbfa04065 100644
 --- a/arch/arm/boot/dts/overlays/pwm-2chan-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/pwm-2chan-overlay.dts
 @@ -17,6 +17,8 @@ N.B.:
@@ -346698,7 +346713,7 @@ index abdeddd0f2c87..4ddbbfa040658 100644
  		target = <&gpio>;
  		__overlay__ {
 diff --git a/arch/arm/boot/dts/overlays/pwm-overlay.dts b/arch/arm/boot/dts/overlays/pwm-overlay.dts
-index 27809e8dc7466..92876ab3bc8c5 100644
+index 27809e8dc746..92876ab3bc8c 100644
 --- a/arch/arm/boot/dts/overlays/pwm-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/pwm-overlay.dts
 @@ -15,6 +15,8 @@ N.B.:
@@ -346711,7 +346726,7 @@ index 27809e8dc7466..92876ab3bc8c5 100644
  		target = <&gpio>;
  		__overlay__ {
 diff --git a/arch/arm/boot/dts/overlays/smi-dev-overlay.dts b/arch/arm/boot/dts/overlays/smi-dev-overlay.dts
-index b610d82836081..bafab6c92506d 100644
+index b610d8283608..bafab6c92506 100644
 --- a/arch/arm/boot/dts/overlays/smi-dev-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/smi-dev-overlay.dts
 @@ -5,6 +5,8 @@
@@ -346745,7 +346760,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  1 file changed, 28 insertions(+)
 
 diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
-index 83676bc79a195..6d90ee44036b3 100644
+index 83676bc79a19..6d90ee44036b 100644
 --- a/drivers/tty/serial/amba-pl011.c
 +++ b/drivers/tty/serial/amba-pl011.c
 @@ -1326,6 +1326,32 @@ static void pl011_start_tx(struct uart_port *port)
@@ -346804,7 +346819,7 @@ Subject: [PATCH 0443/1225] Fix i2c-pwm-pca9685a overlay
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/arch/arm/boot/dts/overlays/i2c-pwm-pca9685a-overlay.dts b/arch/arm/boot/dts/overlays/i2c-pwm-pca9685a-overlay.dts
-index 108165df165ef..9bb16465a50e7 100644
+index 108165df165e..9bb16465a50e 100644
 --- a/arch/arm/boot/dts/overlays/i2c-pwm-pca9685a-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/i2c-pwm-pca9685a-overlay.dts
 @@ -13,7 +13,7 @@
@@ -346838,7 +346853,7 @@ Signed-off-by: Joerg Schambacher <joerg@i2audio.com>
  3 files changed, 16 insertions(+), 2 deletions(-)
 
 diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
-index aacdbb4ca735a..e4f7055898b20 100644
+index aacdbb4ca735..e4f7055898b2 100644
 --- a/arch/arm/boot/dts/overlays/README
 +++ b/arch/arm/boot/dts/overlays/README
 @@ -948,6 +948,8 @@ Params: 24db_digital_gain       Allow gain to be applied via the PCM512x codec
@@ -346851,7 +346866,7 @@ index aacdbb4ca735a..e4f7055898b20 100644
  
  Name:   hifiberry-dacplusdsp
 diff --git a/arch/arm/boot/dts/overlays/hifiberry-dacplusadcpro-overlay.dts b/arch/arm/boot/dts/overlays/hifiberry-dacplusadcpro-overlay.dts
-index 07e70ab62cd48..70a79bb1ec7da 100644
+index 07e70ab62cd4..70a79bb1ec7d 100644
 --- a/arch/arm/boot/dts/overlays/hifiberry-dacplusadcpro-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/hifiberry-dacplusadcpro-overlay.dts
 @@ -60,5 +60,6 @@
@@ -346862,7 +346877,7 @@ index 07e70ab62cd48..70a79bb1ec7da 100644
  	};
  };
 diff --git a/sound/soc/bcm/hifiberry_dacplusadcpro.c b/sound/soc/bcm/hifiberry_dacplusadcpro.c
-index 06e0b6a8fda62..2883c3ce9488b 100644
+index 06e0b6a8fda6..2883c3ce9488 100644
 --- a/sound/soc/bcm/hifiberry_dacplusadcpro.c
 +++ b/sound/soc/bcm/hifiberry_dacplusadcpro.c
 @@ -54,6 +54,7 @@ struct pcm512x_priv {
@@ -346937,7 +346952,7 @@ Signed-off-by: Joerg Schambacher <joerg@i2audio.com>
  3 files changed, 12 insertions(+), 1 deletion(-)
 
 diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
-index e4f7055898b20..d1dde84ebc6a5 100644
+index e4f7055898b2..d1dde84ebc6a 100644
 --- a/arch/arm/boot/dts/overlays/README
 +++ b/arch/arm/boot/dts/overlays/README
 @@ -927,6 +927,8 @@ Params: 24db_digital_gain       Allow gain to be applied via the PCM512x codec
@@ -346950,7 +346965,7 @@ index e4f7055898b20..d1dde84ebc6a5 100644
  
  Name:   hifiberry-dacplusadcpro
 diff --git a/arch/arm/boot/dts/overlays/hifiberry-dacplusadc-overlay.dts b/arch/arm/boot/dts/overlays/hifiberry-dacplusadc-overlay.dts
-index 09adcea8fd377..308a9b4df6f50 100644
+index 09adcea8fd37..308a9b4df6f5 100644
 --- a/arch/arm/boot/dts/overlays/hifiberry-dacplusadc-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/hifiberry-dacplusadc-overlay.dts
 @@ -67,5 +67,6 @@
@@ -346961,7 +346976,7 @@ index 09adcea8fd377..308a9b4df6f50 100644
  	};
  };
 diff --git a/sound/soc/bcm/hifiberry_dacplusadc.c b/sound/soc/bcm/hifiberry_dacplusadc.c
-index ab454f2ecb17b..ca763fea1d823 100644
+index ab454f2ecb17..ca763fea1d82 100644
 --- a/sound/soc/bcm/hifiberry_dacplusadc.c
 +++ b/sound/soc/bcm/hifiberry_dacplusadc.c
 @@ -54,6 +54,7 @@ struct pcm512x_priv {
@@ -347024,7 +347039,7 @@ Signed-off-by: Joerg Schambacher <joerg@i2audio.com>
  3 files changed, 12 insertions(+), 1 deletion(-)
 
 diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
-index d1dde84ebc6a5..3f324380a9f2d 100644
+index d1dde84ebc6a..3f324380a9f2 100644
 --- a/arch/arm/boot/dts/overlays/README
 +++ b/arch/arm/boot/dts/overlays/README
 @@ -906,6 +906,8 @@ Params: 24db_digital_gain       Allow gain to be applied via the PCM512x codec
@@ -347037,7 +347052,7 @@ index d1dde84ebc6a5..3f324380a9f2d 100644
  
  Name:   hifiberry-dacplusadc
 diff --git a/arch/arm/boot/dts/overlays/hifiberry-dacplus-overlay.dts b/arch/arm/boot/dts/overlays/hifiberry-dacplus-overlay.dts
-index 5cd14aac3e45f..9d6b8ebdf11e2 100644
+index 5cd14aac3e45..9d6b8ebdf11e 100644
 --- a/arch/arm/boot/dts/overlays/hifiberry-dacplus-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/hifiberry-dacplus-overlay.dts
 @@ -55,5 +55,6 @@
@@ -347048,7 +347063,7 @@ index 5cd14aac3e45f..9d6b8ebdf11e2 100644
  	};
  };
 diff --git a/sound/soc/bcm/hifiberry_dacplus.c b/sound/soc/bcm/hifiberry_dacplus.c
-index fdf6e950abd8c..4cde60a5b6f6a 100644
+index fdf6e950abd8..4cde60a5b6f6 100644
 --- a/sound/soc/bcm/hifiberry_dacplus.c
 +++ b/sound/soc/bcm/hifiberry_dacplus.c
 @@ -50,6 +50,7 @@ struct pcm512x_priv {
@@ -347109,7 +347124,7 @@ Signed-off-by: Giedrius <giedrius@blokas.io>
  1 file changed, 59 insertions(+), 27 deletions(-)
 
 diff --git a/sound/soc/bcm/pisound.c b/sound/soc/bcm/pisound.c
-index c9a881cf8f7c7..3d0861082c83d 100644
+index c9a881cf8f7c..3d0861082c83 100644
 --- a/sound/soc/bcm/pisound.c
 +++ b/sound/soc/bcm/pisound.c
 @@ -51,7 +51,8 @@ static void pisnd_spi_set_callback(pisnd_spi_recv_cb cb, void *data);
@@ -347319,7 +347334,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  1 file changed, 12 insertions(+)
 
 diff --git a/drivers/mmc/host/sdhci-iproc.c b/drivers/mmc/host/sdhci-iproc.c
-index f4f5f0a70cda8..203940fd2900b 100644
+index f4f5f0a70cda..203940fd2900 100644
 --- a/drivers/mmc/host/sdhci-iproc.c
 +++ b/drivers/mmc/host/sdhci-iproc.c
 @@ -173,6 +173,17 @@ static unsigned int sdhci_iproc_get_max_clock(struct sdhci_host *host)
@@ -347369,7 +347384,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  3 files changed, 13 insertions(+), 2 deletions(-)
 
 diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
-index 78273ec873ffe..84915c8c3930c 100644
+index 78273ec873ff..84915c8c3930 100644
 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
 +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
 @@ -122,6 +122,16 @@
@@ -347398,7 +347413,7 @@ index 78273ec873ffe..84915c8c3930c 100644
  
  &genet {
 diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig
-index 6cb1124733bc3..32d3f64545782 100644
+index 6cb1124733bc..32d3f6454578 100644
 --- a/arch/arm/configs/bcm2711_defconfig
 +++ b/arch/arm/configs/bcm2711_defconfig
 @@ -696,7 +696,7 @@ CONFIG_MFD_ARIZONA_I2C=m
@@ -347411,7 +347426,7 @@ index 6cb1124733bc3..32d3f64545782 100644
  CONFIG_REGULATOR_ARIZONA_MICSUPP=m
  CONFIG_REGULATOR_GPIO=y
 diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig
-index a0605e2480afc..315576a5b9579 100644
+index a0605e2480af..315576a5b957 100644
 --- a/arch/arm64/configs/bcm2711_defconfig
 +++ b/arch/arm64/configs/bcm2711_defconfig
 @@ -723,7 +723,7 @@ CONFIG_MFD_ARIZONA_I2C=m
@@ -347442,7 +347457,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  1 file changed, 27 insertions(+), 4 deletions(-)
 
 diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c
-index e646818ff21c3..fb777a4e47502 100644
+index e646818ff21c..fb777a4e4750 100644
 --- a/drivers/pci/controller/pcie-brcmstb.c
 +++ b/drivers/pci/controller/pcie-brcmstb.c
 @@ -206,6 +206,8 @@ enum pcie_type {
@@ -347540,7 +347555,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/arch/arm/boot/dts/bcm2838.dtsi b/arch/arm/boot/dts/bcm2838.dtsi
-index 60c706b4def06..847dc7e35c945 100644
+index 60c706b4def0..847dc7e35c94 100644
 --- a/arch/arm/boot/dts/bcm2838.dtsi
 +++ b/arch/arm/boot/dts/bcm2838.dtsi
 @@ -314,7 +314,8 @@
@@ -347573,7 +347588,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  delete mode 100644 arch/arm/boot/dts/bcm2838-rpi-4-b.dts
 
 diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
-index e6832866849dd..75436a5fc8121 100644
+index e6832866849d..75436a5fc812 100644
 --- a/arch/arm/boot/dts/Makefile
 +++ b/arch/arm/boot/dts/Makefile
 @@ -97,7 +97,6 @@ dtb-$(CONFIG_ARCH_BCM2835) += \
@@ -347586,7 +347601,7 @@ index e6832866849dd..75436a5fc8121 100644
  dtb-$(CONFIG_ARCH_BCM_5301X) += \
 diff --git a/arch/arm/boot/dts/bcm2838-rpi-4-b.dts b/arch/arm/boot/dts/bcm2838-rpi-4-b.dts
 deleted file mode 100644
-index 7c3fc83fe66eb..0000000000000
+index 7c3fc83fe66e..000000000000
 --- a/arch/arm/boot/dts/bcm2838-rpi-4-b.dts
 +++ /dev/null
 @@ -1,134 +0,0 @@
@@ -347758,7 +347773,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  1 file changed, 4 insertions(+)
 
 diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
-index 6d90ee44036b3..3cd3028827d23 100644
+index 6d90ee44036b..3cd3028827d2 100644
 --- a/drivers/tty/serial/amba-pl011.c
 +++ b/drivers/tty/serial/amba-pl011.c
 @@ -1447,6 +1447,10 @@ static bool pl011_tx_chars(struct uart_amba_port *uap, bool from_irq)
@@ -347796,7 +347811,7 @@ Signed-off-by: Tim Gover <tim.gover@raspberrypi.org>
  2 files changed, 31 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/usb/host/pci-quirks.c b/drivers/usb/host/pci-quirks.c
-index f6d04491df608..702d7015dfd15 100644
+index f6d04491df60..702d7015dfd1 100644
 --- a/drivers/usb/host/pci-quirks.c
 +++ b/drivers/usb/host/pci-quirks.c
 @@ -18,7 +18,7 @@
@@ -347852,7 +347867,7 @@ index f6d04491df608..702d7015dfd15 100644
  
  	/* Wait for the host controller to be ready before writing any
 diff --git a/include/soc/bcm2835/raspberrypi-firmware.h b/include/soc/bcm2835/raspberrypi-firmware.h
-index ae71820af8e59..05c6989ec4c66 100644
+index ae71820af8e5..05c6989ec4c6 100644
 --- a/include/soc/bcm2835/raspberrypi-firmware.h
 +++ b/include/soc/bcm2835/raspberrypi-firmware.h
 @@ -95,7 +95,7 @@ enum rpi_firmware_property_tag {
@@ -347881,7 +347896,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  1 file changed, 9 insertions(+), 8 deletions(-)
 
 diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
-index 3f324380a9f2d..4032e1120d037 100644
+index 3f324380a9f2..4032e1120d03 100644
 --- a/arch/arm/boot/dts/overlays/README
 +++ b/arch/arm/boot/dts/overlays/README
 @@ -109,27 +109,28 @@ Params:
@@ -347937,7 +347952,7 @@ This reverts commit 25c7597af20d2b1d042bafd9be84eaa69c1690b7.
  1 file changed, 2 deletions(-)
 
 diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
-index d84f7324fe148..7a9de9d0193c2 100644
+index d84f7324fe14..7a9de9d0193c 100644
 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
 +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
 @@ -139,7 +139,6 @@ static struct vchiq_state g_state;
@@ -347984,7 +347999,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  3 files changed, 10 insertions(+)
 
 diff --git a/arch/arm/boot/dts/bcm2708-rpi.dtsi b/arch/arm/boot/dts/bcm2708-rpi.dtsi
-index ce9795dad99f3..65a47168f1b6e 100644
+index ce9795dad99f..65a47168f1b6 100644
 --- a/arch/arm/boot/dts/bcm2708-rpi.dtsi
 +++ b/arch/arm/boot/dts/bcm2708-rpi.dtsi
 @@ -92,6 +92,7 @@
@@ -347996,7 +348011,7 @@ index ce9795dad99f3..65a47168f1b6e 100644
  		sd_pio_limit = <&sdhost>,"brcm,pio-limit:0";
  		sd_debug     = <&sdhost>,"brcm,debug";
 diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
-index 84915c8c3930c..ccdabb5039534 100644
+index 84915c8c3930..ccdabb503953 100644
 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
 +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
 @@ -363,5 +363,7 @@
@@ -348008,7 +348023,7 @@ index 84915c8c3930c..ccdabb5039534 100644
  	};
  };
 diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
-index 4032e1120d037..699bf9a2fa858 100644
+index 4032e1120d03..699bf9a2fa85 100644
 --- a/arch/arm/boot/dts/overlays/README
 +++ b/arch/arm/boot/dts/overlays/README
 @@ -165,6 +165,13 @@ Params:
@@ -348054,7 +348069,7 @@ Signed-off-by: Michael Kaplan <m.kaplan@evva.com>
  create mode 100644 arch/arm/boot/dts/overlays/ssd1351-spi-overlay.dts
 
 diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile
-index e5e7183d2cdbe..724229c386323 100644
+index e5e7183d2cdb..724229c38632 100644
 --- a/arch/arm/boot/dts/overlays/Makefile
 +++ b/arch/arm/boot/dts/overlays/Makefile
 @@ -145,6 +145,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
@@ -348075,7 +348090,7 @@ index e5e7183d2cdbe..724229c386323 100644
  	sx150x.dtbo \
  	tc358743.dtbo \
 diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
-index 699bf9a2fa858..96994067a2a3b 100644
+index 699bf9a2fa85..96994067a2a3 100644
 --- a/arch/arm/boot/dts/overlays/README
 +++ b/arch/arm/boot/dts/overlays/README
 @@ -2145,6 +2145,18 @@ Params: overclock_50            Clock (in MHz) to use when the MMC framework
@@ -348129,7 +348144,7 @@ index 699bf9a2fa858..96994067a2a3b 100644
  Load:   dtoverlay=superaudioboard,<param>=<val>
 diff --git a/arch/arm/boot/dts/overlays/sh1106-spi-overlay.dts b/arch/arm/boot/dts/overlays/sh1106-spi-overlay.dts
 new file mode 100644
-index 0000000000000..70d7bb6faee94
+index 000000000000..70d7bb6faee9
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/sh1106-spi-overlay.dts
 @@ -0,0 +1,84 @@
@@ -348219,7 +348234,7 @@ index 0000000000000..70d7bb6faee94
 +};
 diff --git a/arch/arm/boot/dts/overlays/ssd1306-spi-overlay.dts b/arch/arm/boot/dts/overlays/ssd1306-spi-overlay.dts
 new file mode 100644
-index 0000000000000..74635705273eb
+index 000000000000..74635705273e
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/ssd1306-spi-overlay.dts
 @@ -0,0 +1,84 @@
@@ -348309,7 +348324,7 @@ index 0000000000000..74635705273eb
 +};
 diff --git a/arch/arm/boot/dts/overlays/ssd1351-spi-overlay.dts b/arch/arm/boot/dts/overlays/ssd1351-spi-overlay.dts
 new file mode 100644
-index 0000000000000..0eb1451b36c07
+index 000000000000..0eb1451b36c0
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/ssd1351-spi-overlay.dts
 @@ -0,0 +1,83 @@
@@ -348417,7 +348432,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  5 files changed, 6 insertions(+)
 
 diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig
-index c17a505f9da52..74a2a8ceb011c 100644
+index c17a505f9da5..74a2a8ceb011 100644
 --- a/arch/arm/configs/bcm2709_defconfig
 +++ b/arch/arm/configs/bcm2709_defconfig
 @@ -1356,6 +1356,7 @@ CONFIG_NFS_V3_ACL=y
@@ -348429,7 +348444,7 @@ index c17a505f9da52..74a2a8ceb011c 100644
  CONFIG_NFS_FSCACHE=y
  CONFIG_NFSD=m
 diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig
-index 32d3f64545782..5956da1236dcf 100644
+index 32d3f6454578..5956da1236dc 100644
 --- a/arch/arm/configs/bcm2711_defconfig
 +++ b/arch/arm/configs/bcm2711_defconfig
 @@ -1355,6 +1355,7 @@ CONFIG_NFS_V3_ACL=y
@@ -348441,7 +348456,7 @@ index 32d3f64545782..5956da1236dcf 100644
  CONFIG_NFS_FSCACHE=y
  CONFIG_NFSD=m
 diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig
-index dddf9b16d463b..83647007447a0 100644
+index dddf9b16d463..83647007447a 100644
 --- a/arch/arm/configs/bcmrpi_defconfig
 +++ b/arch/arm/configs/bcmrpi_defconfig
 @@ -1366,6 +1366,7 @@ CONFIG_NFS_V3_ACL=y
@@ -348453,7 +348468,7 @@ index dddf9b16d463b..83647007447a0 100644
  CONFIG_NFS_FSCACHE=y
  CONFIG_NFSD=m
 diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig
-index 315576a5b9579..6b4eae39fee66 100644
+index 315576a5b957..6b4eae39fee6 100644
 --- a/arch/arm64/configs/bcm2711_defconfig
 +++ b/arch/arm64/configs/bcm2711_defconfig
 @@ -1382,6 +1382,7 @@ CONFIG_NFS_V3_ACL=y
@@ -348465,7 +348480,7 @@ index 315576a5b9579..6b4eae39fee66 100644
  CONFIG_NFS_FSCACHE=y
  CONFIG_NFSD=m
 diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig
-index ff65bc543f61f..4688da5d2e645 100644
+index ff65bc543f61..4688da5d2e64 100644
 --- a/arch/arm64/configs/bcmrpi3_defconfig
 +++ b/arch/arm64/configs/bcmrpi3_defconfig
 @@ -1162,6 +1162,8 @@ CONFIG_NFS_FS=y
@@ -348506,7 +348521,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/arch/arm/boot/dts/overlays/dwc2-overlay.dts b/arch/arm/boot/dts/overlays/dwc2-overlay.dts
-index 732adbe3faaf9..0d83e344ad973 100644
+index 732adbe3faaf..0d83e344ad97 100644
 --- a/arch/arm/boot/dts/overlays/dwc2-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/dwc2-overlay.dts
 @@ -12,7 +12,7 @@
@@ -348519,7 +348534,7 @@ index 732adbe3faaf9..0d83e344ad973 100644
  			status = "okay";
  		};
 diff --git a/arch/arm/boot/dts/overlays/upstream-overlay.dts b/arch/arm/boot/dts/overlays/upstream-overlay.dts
-index 6112640837fc0..96837d962188c 100644
+index 6112640837fc..96837d962188 100644
 --- a/arch/arm/boot/dts/overlays/upstream-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/upstream-overlay.dts
 @@ -123,7 +123,7 @@
@@ -348557,7 +348572,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  1 file changed, 7 insertions(+), 9 deletions(-)
 
 diff --git a/arch/arm/boot/dts/overlays/mcp23017-overlay.dts b/arch/arm/boot/dts/overlays/mcp23017-overlay.dts
-index 16af971c3bdb7..c546d8ba7e6d2 100644
+index 16af971c3bdb..c546d8ba7e6d 100644
 --- a/arch/arm/boot/dts/overlays/mcp23017-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/mcp23017-overlay.dts
 @@ -48,15 +48,13 @@
@@ -348611,7 +348626,7 @@ Signed-off-by: Michael Kaplan <m.kaplan@evva.com>
  create mode 100644 arch/arm/boot/dts/overlays/hdmi-backlight-hwhack-gpio-overlay.dts
 
 diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile
-index 724229c386323..66f5be258aa5c 100644
+index 724229c38632..66f5be258aa5 100644
 --- a/arch/arm/boot/dts/overlays/Makefile
 +++ b/arch/arm/boot/dts/overlays/Makefile
 @@ -51,6 +51,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
@@ -348623,7 +348638,7 @@ index 724229c386323..66f5be258aa5c 100644
  	hifiberry-dac.dtbo \
  	hifiberry-dacplus.dtbo \
 diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
-index 96994067a2a3b..ac1f69c9e4e23 100644
+index 96994067a2a3..ac1f69c9e4e2 100644
 --- a/arch/arm/boot/dts/overlays/README
 +++ b/arch/arm/boot/dts/overlays/README
 @@ -883,6 +883,20 @@ Params: pin_d4                  GPIO pin for data pin D4 (default 6)
@@ -348649,7 +348664,7 @@ index 96994067a2a3b..ac1f69c9e4e23 100644
  Load:   dtoverlay=hifiberry-amp
 diff --git a/arch/arm/boot/dts/overlays/hdmi-backlight-hwhack-gpio-overlay.dts b/arch/arm/boot/dts/overlays/hdmi-backlight-hwhack-gpio-overlay.dts
 new file mode 100644
-index 0000000000000..50b9a2665c80b
+index 000000000000..50b9a2665c80
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/hdmi-backlight-hwhack-gpio-overlay.dts
 @@ -0,0 +1,47 @@
@@ -348724,7 +348739,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  1 file changed, 1 insertion(+), 3 deletions(-)
 
 diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
-index b80dde1050ff9..2478da59c58d2 100644
+index b80dde1050ff..2478da59c58d 100644
 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
 @@ -2769,8 +2769,6 @@ brcmf_cfg80211_set_power_mgmt(struct wiphy *wiphy, struct net_device *ndev,
@@ -348764,7 +348779,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
-index 2478da59c58d2..f953e98a95f83 100644
+index 2478da59c58d..f953e98a95f8 100644
 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
 @@ -2782,7 +2782,7 @@ brcmf_cfg80211_set_power_mgmt(struct wiphy *wiphy, struct net_device *ndev,
@@ -348807,7 +348822,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  14 files changed, 1068 insertions(+), 511 deletions(-)
 
 diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
-index ccdabb5039534..b693304cc0e56 100644
+index ccdabb503953..b693304cc0e5 100644
 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
 +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
 @@ -1,54 +1,57 @@
@@ -349217,7 +349232,7 @@ index ccdabb5039534..b693304cc0e56 100644
  
  / {
 diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi
-index f134aba2badbc..e2f6ffb00aa94 100644
+index f134aba2badb..e2f6ffb00aa9 100644
 --- a/arch/arm/boot/dts/bcm2711.dtsi
 +++ b/arch/arm/boot/dts/bcm2711.dtsi
 @@ -1,44 +1,890 @@
@@ -350133,7 +350148,7 @@ index f134aba2badbc..e2f6ffb00aa94 100644
 +	interrupts = <GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>;
  };
 diff --git a/arch/arm/boot/dts/bcm2835-common.dtsi b/arch/arm/boot/dts/bcm2835-common.dtsi
-index dc67679a3a041..fe1ab40c7f224 100644
+index dc67679a3a04..fe1ab40c7f22 100644
 --- a/arch/arm/boot/dts/bcm2835-common.dtsi
 +++ b/arch/arm/boot/dts/bcm2835-common.dtsi
 @@ -8,6 +8,47 @@
@@ -350309,7 +350324,7 @@ index dc67679a3a041..fe1ab40c7f224 100644
 +	dma-names = "tx", "rx";
  };
 diff --git a/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts b/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
-index 0cc6355a8c06e..6c8ce39833bf6 100644
+index 0cc6355a8c06..6c8ce39833bf 100644
 --- a/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
 +++ b/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
 @@ -3,7 +3,6 @@
@@ -350321,7 +350336,7 @@ index 0cc6355a8c06e..6c8ce39833bf6 100644
  / {
  	compatible = "raspberrypi,model-a-plus", "brcm,bcm2835";
 diff --git a/arch/arm/boot/dts/bcm2835-rpi-a.dts b/arch/arm/boot/dts/bcm2835-rpi-a.dts
-index 21593978e8513..17fdd48346ffb 100644
+index 21593978e851..17fdd48346ff 100644
 --- a/arch/arm/boot/dts/bcm2835-rpi-a.dts
 +++ b/arch/arm/boot/dts/bcm2835-rpi-a.dts
 @@ -3,7 +3,6 @@
@@ -350333,7 +350348,7 @@ index 21593978e8513..17fdd48346ffb 100644
  / {
  	compatible = "raspberrypi,model-a", "brcm,bcm2835";
 diff --git a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
-index 7c63ba90b827c..b0355c229cdc2 100644
+index 7c63ba90b827..b0355c229cdc 100644
 --- a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
 +++ b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
 @@ -4,7 +4,6 @@
@@ -350345,7 +350360,7 @@ index 7c63ba90b827c..b0355c229cdc2 100644
  / {
  	compatible = "raspberrypi,model-b-plus", "brcm,bcm2835";
 diff --git a/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts b/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts
-index 83e54a5fa3b40..33b3b5c025219 100644
+index 83e54a5fa3b4..33b3b5c02521 100644
 --- a/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts
 +++ b/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts
 @@ -4,7 +4,6 @@
@@ -350357,7 +350372,7 @@ index 83e54a5fa3b40..33b3b5c025219 100644
  / {
  	compatible = "raspberrypi,model-b-rev2", "brcm,bcm2835";
 diff --git a/arch/arm/boot/dts/bcm2835-rpi-b.dts b/arch/arm/boot/dts/bcm2835-rpi-b.dts
-index c9d04b1f14fd1..2b69957e0113e 100644
+index c9d04b1f14fd..2b69957e0113 100644
 --- a/arch/arm/boot/dts/bcm2835-rpi-b.dts
 +++ b/arch/arm/boot/dts/bcm2835-rpi-b.dts
 @@ -4,7 +4,6 @@
@@ -350369,7 +350384,7 @@ index c9d04b1f14fd1..2b69957e0113e 100644
  / {
  	compatible = "raspberrypi,model-b", "brcm,bcm2835";
 diff --git a/arch/arm/boot/dts/bcm2835-rpi-zero.dts b/arch/arm/boot/dts/bcm2835-rpi-zero.dts
-index 42ce8b6063547..6dd93c6f49666 100644
+index 42ce8b606354..6dd93c6f4966 100644
 --- a/arch/arm/boot/dts/bcm2835-rpi-zero.dts
 +++ b/arch/arm/boot/dts/bcm2835-rpi-zero.dts
 @@ -7,7 +7,6 @@
@@ -350381,7 +350396,7 @@ index 42ce8b6063547..6dd93c6f49666 100644
  / {
  	compatible = "raspberrypi,model-zero", "brcm,bcm2835";
 diff --git a/arch/arm/boot/dts/bcm2835-rpi.dtsi b/arch/arm/boot/dts/bcm2835-rpi.dtsi
-index c77971e27175a..394c8a71b13be 100644
+index c77971e27175..394c8a71b13b 100644
 --- a/arch/arm/boot/dts/bcm2835-rpi.dtsi
 +++ b/arch/arm/boot/dts/bcm2835-rpi.dtsi
 @@ -29,22 +29,6 @@
@@ -350444,7 +350459,7 @@ index c77971e27175a..394c8a71b13be 100644
 -	power-domains = <&power RPI_POWER_DOMAIN_UNICAM1>;
 -};
 diff --git a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
-index 6b0a6d5d5ca42..0455a680394a2 100644
+index 6b0a6d5d5ca4..0455a680394a 100644
 --- a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
 +++ b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
 @@ -4,7 +4,6 @@
@@ -350456,7 +350471,7 @@ index 6b0a6d5d5ca42..0455a680394a2 100644
  / {
  	compatible = "raspberrypi,2-model-b", "brcm,bcm2836";
 diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
-index 3d03e7d0fbf0d..054ecaa355c9a 100644
+index 3d03e7d0fbf0..054ecaa355c9 100644
 --- a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
 +++ b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
 @@ -4,7 +4,6 @@
@@ -350468,7 +350483,7 @@ index 3d03e7d0fbf0d..054ecaa355c9a 100644
  / {
  	compatible = "raspberrypi,3-model-b", "brcm,bcm2837";
 diff --git a/arch/arm/boot/dts/bcm283x-rpi-lan7515.dtsi b/arch/arm/boot/dts/bcm283x-rpi-lan7515.dtsi
-index 7c6c054459b72..70bece63f9a74 100644
+index 7c6c054459b7..70bece63f9a7 100644
 --- a/arch/arm/boot/dts/bcm283x-rpi-lan7515.dtsi
 +++ b/arch/arm/boot/dts/bcm283x-rpi-lan7515.dtsi
 @@ -29,9 +29,6 @@
@@ -350498,7 +350513,7 @@ index 7c6c054459b72..70bece63f9a74 100644
 -	};
 -};
 diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi
-index 3706a795b586c..202a61f574c73 100644
+index 3706a795b586..202a61f574c7 100644
 --- a/arch/arm/boot/dts/bcm283x.dtsi
 +++ b/arch/arm/boot/dts/bcm283x.dtsi
 @@ -35,8 +35,6 @@
@@ -350762,7 +350777,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
 
 diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
 deleted file mode 100644
-index b693304cc0e56..0000000000000
+index b693304cc0e5..000000000000
 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
 +++ /dev/null
 @@ -1,157 +0,0 @@
@@ -350925,7 +350940,7 @@ index b693304cc0e56..0000000000000
 -};
 diff --git a/arch/arm/boot/dts/bcm2711-rpi.dtsi b/arch/arm/boot/dts/bcm2711-rpi.dtsi
 deleted file mode 100644
-index d8ffaab8e86aa..0000000000000
+index d8ffaab8e86a..000000000000
 --- a/arch/arm/boot/dts/bcm2711-rpi.dtsi
 +++ /dev/null
 @@ -1,7 +0,0 @@
@@ -350938,7 +350953,7 @@ index d8ffaab8e86aa..0000000000000
 -};
 diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi
 deleted file mode 100644
-index e2f6ffb00aa94..0000000000000
+index e2f6ffb00aa9..000000000000
 --- a/arch/arm/boot/dts/bcm2711.dtsi
 +++ /dev/null
 @@ -1,890 +0,0 @@
@@ -351834,7 +351849,7 @@ index e2f6ffb00aa94..0000000000000
 -};
 diff --git a/arch/arm/boot/dts/bcm2838-rpi.dtsi b/arch/arm/boot/dts/bcm2838-rpi.dtsi
 deleted file mode 100644
-index 140cfa312d1ae..0000000000000
+index 140cfa312d1a..000000000000
 --- a/arch/arm/boot/dts/bcm2838-rpi.dtsi
 +++ /dev/null
 @@ -1,25 +0,0 @@
@@ -351865,7 +351880,7 @@ index 140cfa312d1ae..0000000000000
 -};
 diff --git a/arch/arm/boot/dts/bcm2838.dtsi b/arch/arm/boot/dts/bcm2838.dtsi
 deleted file mode 100644
-index 847dc7e35c945..0000000000000
+index 847dc7e35c94..000000000000
 --- a/arch/arm/boot/dts/bcm2838.dtsi
 +++ /dev/null
 @@ -1,733 +0,0 @@
@@ -352638,7 +352653,7 @@ Acked-by: Florian Fanelli <f.fainelli@gmail.com>
  create mode 100644 arch/arm/boot/dts/bcm283x-rpi-usb-peripheral.dtsi
 
 diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
-index 75436a5fc8121..54f3c1d1e9f58 100644
+index 75436a5fc812..54f3c1d1e9f5 100644
 --- a/arch/arm/boot/dts/Makefile
 +++ b/arch/arm/boot/dts/Makefile
 @@ -97,6 +97,7 @@ dtb-$(CONFIG_ARCH_BCM2835) += \
@@ -352651,7 +352666,7 @@ index 75436a5fc8121..54f3c1d1e9f58 100644
  dtb-$(CONFIG_ARCH_BCM_5301X) += \
 diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
 new file mode 100644
-index 0000000000000..cccc1ccd19be5
+index 000000000000..cccc1ccd19be
 --- /dev/null
 +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
 @@ -0,0 +1,123 @@
@@ -352780,7 +352795,7 @@ index 0000000000000..cccc1ccd19be5
 +};
 diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi
 new file mode 100644
-index 0000000000000..ac83dac2e6ba6
+index 000000000000..ac83dac2e6ba
 --- /dev/null
 +++ b/arch/arm/boot/dts/bcm2711.dtsi
 @@ -0,0 +1,844 @@
@@ -353630,7 +353645,7 @@ index 0000000000000..ac83dac2e6ba6
 +};
 diff --git a/arch/arm/boot/dts/bcm283x-rpi-usb-peripheral.dtsi b/arch/arm/boot/dts/bcm283x-rpi-usb-peripheral.dtsi
 new file mode 100644
-index 0000000000000..0ff0e9e253272
+index 000000000000..0ff0e9e25327
 --- /dev/null
 +++ b/arch/arm/boot/dts/bcm283x-rpi-usb-peripheral.dtsi
 @@ -0,0 +1,7 @@
@@ -353663,7 +353678,7 @@ Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
  1 file changed, 20 insertions(+)
 
 diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi
-index ac83dac2e6ba6..34d24fe272e27 100644
+index ac83dac2e6ba..34d24fe272e2 100644
 --- a/arch/arm/boot/dts/bcm2711.dtsi
 +++ b/arch/arm/boot/dts/bcm2711.dtsi
 @@ -12,6 +12,26 @@
@@ -353716,7 +353731,7 @@ Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
  2 files changed, 43 insertions(+)
 
 diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
-index cccc1ccd19be5..1b5a835f66bd3 100644
+index cccc1ccd19be..1b5a835f66bd 100644
 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
 +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
 @@ -19,6 +19,10 @@
@@ -353751,7 +353766,7 @@ index cccc1ccd19be5..1b5a835f66bd3 100644
  &uart0 {
  	pinctrl-names = "default";
 diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi
-index 34d24fe272e27..961bed832755b 100644
+index 34d24fe272e2..961bed832755 100644
 --- a/arch/arm/boot/dts/bcm2711.dtsi
 +++ b/arch/arm/boot/dts/bcm2711.dtsi
 @@ -325,6 +325,32 @@
@@ -353821,7 +353836,7 @@ Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi
-index 961bed832755b..e2f6ffb00aa94 100644
+index 961bed832755..e2f6ffb00aa9 100644
 --- a/arch/arm/boot/dts/bcm2711.dtsi
 +++ b/arch/arm/boot/dts/bcm2711.dtsi
 @@ -43,7 +43,7 @@
@@ -353862,7 +353877,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  create mode 100644 arch/arm/boot/dts/bcm2711-rpi.dtsi
 
 diff --git a/arch/arm/boot/dts/bcm2708-rpi.dtsi b/arch/arm/boot/dts/bcm2708-rpi.dtsi
-index 65a47168f1b6e..2c440e596bed9 100644
+index 65a47168f1b6..2c440e596bed 100644
 --- a/arch/arm/boot/dts/bcm2708-rpi.dtsi
 +++ b/arch/arm/boot/dts/bcm2708-rpi.dtsi
 @@ -1,6 +1,7 @@
@@ -354028,7 +354043,7 @@ index 65a47168f1b6e..2c440e596bed9 100644
  	status = "disabled";
  };
 diff --git a/arch/arm/boot/dts/bcm2708.dtsi b/arch/arm/boot/dts/bcm2708.dtsi
-index 16a637363b5df..a32ff21613eda 100644
+index 16a637363b5d..a32ff21613ed 100644
 --- a/arch/arm/boot/dts/bcm2708.dtsi
 +++ b/arch/arm/boot/dts/bcm2708.dtsi
 @@ -8,3 +8,7 @@
@@ -354040,7 +354055,7 @@ index 16a637363b5df..a32ff21613eda 100644
 +	status = "disabled";
 +};
 diff --git a/arch/arm/boot/dts/bcm2709.dtsi b/arch/arm/boot/dts/bcm2709.dtsi
-index 8bc67c0aaff17..68eafc1b281a5 100644
+index 8bc67c0aaff1..68eafc1b281a 100644
 --- a/arch/arm/boot/dts/bcm2709.dtsi
 +++ b/arch/arm/boot/dts/bcm2709.dtsi
 @@ -16,3 +16,7 @@
@@ -354053,7 +354068,7 @@ index 8bc67c0aaff17..68eafc1b281a5 100644
 +};
 diff --git a/arch/arm/boot/dts/bcm270x-rpi.dtsi b/arch/arm/boot/dts/bcm270x-rpi.dtsi
 new file mode 100644
-index 0000000000000..b7bf360616235
+index 000000000000..b7bf36061623
 --- /dev/null
 +++ b/arch/arm/boot/dts/bcm270x-rpi.dtsi
 @@ -0,0 +1,139 @@
@@ -354197,7 +354212,7 @@ index 0000000000000..b7bf360616235
 +	status = "disabled";
 +};
 diff --git a/arch/arm/boot/dts/bcm270x.dtsi b/arch/arm/boot/dts/bcm270x.dtsi
-index 9eb6becfbe411..04669f512b4c9 100644
+index 9eb6becfbe41..04669f512b4c 100644
 --- a/arch/arm/boot/dts/bcm270x.dtsi
 +++ b/arch/arm/boot/dts/bcm270x.dtsi
 @@ -17,32 +17,8 @@
@@ -354327,7 +354342,7 @@ index 9eb6becfbe411..04669f512b4c9 100644
 +	dma-names = "tx", "rx";
  };
 diff --git a/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts b/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts
-index 55420ac94dcfa..0c36c64aaeeff 100644
+index 55420ac94dcf..0c36c64aaeef 100644
 --- a/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts
 +++ b/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts
 @@ -170,6 +170,12 @@
@@ -354357,7 +354372,7 @@ index 55420ac94dcfa..0c36c64aaeeff 100644
  	};
  };
 diff --git a/arch/arm/boot/dts/bcm2710.dtsi b/arch/arm/boot/dts/bcm2710.dtsi
-index 5c45ded273fe3..4e47480dd9338 100644
+index 5c45ded273fe..4e47480dd933 100644
 --- a/arch/arm/boot/dts/bcm2710.dtsi
 +++ b/arch/arm/boot/dts/bcm2710.dtsi
 @@ -23,3 +23,7 @@
@@ -354369,7 +354384,7 @@ index 5c45ded273fe3..4e47480dd9338 100644
 +	status = "disabled";
 +};
 diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
-index 1b5a835f66bd3..2013cf8325679 100644
+index 1b5a835f66bd..2013cf832567 100644
 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
 +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
 @@ -2,7 +2,6 @@
@@ -354707,7 +354722,7 @@ index 1b5a835f66bd3..2013cf8325679 100644
 +};
 diff --git a/arch/arm/boot/dts/bcm2711-rpi.dtsi b/arch/arm/boot/dts/bcm2711-rpi.dtsi
 new file mode 100644
-index 0000000000000..6c8b263882291
+index 000000000000..6c8b26388229
 --- /dev/null
 +++ b/arch/arm/boot/dts/bcm2711-rpi.dtsi
 @@ -0,0 +1,222 @@
@@ -354950,7 +354965,7 @@ This reverts commit 61a505c739150c8dbb57a73db5c6c720d5160157.
  3 files changed, 9 deletions(-)
 
 diff --git a/arch/arm/mach-bcm/board_bcm2835.c b/arch/arm/mach-bcm/board_bcm2835.c
-index b7491ddb68412..91a758c61f484 100644
+index b7491ddb6841..91a758c61f48 100644
 --- a/arch/arm/mach-bcm/board_bcm2835.c
 +++ b/arch/arm/mach-bcm/board_bcm2835.c
 @@ -123,8 +123,6 @@ MACHINE_END
@@ -354963,7 +354978,7 @@ index b7491ddb68412..91a758c61f484 100644
  	NULL
  };
 diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c
-index b12c63aa2b0b3..a592fe8ec07d2 100644
+index b12c63aa2b0b..a592fe8ec07d 100644
 --- a/drivers/clk/bcm/clk-bcm2835.c
 +++ b/drivers/clk/bcm/clk-bcm2835.c
 @@ -2385,8 +2385,6 @@ static const struct cprman_plat_data cprman_bcm2711_plat_data = {
@@ -354976,7 +354991,7 @@ index b12c63aa2b0b3..a592fe8ec07d2 100644
  };
  MODULE_DEVICE_TABLE(of, bcm2835_clk_of_match);
 diff --git a/drivers/pinctrl/bcm/pinctrl-bcm2835.c b/drivers/pinctrl/bcm/pinctrl-bcm2835.c
-index cf308212fecab..43e3127e25cda 100644
+index cf308212feca..43e3127e25cd 100644
 --- a/drivers/pinctrl/bcm/pinctrl-bcm2835.c
 +++ b/drivers/pinctrl/bcm/pinctrl-bcm2835.c
 @@ -1079,11 +1079,6 @@ static const struct of_device_id bcm2835_pinctrl_match[] = {
@@ -355008,7 +355023,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
-index 7a9de9d0193c2..3a120f3b33ad4 100644
+index 7a9de9d0193c..3a120f3b33ad 100644
 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
 +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
 @@ -150,7 +150,7 @@ static struct vchiq_drvdata bcm2836_drvdata = {
@@ -355046,7 +355061,7 @@ Fixes: "bcm2835-dma: Add proper 40-bit DMA support"
  1 file changed, 137 insertions(+), 137 deletions(-)
 
 diff --git a/drivers/dma/bcm2835-dma.c b/drivers/dma/bcm2835-dma.c
-index 87fd58272e95f..8d7c80536aa42 100644
+index 87fd58272e95..8d7c80536aa4 100644
 --- a/drivers/dma/bcm2835-dma.c
 +++ b/drivers/dma/bcm2835-dma.c
 @@ -38,7 +38,7 @@
@@ -355543,7 +355558,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  1 file changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/drivers/thermal/broadcom/brcmstb_thermal.c b/drivers/thermal/broadcom/brcmstb_thermal.c
-index 7a7c6ad7b8a04..08f71fec51520 100644
+index 7a7c6ad7b8a0..08f71fec5152 100644
 --- a/drivers/thermal/broadcom/brcmstb_thermal.c
 +++ b/drivers/thermal/broadcom/brcmstb_thermal.c
 @@ -290,7 +290,7 @@ static const struct thermal_zone_of_device_ops bcm7445_thermal_of_ops = {
@@ -355597,7 +355612,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  2 files changed, 6 insertions(+), 7 deletions(-)
 
 diff --git a/drivers/char/hw_random/Kconfig b/drivers/char/hw_random/Kconfig
-index 31e243fc6c77f..3b4e33fde141b 100644
+index 31e243fc6c77..3b4e33fde141 100644
 --- a/drivers/char/hw_random/Kconfig
 +++ b/drivers/char/hw_random/Kconfig
 @@ -94,7 +94,7 @@ config HW_RANDOM_IPROC_RNG200
@@ -355610,7 +355625,7 @@ index 31e243fc6c77f..3b4e33fde141b 100644
  	  To compile this driver as a module, choose M here: the
  	  module will be called iproc-rng200
 diff --git a/drivers/char/hw_random/iproc-rng200.c b/drivers/char/hw_random/iproc-rng200.c
-index 7b6966b7f6028..857dacd49c3b2 100644
+index 7b6966b7f602..857dacd49c3b 100644
 --- a/drivers/char/hw_random/iproc-rng200.c
 +++ b/drivers/char/hw_random/iproc-rng200.c
 @@ -174,7 +174,7 @@ static int iproc_rng200_init(struct hwrng *rng)
@@ -355673,7 +355688,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  2 files changed, 10 insertions(+), 10 deletions(-)
 
 diff --git a/drivers/pci/controller/pcie-brcmstb-bounce.c b/drivers/pci/controller/pcie-brcmstb-bounce.c
-index fa81a98f6a813..3c148b0e82c1d 100644
+index fa81a98f6a81..3c148b0e82c1 100644
 --- a/drivers/pci/controller/pcie-brcmstb-bounce.c
 +++ b/drivers/pci/controller/pcie-brcmstb-bounce.c
 @@ -91,8 +91,8 @@ struct dmabounce_device_info {
@@ -355715,7 +355730,7 @@ index fa81a98f6a813..3c148b0e82c1d 100644
  		return ret;
  
 diff --git a/drivers/pci/controller/pcie-brcmstb-bounce64.c b/drivers/pci/controller/pcie-brcmstb-bounce64.c
-index ac8dde3c030b7..dec65992902e4 100644
+index ac8dde3c030b..dec65992902e 100644
 --- a/drivers/pci/controller/pcie-brcmstb-bounce64.c
 +++ b/drivers/pci/controller/pcie-brcmstb-bounce64.c
 @@ -93,8 +93,8 @@ struct dmabounce_device_info {
@@ -355773,7 +355788,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/arch/arm/boot/dts/bcm2711-rpi.dtsi b/arch/arm/boot/dts/bcm2711-rpi.dtsi
-index 6c8b263882291..29e7aa15d5a37 100644
+index 6c8b26388229..29e7aa15d5a3 100644
 --- a/arch/arm/boot/dts/bcm2711-rpi.dtsi
 +++ b/arch/arm/boot/dts/bcm2711-rpi.dtsi
 @@ -42,7 +42,7 @@
@@ -355836,7 +355851,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  1 file changed, 4 insertions(+)
 
 diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
-index 2013cf8325679..f5bd44ea2bf19 100644
+index 2013cf832567..f5bd44ea2bf1 100644
 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
 +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
 @@ -167,6 +167,10 @@
@@ -355872,7 +355887,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  1 file changed, 2 insertions(+)
 
 diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
-index 3a120f3b33ad4..57867b75d61a2 100644
+index 3a120f3b33ad..57867b75d61a 100644
 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
 +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
 @@ -139,6 +139,7 @@ static struct vchiq_state g_state;
@@ -355912,7 +355927,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  1 file changed, 8 insertions(+)
 
 diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
-index 57867b75d61a2..a3fcb1830995c 100644
+index 57867b75d61a..a3fcb1830995 100644
 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
 +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
 @@ -3190,12 +3190,20 @@ vchiq_register_child(struct platform_device *pdev, const char *name)
@@ -355961,7 +355976,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  2 files changed, 23 insertions(+), 7 deletions(-)
 
 diff --git a/arch/arm/boot/dts/bcm270x-rpi.dtsi b/arch/arm/boot/dts/bcm270x-rpi.dtsi
-index b7bf360616235..be11a44362799 100644
+index b7bf36061623..be11a4436279 100644
 --- a/arch/arm/boot/dts/bcm270x-rpi.dtsi
 +++ b/arch/arm/boot/dts/bcm270x-rpi.dtsi
 @@ -70,13 +70,6 @@
@@ -355992,7 +356007,7 @@ index b7bf360616235..be11a44362799 100644
 +	};
 +};
 diff --git a/arch/arm/boot/dts/bcm2711-rpi.dtsi b/arch/arm/boot/dts/bcm2711-rpi.dtsi
-index 29e7aa15d5a37..a71b2eb74723f 100644
+index 29e7aa15d5a3..a71b2eb74723 100644
 --- a/arch/arm/boot/dts/bcm2711-rpi.dtsi
 +++ b/arch/arm/boot/dts/bcm2711-rpi.dtsi
 @@ -55,6 +55,8 @@
@@ -356050,7 +356065,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  1 file changed, 4 insertions(+)
 
 diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi
-index 202a61f574c73..18a95aaca1912 100644
+index 202a61f574c7..18a95aaca191 100644
 --- a/arch/arm/boot/dts/bcm283x.dtsi
 +++ b/arch/arm/boot/dts/bcm283x.dtsi
 @@ -479,6 +479,10 @@
@@ -356080,7 +356095,7 @@ This reverts commit 894dece014e4df68c9f6a11a0761fba1fcfc844f.
  1 file changed, 4 deletions(-)
 
 diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi
-index 18a95aaca1912..202a61f574c73 100644
+index 18a95aaca191..202a61f574c7 100644
 --- a/arch/arm/boot/dts/bcm283x.dtsi
 +++ b/arch/arm/boot/dts/bcm283x.dtsi
 @@ -479,10 +479,6 @@
@@ -356123,7 +356138,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  5 files changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/arch/arm/boot/dts/overlays/allo-boss-dac-pcm512x-audio-overlay.dts b/arch/arm/boot/dts/overlays/allo-boss-dac-pcm512x-audio-overlay.dts
-index dd69916fcb3c1..873cb2fab52ba 100644
+index dd69916fcb3c..873cb2fab52b 100644
 --- a/arch/arm/boot/dts/overlays/allo-boss-dac-pcm512x-audio-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/allo-boss-dac-pcm512x-audio-overlay.dts
 @@ -9,7 +9,7 @@
@@ -356136,7 +356151,7 @@ index dd69916fcb3c1..873cb2fab52ba 100644
  			boss_osc: boss_osc {
  				compatible = "allo,dac-clk";
 diff --git a/arch/arm/boot/dts/overlays/hifiberry-dacplus-overlay.dts b/arch/arm/boot/dts/overlays/hifiberry-dacplus-overlay.dts
-index 9d6b8ebdf11e2..2ca3d886ebb7a 100644
+index 9d6b8ebdf11e..2ca3d886ebb7 100644
 --- a/arch/arm/boot/dts/overlays/hifiberry-dacplus-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/hifiberry-dacplus-overlay.dts
 @@ -6,7 +6,7 @@
@@ -356149,7 +356164,7 @@ index 9d6b8ebdf11e2..2ca3d886ebb7a 100644
  			dacpro_osc: dacpro_osc {
  				compatible = "hifiberry,dacpro-clk";
 diff --git a/arch/arm/boot/dts/overlays/hifiberry-dacplusadc-overlay.dts b/arch/arm/boot/dts/overlays/hifiberry-dacplusadc-overlay.dts
-index 308a9b4df6f50..540563dec10f2 100644
+index 308a9b4df6f5..540563dec10f 100644
 --- a/arch/arm/boot/dts/overlays/hifiberry-dacplusadc-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/hifiberry-dacplusadc-overlay.dts
 @@ -6,7 +6,7 @@
@@ -356162,7 +356177,7 @@ index 308a9b4df6f50..540563dec10f2 100644
  			dacpro_osc: dacpro_osc {
  				compatible = "hifiberry,dacpro-clk";
 diff --git a/arch/arm/boot/dts/overlays/hifiberry-dacplusadcpro-overlay.dts b/arch/arm/boot/dts/overlays/hifiberry-dacplusadcpro-overlay.dts
-index 70a79bb1ec7da..cafa2ccd7ff71 100644
+index 70a79bb1ec7d..cafa2ccd7ff7 100644
 --- a/arch/arm/boot/dts/overlays/hifiberry-dacplusadcpro-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/hifiberry-dacplusadcpro-overlay.dts
 @@ -6,7 +6,7 @@
@@ -356175,7 +356190,7 @@ index 70a79bb1ec7da..cafa2ccd7ff71 100644
  			dacpro_osc: dacpro_osc {
  				compatible = "hifiberry,dacpro-clk";
 diff --git a/arch/arm/boot/dts/overlays/hifiberry-dacplushd-overlay.dts b/arch/arm/boot/dts/overlays/hifiberry-dacplushd-overlay.dts
-index 7bf0317ea83bd..c5583e010339e 100644
+index 7bf0317ea83b..c5583e010339 100644
 --- a/arch/arm/boot/dts/overlays/hifiberry-dacplushd-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/hifiberry-dacplushd-overlay.dts
 @@ -8,7 +8,7 @@
@@ -356207,7 +356222,7 @@ Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/staging/vc04_services/vc-sm-cma/vc_sm_cma_vchi.c b/drivers/staging/vc04_services/vc-sm-cma/vc_sm_cma_vchi.c
-index 83110c55f4402..c87b964abb315 100644
+index 83110c55f440..c87b964abb31 100644
 --- a/drivers/staging/vc04_services/vc-sm-cma/vc_sm_cma_vchi.c
 +++ b/drivers/staging/vc04_services/vc-sm-cma/vc_sm_cma_vchi.c
 @@ -34,7 +34,7 @@ struct sm_cmd_rsp_blk {
@@ -356238,7 +356253,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  2 files changed, 3 insertions(+)
 
 diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
-index ac1f69c9e4e23..572edc7818ea7 100644
+index ac1f69c9e4e2..572edc7818ea 100644
 --- a/arch/arm/boot/dts/overlays/README
 +++ b/arch/arm/boot/dts/overlays/README
 @@ -821,6 +821,8 @@ Params: gpiopin                 GPIO for signalling (default 26)
@@ -356251,7 +356266,7 @@ index ac1f69c9e4e23..572edc7818ea7 100644
  
  Name:   gpio-shutdown
 diff --git a/arch/arm/boot/dts/overlays/gpio-poweroff-overlay.dts b/arch/arm/boot/dts/overlays/gpio-poweroff-overlay.dts
-index bb8cd3bf264d1..416aa2bc797a3 100644
+index bb8cd3bf264d..416aa2bc797a 100644
 --- a/arch/arm/boot/dts/overlays/gpio-poweroff-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/gpio-poweroff-overlay.dts
 @@ -32,5 +32,6 @@
@@ -356281,7 +356296,7 @@ Signed-off-by: Matthias Reichl <hias@horus.com>
  4 files changed, 4 insertions(+)
 
 diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig
-index 74a2a8ceb011c..3d4a0756c2517 100644
+index 74a2a8ceb011..3d4a0756c251 100644
 --- a/arch/arm/configs/bcm2709_defconfig
 +++ b/arch/arm/configs/bcm2709_defconfig
 @@ -727,6 +727,7 @@ CONFIG_REGULATOR_ARIZONA_LDO1=m
@@ -356293,7 +356308,7 @@ index 74a2a8ceb011c..3d4a0756c2517 100644
  CONFIG_IR_NEC_DECODER=m
  CONFIG_IR_RC5_DECODER=m
 diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig
-index 5956da1236dcf..d79bbff58f31e 100644
+index 5956da1236dc..d79bbff58f31 100644
 --- a/arch/arm/configs/bcm2711_defconfig
 +++ b/arch/arm/configs/bcm2711_defconfig
 @@ -702,6 +702,7 @@ CONFIG_REGULATOR_ARIZONA_MICSUPP=m
@@ -356305,7 +356320,7 @@ index 5956da1236dcf..d79bbff58f31e 100644
  CONFIG_IR_NEC_DECODER=m
  CONFIG_IR_RC5_DECODER=m
 diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig
-index 83647007447a0..9402e472ce641 100644
+index 83647007447a..9402e472ce64 100644
 --- a/arch/arm/configs/bcmrpi_defconfig
 +++ b/arch/arm/configs/bcmrpi_defconfig
 @@ -719,6 +719,7 @@ CONFIG_REGULATOR_ARIZONA_LDO1=m
@@ -356317,7 +356332,7 @@ index 83647007447a0..9402e472ce641 100644
  CONFIG_IR_NEC_DECODER=m
  CONFIG_IR_RC5_DECODER=m
 diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig
-index 6b4eae39fee66..894168aeef610 100644
+index 6b4eae39fee6..894168aeef61 100644
 --- a/arch/arm64/configs/bcm2711_defconfig
 +++ b/arch/arm64/configs/bcm2711_defconfig
 @@ -729,6 +729,7 @@ CONFIG_REGULATOR_ARIZONA_MICSUPP=m
@@ -356344,7 +356359,7 @@ Signed-off-by: Matthias Reichl <hias@horus.com>
  1 file changed, 26 insertions(+)
 
 diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig
-index 4688da5d2e645..1dad7bcb579ab 100644
+index 4688da5d2e64..1dad7bcb579a 100644
 --- a/arch/arm64/configs/bcmrpi3_defconfig
 +++ b/arch/arm64/configs/bcmrpi3_defconfig
 @@ -641,6 +641,32 @@ CONFIG_STMPE_SPI=y
@@ -356411,7 +356426,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  1 file changed, 2 insertions(+)
 
 diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c
-index 1688f576ee8ac..bef83edca195b 100644
+index 1688f576ee8a..bef83edca195 100644
 --- a/drivers/of/overlay.c
 +++ b/drivers/of/overlay.c
 @@ -245,6 +245,8 @@ static struct property *dup_and_fixup_symbol_prop(
@@ -356444,7 +356459,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  5 files changed, 5 insertions(+)
 
 diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig
-index 3d4a0756c2517..6cc8d3ebe9ae0 100644
+index 3d4a0756c251..6cc8d3ebe9ae 100644
 --- a/arch/arm/configs/bcm2709_defconfig
 +++ b/arch/arm/configs/bcm2709_defconfig
 @@ -1039,6 +1039,7 @@ CONFIG_HID_SAMSUNG=m
@@ -356456,7 +356471,7 @@ index 3d4a0756c2517..6cc8d3ebe9ae0 100644
  CONFIG_HID_GREENASIA=m
  CONFIG_HID_SMARTJOYPLUS=m
 diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig
-index d79bbff58f31e..9409be09fedc6 100644
+index d79bbff58f31..9409be09fedc 100644
 --- a/arch/arm/configs/bcm2711_defconfig
 +++ b/arch/arm/configs/bcm2711_defconfig
 @@ -1015,6 +1015,7 @@ CONFIG_HID_SAMSUNG=m
@@ -356468,7 +356483,7 @@ index d79bbff58f31e..9409be09fedc6 100644
  CONFIG_HID_GREENASIA=m
  CONFIG_HID_SMARTJOYPLUS=m
 diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig
-index 9402e472ce641..7cf9f2f9e1cc6 100644
+index 9402e472ce64..7cf9f2f9e1cc 100644
 --- a/arch/arm/configs/bcmrpi_defconfig
 +++ b/arch/arm/configs/bcmrpi_defconfig
 @@ -1031,6 +1031,7 @@ CONFIG_HID_SAMSUNG=m
@@ -356480,7 +356495,7 @@ index 9402e472ce641..7cf9f2f9e1cc6 100644
  CONFIG_HID_GREENASIA=m
  CONFIG_HID_SMARTJOYPLUS=m
 diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig
-index 894168aeef610..9015acacf0355 100644
+index 894168aeef61..9015acacf035 100644
 --- a/arch/arm64/configs/bcm2711_defconfig
 +++ b/arch/arm64/configs/bcm2711_defconfig
 @@ -1042,6 +1042,7 @@ CONFIG_HID_SAMSUNG=m
@@ -356492,7 +356507,7 @@ index 894168aeef610..9015acacf0355 100644
  CONFIG_HID_GREENASIA=m
  CONFIG_HID_SMARTJOYPLUS=m
 diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig
-index 1dad7bcb579ab..fa691991528fb 100644
+index 1dad7bcb579a..fa691991528f 100644
 --- a/arch/arm64/configs/bcmrpi3_defconfig
 +++ b/arch/arm64/configs/bcmrpi3_defconfig
 @@ -896,6 +896,7 @@ CONFIG_HID_ROCCAT=m
@@ -356528,7 +356543,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  4 files changed, 4 insertions(+), 12 deletions(-)
 
 diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig
-index 6cc8d3ebe9ae0..9131effbfa0c8 100644
+index 6cc8d3ebe9ae..9131effbfa0c 100644
 --- a/arch/arm/configs/bcm2709_defconfig
 +++ b/arch/arm/configs/bcm2709_defconfig
 @@ -1303,6 +1303,7 @@ CONFIG_RPI_AXIPERF=m
@@ -356550,7 +356565,7 @@ index 6cc8d3ebe9ae0..9131effbfa0c8 100644
  CONFIG_CRYPTO_TGR192=m
  CONFIG_CRYPTO_WP512=m
 diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig
-index 9409be09fedc6..5fe23a0bf27fe 100644
+index 9409be09fedc..5fe23a0bf27f 100644
 --- a/arch/arm/configs/bcm2711_defconfig
 +++ b/arch/arm/configs/bcm2711_defconfig
 @@ -1302,6 +1302,7 @@ CONFIG_RPI_AXIPERF=m
@@ -356572,7 +356587,7 @@ index 9409be09fedc6..5fe23a0bf27fe 100644
  CONFIG_CRYPTO_TGR192=m
  CONFIG_CRYPTO_WP512=m
 diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig
-index 9015acacf0355..6be7a169eac1a 100644
+index 9015acacf035..6be7a169eac1 100644
 --- a/arch/arm64/configs/bcm2711_defconfig
 +++ b/arch/arm64/configs/bcm2711_defconfig
 @@ -1329,6 +1329,7 @@ CONFIG_RPI_AXIPERF=m
@@ -356594,7 +356609,7 @@ index 9015acacf0355..6be7a169eac1a 100644
  CONFIG_CRYPTO_TGR192=m
  CONFIG_CRYPTO_WP512=m
 diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig
-index fa691991528fb..b40477e1553be 100644
+index fa691991528f..b40477e1553b 100644
 --- a/arch/arm64/configs/bcmrpi3_defconfig
 +++ b/arch/arm64/configs/bcmrpi3_defconfig
 @@ -1135,6 +1135,7 @@ CONFIG_PWM_PCA9685=m
@@ -356632,7 +356647,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  1 file changed, 4 insertions(+)
 
 diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig
-index 6be7a169eac1a..bf0551437fd7f 100644
+index 6be7a169eac1..bf0551437fd7 100644
 --- a/arch/arm64/configs/bcm2711_defconfig
 +++ b/arch/arm64/configs/bcm2711_defconfig
 @@ -57,6 +57,10 @@ CONFIG_CPUFREQ_DT=y
@@ -356665,7 +356680,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/arch/arm/boot/dts/overlays/sc16is750-i2c-overlay.dts b/arch/arm/boot/dts/overlays/sc16is750-i2c-overlay.dts
-index 5fbff2e6c02df..16fe0d08cef1b 100644
+index 5fbff2e6c02d..16fe0d08cef1 100644
 --- a/arch/arm/boot/dts/overlays/sc16is750-i2c-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/sc16is750-i2c-overlay.dts
 @@ -32,7 +32,7 @@
@@ -356693,7 +356708,7 @@ This reverts commit 900b4ad0814df7dbacb01318bf49af5bab605fa0.
  2 files changed, 10 insertions(+), 10 deletions(-)
 
 diff --git a/drivers/pci/controller/pcie-brcmstb-bounce.c b/drivers/pci/controller/pcie-brcmstb-bounce.c
-index 3c148b0e82c1d..fa81a98f6a813 100644
+index 3c148b0e82c1..fa81a98f6a81 100644
 --- a/drivers/pci/controller/pcie-brcmstb-bounce.c
 +++ b/drivers/pci/controller/pcie-brcmstb-bounce.c
 @@ -91,8 +91,8 @@ struct dmabounce_device_info {
@@ -356735,7 +356750,7 @@ index 3c148b0e82c1d..fa81a98f6a813 100644
  		return ret;
  
 diff --git a/drivers/pci/controller/pcie-brcmstb-bounce64.c b/drivers/pci/controller/pcie-brcmstb-bounce64.c
-index dec65992902e4..ac8dde3c030b7 100644
+index dec65992902e..ac8dde3c030b 100644
 --- a/drivers/pci/controller/pcie-brcmstb-bounce64.c
 +++ b/drivers/pci/controller/pcie-brcmstb-bounce64.c
 @@ -93,8 +93,8 @@ struct dmabounce_device_info {
@@ -356792,7 +356807,7 @@ This reverts commit 58ac2d4474e531300f9f83773aa4d09e95ee2626.
  1 file changed, 4 insertions(+), 27 deletions(-)
 
 diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c
-index fb777a4e47502..e646818ff21c3 100644
+index fb777a4e4750..e646818ff21c 100644
 --- a/drivers/pci/controller/pcie-brcmstb.c
 +++ b/drivers/pci/controller/pcie-brcmstb.c
 @@ -206,8 +206,6 @@ enum pcie_type {
@@ -356884,7 +356899,7 @@ This reverts commit 27cf0ad95cdf30f52a5fc6c69014a0d7bf5a1222.
  1 file changed, 21 insertions(+), 22 deletions(-)
 
 diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c
-index e646818ff21c3..e8c8b355548a5 100644
+index e646818ff21c..e8c8b355548a 100644
 --- a/drivers/pci/controller/pcie-brcmstb.c
 +++ b/drivers/pci/controller/pcie-brcmstb.c
 @@ -633,17 +633,16 @@ static int brcmstb_platform_notifier(struct notifier_block *nb,
@@ -357033,7 +357048,7 @@ This reverts commit 2340a88a493d750dc3fcfa48de880fc4b8e479d2.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/pci/controller/pcie-brcmstb-bounce64.c b/drivers/pci/controller/pcie-brcmstb-bounce64.c
-index ac8dde3c030b7..6a872975ba9e1 100644
+index ac8dde3c030b..6a872975ba9e 100644
 --- a/drivers/pci/controller/pcie-brcmstb-bounce64.c
 +++ b/drivers/pci/controller/pcie-brcmstb-bounce64.c
 @@ -517,7 +517,7 @@ int brcm_pcie_bounce_init(struct device *dev,
@@ -357066,7 +357081,7 @@ This reverts commit 60f3db31d4cb785befed715b80c430f60f647701.
  delete mode 100644 drivers/pci/controller/pcie-brcmstb-bounce64.c
 
 diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c
-index e17e3b2f11c6e..9239416e93d4e 100644
+index e17e3b2f11c6..9239416e93d4 100644
 --- a/arch/arm64/mm/dma-mapping.c
 +++ b/arch/arm64/mm/dma-mapping.c
 @@ -31,35 +31,6 @@ void arch_dma_prep_coherent(struct page *page, size_t size)
@@ -357106,7 +357121,7 @@ index e17e3b2f11c6e..9239416e93d4e 100644
  {
  	dev->dma_ops = NULL;
 diff --git a/drivers/pci/controller/Makefile b/drivers/pci/controller/Makefile
-index d52bf54d579f3..be98ebfdb1737 100644
+index d52bf54d579f..be98ebfdb173 100644
 --- a/drivers/pci/controller/Makefile
 +++ b/drivers/pci/controller/Makefile
 @@ -33,9 +33,6 @@ obj-$(CONFIG_PCIE_BRCMSTB) += pcie-brcmstb.o
@@ -357120,7 +357135,7 @@ index d52bf54d579f3..be98ebfdb1737 100644
  obj-$(CONFIG_VMD) += vmd.o
  # pcie-hisi.o quirks are needed even without CONFIG_PCIE_DW
 diff --git a/drivers/pci/controller/pcie-brcmstb-bounce.h b/drivers/pci/controller/pcie-brcmstb-bounce.h
-index 7caa0781329b5..2fe20a14d0352 100644
+index 7caa0781329b..2fe20a14d035 100644
 --- a/drivers/pci/controller/pcie-brcmstb-bounce.h
 +++ b/drivers/pci/controller/pcie-brcmstb-bounce.h
 @@ -6,7 +6,7 @@
@@ -357134,7 +357149,7 @@ index 7caa0781329b5..2fe20a14d0352 100644
  			  dma_addr_t threshold);
 diff --git a/drivers/pci/controller/pcie-brcmstb-bounce64.c b/drivers/pci/controller/pcie-brcmstb-bounce64.c
 deleted file mode 100644
-index 6a872975ba9e1..0000000000000
+index 6a872975ba9e..000000000000
 --- a/drivers/pci/controller/pcie-brcmstb-bounce64.c
 +++ /dev/null
 @@ -1,569 +0,0 @@
@@ -357708,7 +357723,7 @@ index 6a872975ba9e1..0000000000000
 -MODULE_DESCRIPTION("Dedicate DMA bounce support for pcie-brcmstb");
 -MODULE_LICENSE("GPL");
 diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c
-index e8c8b355548a5..87fd40ae31400 100644
+index e8c8b355548a..87fd40ae3140 100644
 --- a/drivers/pci/controller/pcie-brcmstb.c
 +++ b/drivers/pci/controller/pcie-brcmstb.c
 @@ -611,6 +611,28 @@ static const struct dma_map_ops brcm_dma_ops = {
@@ -357786,7 +357801,7 @@ This reverts commit 510a127017a0aada2734dbf57d25aaa0189198ff.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c
-index 87fd40ae31400..746cfb405ad38 100644
+index 87fd40ae3140..746cfb405ad3 100644
 --- a/drivers/pci/controller/pcie-brcmstb.c
 +++ b/drivers/pci/controller/pcie-brcmstb.c
 @@ -665,8 +665,8 @@ static int brcmstb_platform_notifier(struct notifier_block *nb,
@@ -357814,7 +357829,7 @@ This reverts commit f498861a16d0b9a189a329080da1aa64d6e9bda7.
  1 file changed, 137 insertions(+), 137 deletions(-)
 
 diff --git a/drivers/dma/bcm2835-dma.c b/drivers/dma/bcm2835-dma.c
-index 8d7c80536aa42..87fd58272e95f 100644
+index 8d7c80536aa4..87fd58272e95 100644
 --- a/drivers/dma/bcm2835-dma.c
 +++ b/drivers/dma/bcm2835-dma.c
 @@ -38,7 +38,7 @@
@@ -358310,7 +358325,7 @@ This reverts commit 773a2db89ad2785d72b215673d87c0a51d769f61.
  4 files changed, 126 insertions(+), 369 deletions(-)
 
 diff --git a/drivers/dma/bcm2835-dma.c b/drivers/dma/bcm2835-dma.c
-index 87fd58272e95f..f59b099233dc0 100644
+index 87fd58272e95..f59b099233dc 100644
 --- a/drivers/dma/bcm2835-dma.c
 +++ b/drivers/dma/bcm2835-dma.c
 @@ -38,11 +38,6 @@
@@ -359056,7 +359071,7 @@ index 87fd58272e95f..f59b099233dc0 100644
  
  	return 0;
 diff --git a/drivers/pci/controller/pcie-brcmstb-bounce.c b/drivers/pci/controller/pcie-brcmstb-bounce.c
-index fa81a98f6a813..d8007631a54cf 100644
+index fa81a98f6a81..d8007631a54c 100644
 --- a/drivers/pci/controller/pcie-brcmstb-bounce.c
 +++ b/drivers/pci/controller/pcie-brcmstb-bounce.c
 @@ -91,7 +91,7 @@ struct dmabounce_device_info {
@@ -359141,7 +359156,7 @@ index fa81a98f6a813..d8007631a54cf 100644
  MODULE_AUTHOR("Phil Elwell <phil@raspberrypi.org>");
  MODULE_DESCRIPTION("Dedicate DMA bounce support for pcie-brcmstb");
 diff --git a/drivers/pci/controller/pcie-brcmstb-bounce.h b/drivers/pci/controller/pcie-brcmstb-bounce.h
-index 2fe20a14d0352..5d07f679dc71b 100644
+index 2fe20a14d035..5d07f679dc71 100644
 --- a/drivers/pci/controller/pcie-brcmstb-bounce.h
 +++ b/drivers/pci/controller/pcie-brcmstb-bounce.h
 @@ -8,26 +8,21 @@
@@ -359180,7 +359195,7 @@ index 2fe20a14d0352..5d07f679dc71b 100644
  	return 0;
  }
 diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c
-index 746cfb405ad38..782725e3adad5 100644
+index 746cfb405ad3..782725e3adad 100644
 --- a/drivers/pci/controller/pcie-brcmstb.c
 +++ b/drivers/pci/controller/pcie-brcmstb.c
 @@ -644,7 +644,6 @@ static void brcm_set_dma_ops(struct device *dev)
@@ -359268,7 +359283,7 @@ This reverts commit 1dab5ded41ed07adc12f26e529aa64209a7c44b6.
  delete mode 100644 drivers/soc/bcm/brcmstb/memory.c
 
 diff --git a/drivers/dma/bcm2835-dma.c b/drivers/dma/bcm2835-dma.c
-index f59b099233dc0..1e5d6f1bed4ec 100644
+index f59b099233dc..1e5d6f1bed4e 100644
 --- a/drivers/dma/bcm2835-dma.c
 +++ b/drivers/dma/bcm2835-dma.c
 @@ -64,17 +64,6 @@ struct bcm2835_dma_cb {
@@ -359407,7 +359422,7 @@ index f59b099233dc0..1e5d6f1bed4ec 100644
  	for (i = 0; i <= BCM2835_DMA_MAX_DMA_CHAN_SUPPORTED; i++) {
  		/* skip masked out channels */
 diff --git a/drivers/pci/controller/Makefile b/drivers/pci/controller/Makefile
-index be98ebfdb1737..66c36e20f3291 100644
+index be98ebfdb173..66c36e20f329 100644
 --- a/drivers/pci/controller/Makefile
 +++ b/drivers/pci/controller/Makefile
 @@ -30,10 +30,6 @@ obj-$(CONFIG_PCIE_MEDIATEK) += pcie-mediatek.o
@@ -359423,7 +359438,7 @@ index be98ebfdb1737..66c36e20f3291 100644
  obj-y				+= dwc/
 diff --git a/drivers/pci/controller/pcie-brcmstb-bounce.c b/drivers/pci/controller/pcie-brcmstb-bounce.c
 deleted file mode 100644
-index d8007631a54cf..0000000000000
+index d8007631a54c..000000000000
 --- a/drivers/pci/controller/pcie-brcmstb-bounce.c
 +++ /dev/null
 @@ -1,558 +0,0 @@
@@ -359987,7 +360002,7 @@ index d8007631a54cf..0000000000000
 -MODULE_LICENSE("GPL");
 diff --git a/drivers/pci/controller/pcie-brcmstb-bounce.h b/drivers/pci/controller/pcie-brcmstb-bounce.h
 deleted file mode 100644
-index 5d07f679dc71b..0000000000000
+index 5d07f679dc71..000000000000
 --- a/drivers/pci/controller/pcie-brcmstb-bounce.h
 +++ /dev/null
 @@ -1,32 +0,0 @@
@@ -360024,7 +360039,7 @@ index 5d07f679dc71b..0000000000000
 -
 -#endif /* _PCIE_BRCMSTB_BOUNCE_H */
 diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c
-index 782725e3adad5..b028d4be81a23 100644
+index 782725e3adad..b028d4be81a2 100644
 --- a/drivers/pci/controller/pcie-brcmstb.c
 +++ b/drivers/pci/controller/pcie-brcmstb.c
 @@ -29,7 +29,6 @@
@@ -360518,7 +360533,7 @@ index 782725e3adad5..b028d4be81a23 100644
  		.pm = &brcm_pcie_pm_ops,
  	},
 diff --git a/drivers/soc/bcm/brcmstb/Makefile b/drivers/soc/bcm/brcmstb/Makefile
-index 28b3a3be0ee36..fe5c43d26dce3 100644
+index 28b3a3be0ee3..fe5c43d26dce 100644
 --- a/drivers/soc/bcm/brcmstb/Makefile
 +++ b/drivers/soc/bcm/brcmstb/Makefile
 @@ -1,3 +1,3 @@
@@ -360528,7 +360543,7 @@ index 28b3a3be0ee36..fe5c43d26dce3 100644
  obj-$(CONFIG_BRCMSTB_PM)	+= pm/
 diff --git a/drivers/soc/bcm/brcmstb/memory.c b/drivers/soc/bcm/brcmstb/memory.c
 deleted file mode 100644
-index 254783d1065f7..0000000000000
+index 254783d1065f..000000000000
 --- a/drivers/soc/bcm/brcmstb/memory.c
 +++ /dev/null
 @@ -1,158 +0,0 @@
@@ -360705,7 +360720,7 @@ This reverts commit b1619c83208e7b804e2c3547dbf24bb02b3be239.
  1 file changed, 21 insertions(+), 353 deletions(-)
 
 diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c
-index b028d4be81a23..27bcf83c99d7e 100644
+index b028d4be81a2..27bcf83c99d7 100644
 --- a/drivers/pci/controller/pcie-brcmstb.c
 +++ b/drivers/pci/controller/pcie-brcmstb.c
 @@ -1,7 +1,6 @@
@@ -361245,7 +361260,7 @@ This reverts commit d45590eb858ac7a2578d477791881ba7ffb1e615.
  1 file changed, 9 insertions(+), 411 deletions(-)
 
 diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c
-index 27bcf83c99d7e..babef9191e88c 100644
+index 27bcf83c99d7..babef9191e88 100644
 --- a/drivers/pci/controller/pcie-brcmstb.c
 +++ b/drivers/pci/controller/pcie-brcmstb.c
 @@ -4,7 +4,6 @@
@@ -361758,7 +361773,7 @@ This reverts commit 79624ca23c53064fefee774a89952a587b72cc01.
  delete mode 100644 include/soc/brcmstb/memory_api.h
 
 diff --git a/drivers/pci/controller/Kconfig b/drivers/pci/controller/Kconfig
-index 650b3b56153cb..70e078238899f 100644
+index 650b3b56153c..70e078238899 100644
 --- a/drivers/pci/controller/Kconfig
 +++ b/drivers/pci/controller/Kconfig
 @@ -288,14 +288,5 @@ config PCI_HYPERV_INTERFACE
@@ -361777,7 +361792,7 @@ index 650b3b56153cb..70e078238899f 100644
  source "drivers/pci/controller/dwc/Kconfig"
  endmenu
 diff --git a/drivers/pci/controller/Makefile b/drivers/pci/controller/Makefile
-index 66c36e20f3291..a2a22c9d91afc 100644
+index 66c36e20f329..a2a22c9d91af 100644
 --- a/drivers/pci/controller/Makefile
 +++ b/drivers/pci/controller/Makefile
 @@ -29,11 +29,11 @@ obj-$(CONFIG_PCIE_ROCKCHIP_HOST) += pcie-rockchip-host.o
@@ -361795,7 +361810,7 @@ index 66c36e20f3291..a2a22c9d91afc 100644
  # They contain MCFG quirks to replace the generic ECAM accessors with
 diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c
 deleted file mode 100644
-index babef9191e88c..0000000000000
+index babef9191e88..000000000000
 --- a/drivers/pci/controller/pcie-brcmstb.c
 +++ /dev/null
 @@ -1,1097 +0,0 @@
@@ -362898,7 +362913,7 @@ index babef9191e88c..0000000000000
 -MODULE_AUTHOR("Broadcom");
 diff --git a/include/soc/brcmstb/memory_api.h b/include/soc/brcmstb/memory_api.h
 deleted file mode 100644
-index d922906790671..0000000000000
+index d92290679067..000000000000
 --- a/include/soc/brcmstb/memory_api.h
 +++ /dev/null
 @@ -1,25 +0,0 @@
@@ -362942,7 +362957,7 @@ This reverts commit 47fec0dcefa53f44985e95785021447d646daa2b.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c
-index 1898739ec5b79..cbcac03c0e0da 100644
+index 1898739ec5b7..cbcac03c0e0d 100644
 --- a/arch/arm64/mm/init.c
 +++ b/arch/arm64/mm/init.c
 @@ -171,7 +171,7 @@ static void __init reserve_elfcorehdr(void)
@@ -362970,7 +362985,7 @@ This reverts commit e44850bd4205a8cf17f23c44668c0f8d28ad40b1.
  1 file changed, 2 insertions(+), 10 deletions(-)
 
 diff --git a/include/linux/dma-direct.h b/include/linux/dma-direct.h
-index 6a18a97b76a87..adf993a3bd580 100644
+index 6a18a97b76a8..adf993a3bd58 100644
 --- a/include/linux/dma-direct.h
 +++ b/include/linux/dma-direct.h
 @@ -3,11 +3,8 @@
@@ -363030,7 +363045,7 @@ Signed-off-by: Rob Herring <robh@kernel.org>
  1 file changed, 10 insertions(+)
 
 diff --git a/drivers/of/address.c b/drivers/of/address.c
-index 5abb056b2b515..b2a86049c4232 100644
+index 5abb056b2b51..b2a86049c423 100644
 --- a/drivers/of/address.c
 +++ b/drivers/of/address.c
 @@ -695,6 +695,16 @@ static struct device_node *__of_get_dma_parent(const struct device_node *np)
@@ -363074,7 +363089,7 @@ Signed-off-by: Rob Herring <robh@kernel.org>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/of/address.c b/drivers/of/address.c
-index b2a86049c4232..42269c8a308b2 100644
+index b2a86049c423..42269c8a308b 100644
 --- a/drivers/of/address.c
 +++ b/drivers/of/address.c
 @@ -1025,7 +1025,7 @@ bool of_dma_is_coherent(struct device_node *np)
@@ -363117,7 +363132,7 @@ Signed-off-by: Rob Herring <robh@kernel.org>
  3 files changed, 38 insertions(+), 10 deletions(-)
 
 diff --git a/drivers/of/address.c b/drivers/of/address.c
-index 42269c8a308b2..104617bffcc8e 100644
+index 42269c8a308b..104617bffcc8 100644
 --- a/drivers/of/address.c
 +++ b/drivers/of/address.c
 @@ -14,6 +14,8 @@
@@ -363130,7 +363145,7 @@ index 42269c8a308b2..104617bffcc8e 100644
  #define OF_MAX_ADDR_CELLS	4
  #define OF_CHECK_ADDR_COUNT(na)	((na) > 0 && (na) <= OF_MAX_ADDR_CELLS)
 diff --git a/drivers/of/base.c b/drivers/of/base.c
-index 1d667eb730e19..db7fbc0c0893c 100644
+index 1d667eb730e1..db7fbc0c0893 100644
 --- a/drivers/of/base.c
 +++ b/drivers/of/base.c
 @@ -86,34 +86,46 @@ static bool __of_node_is_type(const struct device_node *np, const char *type)
@@ -363191,7 +363206,7 @@ index 1d667eb730e19..db7fbc0c0893c 100644
  
  #ifdef CONFIG_NUMA
 diff --git a/drivers/of/of_private.h b/drivers/of/of_private.h
-index 24786818e32e5..66294d29942ae 100644
+index 24786818e32e..66294d29942a 100644
 --- a/drivers/of/of_private.h
 +++ b/drivers/of/of_private.h
 @@ -158,4 +158,18 @@ extern void __of_sysfs_remove_bin_file(struct device_node *np,
@@ -363241,7 +363256,7 @@ Signed-off-by: Rob Herring <robh@kernel.org>
  1 file changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/of/address.c b/drivers/of/address.c
-index 104617bffcc8e..4e41ab740fc3b 100644
+index 104617bffcc8..4e41ab740fc3 100644
 --- a/drivers/of/address.c
 +++ b/drivers/of/address.c
 @@ -519,9 +519,13 @@ static int of_translate_one(struct device_node *parent, struct of_bus *bus,
@@ -363295,7 +363310,7 @@ Tested-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
  1 file changed, 18 insertions(+), 26 deletions(-)
 
 diff --git a/drivers/of/address.c b/drivers/of/address.c
-index 4e41ab740fc3b..100b762ac0809 100644
+index 4e41ab740fc3..100b762ac080 100644
 --- a/drivers/of/address.c
 +++ b/drivers/of/address.c
 @@ -940,47 +940,39 @@ int of_dma_get_range(struct device_node *np, u64 *dma_addr, u64 *paddr, u64 *siz
@@ -363396,7 +363411,7 @@ Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c
-index cbcac03c0e0da..1ba9ad5c4c163 100644
+index cbcac03c0e0d..1ba9ad5c4c16 100644
 --- a/arch/arm64/mm/init.c
 +++ b/arch/arm64/mm/init.c
 @@ -181,7 +181,7 @@ static void __init zone_sizes_init(unsigned long min, unsigned long max)
@@ -363431,7 +363446,7 @@ Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
  1 file changed, 15 insertions(+), 15 deletions(-)
 
 diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c
-index 1ba9ad5c4c163..98e7310fd0599 100644
+index 1ba9ad5c4c16..98e7310fd059 100644
 --- a/arch/arm64/mm/init.c
 +++ b/arch/arm64/mm/init.c
 @@ -50,7 +50,7 @@
@@ -363565,7 +363580,7 @@ Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
  3 files changed, 45 insertions(+), 15 deletions(-)
 
 diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
-index 9c8ea59398658..802f9931358c6 100644
+index 9c8ea5939865..802f9931358c 100644
 --- a/arch/arm64/Kconfig
 +++ b/arch/arm64/Kconfig
 @@ -267,6 +267,10 @@ config GENERIC_CSUM
@@ -363580,7 +363595,7 @@ index 9c8ea59398658..802f9931358c6 100644
  	bool "Support DMA32 zone" if EXPERT
  	default y
 diff --git a/arch/arm64/include/asm/page.h b/arch/arm64/include/asm/page.h
-index d39ddb258a049..7b8c98830101e 100644
+index d39ddb258a04..7b8c98830101 100644
 --- a/arch/arm64/include/asm/page.h
 +++ b/arch/arm64/include/asm/page.h
 @@ -38,4 +38,6 @@ extern int pfn_valid(unsigned long);
@@ -363591,7 +363606,7 @@ index d39ddb258a049..7b8c98830101e 100644
 +
  #endif
 diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c
-index 98e7310fd0599..09edbfed7369e 100644
+index 98e7310fd059..09edbfed7369 100644
 --- a/arch/arm64/mm/init.c
 +++ b/arch/arm64/mm/init.c
 @@ -50,6 +50,13 @@
@@ -363740,7 +363755,7 @@ Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
  1 file changed, 26 insertions(+), 19 deletions(-)
 
 diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
-index a90aba3d6afb4..6d8ea64eeb286 100644
+index a90aba3d6afb..6d8ea64eeb28 100644
 --- a/include/linux/mmzone.h
 +++ b/include/linux/mmzone.h
 @@ -358,33 +358,40 @@ struct per_cpu_nodestat {
@@ -363825,7 +363840,7 @@ Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
  1 file changed, 12 insertions(+)
 
 diff --git a/include/linux/resource_ext.h b/include/linux/resource_ext.h
-index 06da59b23b79d..ff0339df56afc 100644
+index 06da59b23b79..ff0339df56af 100644
 --- a/include/linux/resource_ext.h
 +++ b/include/linux/resource_ext.h
 @@ -66,4 +66,16 @@ resource_list_destroy_entry(struct resource_entry *entry)
@@ -363874,7 +363889,7 @@ Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
  8 files changed, 31 insertions(+), 27 deletions(-)
 
 diff --git a/arch/arm64/include/asm/page.h b/arch/arm64/include/asm/page.h
-index 7b8c98830101e..d39ddb258a049 100644
+index 7b8c98830101..d39ddb258a04 100644
 --- a/arch/arm64/include/asm/page.h
 +++ b/arch/arm64/include/asm/page.h
 @@ -38,6 +38,4 @@ extern int pfn_valid(unsigned long);
@@ -363885,7 +363900,7 @@ index 7b8c98830101e..d39ddb258a049 100644
 -
  #endif
 diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c
-index 09edbfed7369e..66d46b39af02a 100644
+index 09edbfed7369..66d46b39af02 100644
 --- a/arch/arm64/mm/init.c
 +++ b/arch/arm64/mm/init.c
 @@ -20,6 +20,7 @@
@@ -363919,7 +363934,7 @@ index 09edbfed7369e..66d46b39af02a 100644
  	if (IS_ENABLED(CONFIG_ZONE_DMA32))
  		arm64_dma32_phys_limit = max_zone_phys(32);
 diff --git a/arch/powerpc/include/asm/page.h b/arch/powerpc/include/asm/page.h
-index 6ba5adb96a3be..d568ce08e3b29 100644
+index 6ba5adb96a3b..d568ce08e3b2 100644
 --- a/arch/powerpc/include/asm/page.h
 +++ b/arch/powerpc/include/asm/page.h
 @@ -334,13 +334,4 @@ struct vm_area_struct;
@@ -363937,7 +363952,7 @@ index 6ba5adb96a3be..d568ce08e3b29 100644
 -
  #endif /* _ASM_POWERPC_PAGE_H */
 diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c
-index c48705c726ac6..be4e6141f25b8 100644
+index c48705c726ac..be4e6141f25b 100644
 --- a/arch/powerpc/mm/mem.c
 +++ b/arch/powerpc/mm/mem.c
 @@ -31,6 +31,7 @@
@@ -363984,7 +363999,7 @@ index c48705c726ac6..be4e6141f25b8 100644
  	max_zone_pfns[ZONE_NORMAL] = max_low_pfn;
  #ifdef CONFIG_HIGHMEM
 diff --git a/arch/s390/include/asm/page.h b/arch/s390/include/asm/page.h
-index e399102367af0..1019efd85b9dc 100644
+index e399102367af..1019efd85b9d 100644
 --- a/arch/s390/include/asm/page.h
 +++ b/arch/s390/include/asm/page.h
 @@ -179,8 +179,6 @@ static inline int devmem_is_allowed(unsigned long pfn)
@@ -363997,7 +364012,7 @@ index e399102367af0..1019efd85b9dc 100644
  #include <asm-generic/getorder.h>
  
 diff --git a/arch/s390/mm/init.c b/arch/s390/mm/init.c
-index c1d96e588152b..ac44bd76db4be 100644
+index c1d96e588152..ac44bd76db4b 100644
 --- a/arch/s390/mm/init.c
 +++ b/arch/s390/mm/init.c
 @@ -118,6 +118,7 @@ void __init paging_init(void)
@@ -364009,7 +364024,7 @@ index c1d96e588152b..ac44bd76db4be 100644
  	max_zone_pfns[ZONE_DMA] = PFN_DOWN(MAX_DMA_ADDRESS);
  	max_zone_pfns[ZONE_NORMAL] = max_low_pfn;
 diff --git a/include/linux/dma-direct.h b/include/linux/dma-direct.h
-index adf993a3bd580..d03af3605460f 100644
+index adf993a3bd58..d03af3605460 100644
 --- a/include/linux/dma-direct.h
 +++ b/include/linux/dma-direct.h
 @@ -5,6 +5,8 @@
@@ -364022,7 +364037,7 @@ index adf993a3bd580..d03af3605460f 100644
  #include <asm/dma-direct.h>
  #else
 diff --git a/kernel/dma/direct.c b/kernel/dma/direct.c
-index d2b4628354698..947823f1ccdfb 100644
+index d2b462835469..947823f1ccdf 100644
 --- a/kernel/dma/direct.c
 +++ b/kernel/dma/direct.c
 @@ -16,12 +16,11 @@
@@ -364094,7 +364109,7 @@ Signed-off-by: Christoph Hellwig <hch@lst.de>
  1 file changed, 10 insertions(+), 2 deletions(-)
 
 diff --git a/include/linux/dma-direct.h b/include/linux/dma-direct.h
-index d03af3605460f..7aadb776924de 100644
+index d03af3605460..7aadb776924d 100644
 --- a/include/linux/dma-direct.h
 +++ b/include/linux/dma-direct.h
 @@ -3,10 +3,13 @@
@@ -364167,10 +364182,10 @@ Signed-off-by: Christoph Hellwig <hch@lst.de>
  delete mode 100644 arch/x86/include/asm/dma-direct.h
 
 diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
-index 8ef85139553f5..b49b117bdf0c0 100644
+index 36a28b9e46cb..ef1c94d17f6a 100644
 --- a/arch/x86/Kconfig
 +++ b/arch/x86/Kconfig
-@@ -708,7 +708,6 @@ config X86_SUPPORTS_MEMORY_FAILURE
+@@ -709,7 +709,6 @@ config X86_SUPPORTS_MEMORY_FAILURE
  config STA2X11
  	bool "STA2X11 Companion Chip Support"
  	depends on X86_32_NON_STANDARD && PCI
@@ -364179,7 +364194,7 @@ index 8ef85139553f5..b49b117bdf0c0 100644
  	select MFD_STA2X11
  	select GPIOLIB
 diff --git a/arch/x86/include/asm/device.h b/arch/x86/include/asm/device.h
-index a8f6c809d9b13..5e12c63b47aa9 100644
+index a8f6c809d9b1..5e12c63b47aa 100644
 --- a/arch/x86/include/asm/device.h
 +++ b/arch/x86/include/asm/device.h
 @@ -6,9 +6,6 @@ struct dev_archdata {
@@ -364194,7 +364209,7 @@ index a8f6c809d9b13..5e12c63b47aa9 100644
  #if defined(CONFIG_X86_DEV_DMA_OPS) && defined(CONFIG_PCI_DOMAINS)
 diff --git a/arch/x86/include/asm/dma-direct.h b/arch/x86/include/asm/dma-direct.h
 deleted file mode 100644
-index 1a19251eaac90..0000000000000
+index 1a19251eaac9..000000000000
 --- a/arch/x86/include/asm/dma-direct.h
 +++ /dev/null
 @@ -1,9 +0,0 @@
@@ -364208,7 +364223,7 @@ index 1a19251eaac90..0000000000000
 -
 -#endif /* ASM_X86_DMA_DIRECT_H */
 diff --git a/arch/x86/pci/sta2x11-fixup.c b/arch/x86/pci/sta2x11-fixup.c
-index 6269a175385d4..4a631264b8097 100644
+index 6269a175385d..4a631264b809 100644
 --- a/arch/x86/pci/sta2x11-fixup.c
 +++ b/arch/x86/pci/sta2x11-fixup.c
 @@ -30,7 +30,6 @@ struct sta2x11_ahb_regs { /* saved during suspend */
@@ -364472,7 +364487,7 @@ Cc: linux-rockchip@lists.infradead.org
  19 files changed, 96 insertions(+), 48 deletions(-)
 
 diff --git a/drivers/pci/controller/dwc/pcie-designware-host.c b/drivers/pci/controller/dwc/pcie-designware-host.c
-index fbcb211cceb43..d421555fc786e 100644
+index fbcb211cceb4..d421555fc786 100644
 --- a/drivers/pci/controller/dwc/pcie-designware-host.c
 +++ b/drivers/pci/controller/dwc/pcie-designware-host.c
 @@ -345,12 +345,8 @@ int dw_pcie_host_init(struct pcie_port *pp)
@@ -364491,10 +364506,10 @@ index fbcb211cceb43..d421555fc786e 100644
  		return ret;
  
 diff --git a/drivers/pci/controller/pci-aardvark.c b/drivers/pci/controller/pci-aardvark.c
-index d0e60441dc8f2..e8c97cdd22bf6 100644
+index 89cc6980b596..73d291efac9d 100644
 --- a/drivers/pci/controller/pci-aardvark.c
 +++ b/drivers/pci/controller/pci-aardvark.c
-@@ -1018,7 +1018,8 @@ static int advk_pcie_probe(struct platform_device *pdev)
+@@ -1049,7 +1049,8 @@ static int advk_pcie_probe(struct platform_device *pdev)
  		return ret;
  	}
  
@@ -364505,7 +364520,7 @@ index d0e60441dc8f2..e8c97cdd22bf6 100644
  		dev_err(dev, "Failed to parse resources\n");
  		return ret;
 diff --git a/drivers/pci/controller/pci-ftpci100.c b/drivers/pci/controller/pci-ftpci100.c
-index bf5ece5d9291f..e578e9a2d2d05 100644
+index bf5ece5d9291..e578e9a2d2d0 100644
 --- a/drivers/pci/controller/pci-ftpci100.c
 +++ b/drivers/pci/controller/pci-ftpci100.c
 @@ -480,8 +480,8 @@ static int faraday_pci_probe(struct platform_device *pdev)
@@ -364520,7 +364535,7 @@ index bf5ece5d9291f..e578e9a2d2d05 100644
  		return ret;
  
 diff --git a/drivers/pci/controller/pci-host-common.c b/drivers/pci/controller/pci-host-common.c
-index c8cb9c5188a41..250a3fc80ec6d 100644
+index c8cb9c5188a4..250a3fc80ec6 100644
 --- a/drivers/pci/controller/pci-host-common.c
 +++ b/drivers/pci/controller/pci-host-common.c
 @@ -27,7 +27,7 @@ static struct pci_config_window *gen_pci_init(struct device *dev,
@@ -364533,7 +364548,7 @@ index c8cb9c5188a41..250a3fc80ec6d 100644
  		return ERR_PTR(err);
  
 diff --git a/drivers/pci/controller/pci-v3-semi.c b/drivers/pci/controller/pci-v3-semi.c
-index 9a86bb7448acf..8419daee7ee37 100644
+index 9a86bb7448ac..8419daee7ee3 100644
 --- a/drivers/pci/controller/pci-v3-semi.c
 +++ b/drivers/pci/controller/pci-v3-semi.c
 @@ -793,12 +793,8 @@ static int v3_pci_probe(struct platform_device *pdev)
@@ -364552,7 +364567,7 @@ index 9a86bb7448acf..8419daee7ee37 100644
  		return ret;
  
 diff --git a/drivers/pci/controller/pci-versatile.c b/drivers/pci/controller/pci-versatile.c
-index f59ad2728c0b3..ca8ec84d0a8fa 100644
+index f59ad2728c0b..ca8ec84d0a8f 100644
 --- a/drivers/pci/controller/pci-versatile.c
 +++ b/drivers/pci/controller/pci-versatile.c
 @@ -141,7 +141,8 @@ static int versatile_pci_probe(struct platform_device *pdev)
@@ -364566,7 +364581,7 @@ index f59ad2728c0b3..ca8ec84d0a8fa 100644
  		return ret;
  
 diff --git a/drivers/pci/controller/pci-xgene.c b/drivers/pci/controller/pci-xgene.c
-index ffda3e8b47426..470c6123e5181 100644
+index ffda3e8b4742..470c6123e518 100644
 --- a/drivers/pci/controller/pci-xgene.c
 +++ b/drivers/pci/controller/pci-xgene.c
 @@ -634,8 +634,8 @@ static int xgene_pcie_probe(struct platform_device *pdev)
@@ -364581,7 +364596,7 @@ index ffda3e8b47426..470c6123e5181 100644
  		return ret;
  
 diff --git a/drivers/pci/controller/pcie-altera.c b/drivers/pci/controller/pcie-altera.c
-index d2497ca438285..b8ef7f03cb401 100644
+index d2497ca43828..b8ef7f03cb40 100644
 --- a/drivers/pci/controller/pcie-altera.c
 +++ b/drivers/pci/controller/pcie-altera.c
 @@ -833,9 +833,8 @@ static int altera_pcie_probe(struct platform_device *pdev)
@@ -364597,7 +364612,7 @@ index d2497ca438285..b8ef7f03cb401 100644
  		dev_err(dev, "Failed add resources\n");
  		return ret;
 diff --git a/drivers/pci/controller/pcie-cadence-host.c b/drivers/pci/controller/pcie-cadence-host.c
-index 0dfc778f40a7a..6b236b8c2cb14 100644
+index 0dfc778f40a7..6b236b8c2cb1 100644
 --- a/drivers/pci/controller/pcie-cadence-host.c
 +++ b/drivers/pci/controller/pcie-cadence-host.c
 @@ -216,7 +216,7 @@ static int cdns_pcie_host_init(struct device *dev,
@@ -364610,7 +364625,7 @@ index 0dfc778f40a7a..6b236b8c2cb14 100644
  		return err;
  
 diff --git a/drivers/pci/controller/pcie-iproc-platform.c b/drivers/pci/controller/pcie-iproc-platform.c
-index 9ee6200a66f40..c1709521ab14f 100644
+index 9ee6200a66f4..c1709521ab14 100644
 --- a/drivers/pci/controller/pcie-iproc-platform.c
 +++ b/drivers/pci/controller/pcie-iproc-platform.c
 @@ -97,8 +97,8 @@ static int iproc_pcie_pltfm_probe(struct platform_device *pdev)
@@ -364625,7 +364640,7 @@ index 9ee6200a66f40..c1709521ab14f 100644
  		dev_err(dev, "unable to get PCI host bridge resources\n");
  		return ret;
 diff --git a/drivers/pci/controller/pcie-mediatek.c b/drivers/pci/controller/pcie-mediatek.c
-index 728a59655825d..ae48a6e77e200 100644
+index 728a59655825..ae48a6e77e20 100644
 --- a/drivers/pci/controller/pcie-mediatek.c
 +++ b/drivers/pci/controller/pcie-mediatek.c
 @@ -1027,8 +1027,8 @@ static int mtk_pcie_setup(struct mtk_pcie *pcie)
@@ -364640,7 +364655,7 @@ index 728a59655825d..ae48a6e77e200 100644
  		return err;
  
 diff --git a/drivers/pci/controller/pcie-mobiveil.c b/drivers/pci/controller/pcie-mobiveil.c
-index 32f37d08d5bc7..6d50b610160f0 100644
+index 32f37d08d5bc..6d50b610160f 100644
 --- a/drivers/pci/controller/pcie-mobiveil.c
 +++ b/drivers/pci/controller/pcie-mobiveil.c
 @@ -883,8 +883,8 @@ static int mobiveil_pcie_probe(struct platform_device *pdev)
@@ -364655,7 +364670,7 @@ index 32f37d08d5bc7..6d50b610160f0 100644
  		dev_err(dev, "Getting bridge resources failed\n");
  		return ret;
 diff --git a/drivers/pci/controller/pcie-rcar.c b/drivers/pci/controller/pcie-rcar.c
-index 04114352d0e7b..df911a10d99a5 100644
+index 04114352d0e7..df911a10d99a 100644
 --- a/drivers/pci/controller/pcie-rcar.c
 +++ b/drivers/pci/controller/pcie-rcar.c
 @@ -1144,7 +1144,8 @@ static int rcar_pcie_probe(struct platform_device *pdev)
@@ -364669,7 +364684,7 @@ index 04114352d0e7b..df911a10d99a5 100644
  		goto err_free_bridge;
  
 diff --git a/drivers/pci/controller/pcie-rockchip-host.c b/drivers/pci/controller/pcie-rockchip-host.c
-index ef8e677ce9d11..b8c8ea9cdb8b7 100644
+index ef8e677ce9d1..b8c8ea9cdb8b 100644
 --- a/drivers/pci/controller/pcie-rockchip-host.c
 +++ b/drivers/pci/controller/pcie-rockchip-host.c
 @@ -995,8 +995,8 @@ static int rockchip_pcie_probe(struct platform_device *pdev)
@@ -364684,7 +364699,7 @@ index ef8e677ce9d11..b8c8ea9cdb8b7 100644
  		goto err_remove_irq_domain;
  
 diff --git a/drivers/pci/controller/pcie-xilinx-nwl.c b/drivers/pci/controller/pcie-xilinx-nwl.c
-index 45c0f344ccd16..63f7832577a41 100644
+index 45c0f344ccd1..63f7832577a4 100644
 --- a/drivers/pci/controller/pcie-xilinx-nwl.c
 +++ b/drivers/pci/controller/pcie-xilinx-nwl.c
 @@ -845,8 +845,8 @@ static int nwl_pcie_probe(struct platform_device *pdev)
@@ -364699,7 +364714,7 @@ index 45c0f344ccd16..63f7832577a41 100644
  		dev_err(dev, "Getting bridge resources failed\n");
  		return err;
 diff --git a/drivers/pci/controller/pcie-xilinx.c b/drivers/pci/controller/pcie-xilinx.c
-index 5bf3af3b28e69..cffe5570442c0 100644
+index 5bf3af3b28e6..cffe5570442c 100644
 --- a/drivers/pci/controller/pcie-xilinx.c
 +++ b/drivers/pci/controller/pcie-xilinx.c
 @@ -647,8 +647,8 @@ static int xilinx_pcie_probe(struct platform_device *pdev)
@@ -364714,7 +364729,7 @@ index 5bf3af3b28e69..cffe5570442c0 100644
  		dev_err(dev, "Getting bridge resources failed\n");
  		return err;
 diff --git a/drivers/pci/of.c b/drivers/pci/of.c
-index 36891e7deee34..033cb8e56f1eb 100644
+index 36891e7deee3..033cb8e56f1e 100644
 --- a/drivers/pci/of.c
 +++ b/drivers/pci/of.c
 @@ -257,14 +257,16 @@ EXPORT_SYMBOL_GPL(of_pci_check_probe_only);
@@ -364823,10 +364838,10 @@ index 36891e7deee34..033cb8e56f1eb 100644
  		return err;
  
 diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
-index a5adc2e2c351d..3dcd031118dd5 100644
+index 572c2f0a2f0c..5fd7774ad92d 100644
 --- a/drivers/pci/pci.h
 +++ b/drivers/pci/pci.h
-@@ -637,11 +637,15 @@ static inline void pci_release_bus_of_node(struct pci_bus *bus) { }
+@@ -643,11 +643,15 @@ static inline void pci_release_bus_of_node(struct pci_bus *bus) { }
  #if defined(CONFIG_OF_ADDRESS)
  int devm_of_pci_get_host_bridge_resources(struct device *dev,
  			unsigned char busno, unsigned char bus_max,
@@ -364845,7 +364860,7 @@ index a5adc2e2c351d..3dcd031118dd5 100644
  	return -EINVAL;
  }
 diff --git a/include/linux/pci.h b/include/linux/pci.h
-index 6a6a819c5b49b..df23d35175455 100644
+index 6a6a819c5b49..df23d3517545 100644
 --- a/include/linux/pci.h
 +++ b/include/linux/pci.h
 @@ -2278,6 +2278,7 @@ struct irq_domain;
@@ -364900,7 +364915,7 @@ Reviewed-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
  4 files changed, 1 insertion(+), 37 deletions(-)
 
 diff --git a/arch/arm/include/asm/dma-direct.h b/arch/arm/include/asm/dma-direct.h
-index b67e5fc1fe436..7c3001a6a775b 100644
+index b67e5fc1fe43..7c3001a6a775 100644
 --- a/arch/arm/include/asm/dma-direct.h
 +++ b/arch/arm/include/asm/dma-direct.h
 @@ -14,23 +14,4 @@ static inline phys_addr_t __dma_to_phys(struct device *dev, dma_addr_t dev_addr)
@@ -364928,7 +364943,7 @@ index b67e5fc1fe436..7c3001a6a775b 100644
 -
  #endif /* ASM_ARM_DMA_DIRECT_H */
 diff --git a/arch/mips/include/asm/dma-direct.h b/arch/mips/include/asm/dma-direct.h
-index b5c240806e1bb..14e352651ce94 100644
+index b5c240806e1b..14e352651ce9 100644
 --- a/arch/mips/include/asm/dma-direct.h
 +++ b/arch/mips/include/asm/dma-direct.h
 @@ -2,14 +2,6 @@
@@ -364947,7 +364962,7 @@ index b5c240806e1bb..14e352651ce94 100644
  phys_addr_t __dma_to_phys(struct device *dev, dma_addr_t daddr);
  
 diff --git a/arch/powerpc/include/asm/dma-direct.h b/arch/powerpc/include/asm/dma-direct.h
-index a2912b47102cf..e29e8a236b8df 100644
+index a2912b47102c..e29e8a236b8d 100644
 --- a/arch/powerpc/include/asm/dma-direct.h
 +++ b/arch/powerpc/include/asm/dma-direct.h
 @@ -2,15 +2,6 @@
@@ -364967,7 +364982,7 @@ index a2912b47102cf..e29e8a236b8df 100644
  {
  	if (!dev)
 diff --git a/include/linux/dma-direct.h b/include/linux/dma-direct.h
-index 7aadb776924de..9e2e3d37b15c2 100644
+index 7aadb776924d..9e2e3d37b15c 100644
 --- a/include/linux/dma-direct.h
 +++ b/include/linux/dma-direct.h
 @@ -26,6 +26,7 @@ static inline phys_addr_t __dma_to_phys(struct device *dev, dma_addr_t dev_addr)
@@ -365007,7 +365022,7 @@ Reviewed-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
  1 file changed, 14 insertions(+), 16 deletions(-)
 
 diff --git a/include/linux/dma-direct.h b/include/linux/dma-direct.h
-index 9e2e3d37b15c2..f812ea2459f12 100644
+index 9e2e3d37b15c..f812ea2459f1 100644
 --- a/include/linux/dma-direct.h
 +++ b/include/linux/dma-direct.h
 @@ -8,8 +8,6 @@
@@ -365092,7 +365107,7 @@ Tested-by: Marek Szyprowski <m.szyprowski@samsung.com>
  5 files changed, 10 insertions(+), 9 deletions(-)
 
 diff --git a/arch/x86/kernel/amd_gart_64.c b/arch/x86/kernel/amd_gart_64.c
-index a6ac3712db8bc..5cfab41e8509c 100644
+index a6ac3712db8b..5cfab41e8509 100644
 --- a/arch/x86/kernel/amd_gart_64.c
 +++ b/arch/x86/kernel/amd_gart_64.c
 @@ -185,13 +185,13 @@ static void iommu_full(struct device *dev, size_t size, int dir)
@@ -365112,7 +365127,7 @@ index a6ac3712db8bc..5cfab41e8509c 100644
  
  /* Map a single continuous physical area into the IOMMU.
 diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c
-index 06346422f7432..f7ab7d4e1f94c 100644
+index 06346422f743..f7ab7d4e1f94 100644
 --- a/drivers/xen/swiotlb-xen.c
 +++ b/drivers/xen/swiotlb-xen.c
 @@ -381,7 +381,7 @@ static dma_addr_t xen_swiotlb_map_page(struct device *dev, struct page *page,
@@ -365134,7 +365149,7 @@ index 06346422f7432..f7ab7d4e1f94c 100644
  				attrs | DMA_ATTR_SKIP_CPU_SYNC);
  		return DMA_MAPPING_ERROR;
 diff --git a/include/linux/dma-direct.h b/include/linux/dma-direct.h
-index f812ea2459f12..46370d9a2cf6a 100644
+index f812ea2459f1..46370d9a2cf6 100644
 --- a/include/linux/dma-direct.h
 +++ b/include/linux/dma-direct.h
 @@ -51,14 +51,15 @@ static inline phys_addr_t dma_to_phys(struct device *dev, dma_addr_t daddr)
@@ -365156,7 +365171,7 @@ index f812ea2459f12..46370d9a2cf6a 100644
  		return false;
  
 diff --git a/kernel/dma/direct.c b/kernel/dma/direct.c
-index 947823f1ccdfb..803bb857aa1bf 100644
+index 947823f1ccdf..803bb857aa1b 100644
 --- a/kernel/dma/direct.c
 +++ b/kernel/dma/direct.c
 @@ -326,7 +326,7 @@ static inline bool dma_direct_possible(struct device *dev, dma_addr_t dma_addr,
@@ -365178,7 +365193,7 @@ index 947823f1ccdfb..803bb857aa1bf 100644
  		return DMA_MAPPING_ERROR;
  	}
 diff --git a/kernel/dma/swiotlb.c b/kernel/dma/swiotlb.c
-index f99b79d7e1235..8d230ee47e120 100644
+index f99b79d7e123..8d230ee47e12 100644
 --- a/kernel/dma/swiotlb.c
 +++ b/kernel/dma/swiotlb.c
 @@ -682,7 +682,7 @@ bool swiotlb_map(struct device *dev, phys_addr_t *phys, dma_addr_t *dma_addr,
@@ -365238,7 +365253,7 @@ Signed-off-by: Christoph Hellwig <hch@lst.de>
  13 files changed, 46 insertions(+), 53 deletions(-)
 
 diff --git a/arch/mips/pci/fixup-sb1250.c b/arch/mips/pci/fixup-sb1250.c
-index 8a41b359cf900..40efc990cdceb 100644
+index 8a41b359cf90..40efc990cdce 100644
 --- a/arch/mips/pci/fixup-sb1250.c
 +++ b/arch/mips/pci/fixup-sb1250.c
 @@ -21,22 +21,22 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_SIBYTE, PCI_DEVICE_ID_BCM1250_PCI,
@@ -365291,7 +365306,7 @@ index 8a41b359cf900..40efc990cdceb 100644
  DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_SIBYTE, PCI_DEVICE_ID_BCM1250_PCI,
  			quirk_sb1250_pci_dac);
 diff --git a/arch/powerpc/sysdev/fsl_pci.c b/arch/powerpc/sysdev/fsl_pci.c
-index ff0e2b156cb5f..617a443d673da 100644
+index ff0e2b156cb5..617a443d673d 100644
 --- a/arch/powerpc/sysdev/fsl_pci.c
 +++ b/arch/powerpc/sysdev/fsl_pci.c
 @@ -115,8 +115,8 @@ static void pci_dma_dev_setup_swiotlb(struct pci_dev *pdev)
@@ -365315,7 +365330,7 @@ index ff0e2b156cb5f..617a443d673da 100644
  	}
  }
 diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c
-index fa4352dce491c..3a75d665d43c4 100644
+index fa4352dce491..3a75d665d43c 100644
 --- a/arch/x86/kernel/pci-dma.c
 +++ b/arch/x86/kernel/pci-dma.c
 @@ -146,7 +146,7 @@ rootfs_initcall(pci_iommu_init);
@@ -365328,7 +365343,7 @@ index fa4352dce491c..3a75d665d43c4 100644
  }
  
 diff --git a/arch/x86/mm/mem_encrypt.c b/arch/x86/mm/mem_encrypt.c
-index 7b558939b89c1..ebf70fb3f8213 100644
+index 7b558939b89c..ebf70fb3f821 100644
 --- a/arch/x86/mm/mem_encrypt.c
 +++ b/arch/x86/mm/mem_encrypt.c
 @@ -367,7 +367,7 @@ bool force_dma_unencrypted(struct device *dev)
@@ -365341,7 +365356,7 @@ index 7b558939b89c1..ebf70fb3f8213 100644
  		if (dma_dev_mask <= dma_enc_mask)
  			return true;
 diff --git a/arch/x86/pci/sta2x11-fixup.c b/arch/x86/pci/sta2x11-fixup.c
-index 4a631264b8097..c313d784efabb 100644
+index 4a631264b809..c313d784efab 100644
 --- a/arch/x86/pci/sta2x11-fixup.c
 +++ b/arch/x86/pci/sta2x11-fixup.c
 @@ -143,7 +143,7 @@ static void sta2x11_map_ep(struct pci_dev *pdev)
@@ -365354,7 +365369,7 @@ index 4a631264b8097..c313d784efabb 100644
  	pci_set_dma_mask(pdev, max_amba_addr);
  
 diff --git a/drivers/acpi/arm64/iort.c b/drivers/acpi/arm64/iort.c
-index bc95a5eebd137..26db870f00e78 100644
+index bc95a5eebd13..26db870f00e7 100644
 --- a/drivers/acpi/arm64/iort.c
 +++ b/drivers/acpi/arm64/iort.c
 @@ -1062,8 +1062,8 @@ static int rc_dma_get_range(struct device *dev, u64 *size)
@@ -365394,7 +365409,7 @@ index bc95a5eebd137..26db870f00e78 100644
  		*dev->dma_mask = mask;
  	}
 diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
-index d33528033042c..94b6fbe1b7322 100644
+index 8beb418ce167..6b657cbec5cd 100644
 --- a/drivers/ata/ahci.c
 +++ b/drivers/ata/ahci.c
 @@ -900,7 +900,7 @@ static int ahci_configure_dma_masks(struct pci_dev *pdev, int using_dac)
@@ -365407,7 +365422,7 @@ index d33528033042c..94b6fbe1b7322 100644
  	if (pdev->dma_mask && pdev->dma_mask < DMA_BIT_MASK(32))
  		return 0;
 diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c
-index 76bd2309e0234..a153ba1b8507d 100644
+index 76bd2309e023..a153ba1b8507 100644
 --- a/drivers/iommu/dma-iommu.c
 +++ b/drivers/iommu/dma-iommu.c
 @@ -404,8 +404,7 @@ static dma_addr_t iommu_dma_alloc_iova(struct iommu_domain *domain,
@@ -365421,7 +365436,7 @@ index 76bd2309e0234..a153ba1b8507d 100644
  	if (domain->geometry.force_aperture)
  		dma_limit = min(dma_limit, domain->geometry.aperture_end);
 diff --git a/drivers/of/device.c b/drivers/of/device.c
-index da81583920103..e9127db7b0676 100644
+index da8158392010..e9127db7b067 100644
 --- a/drivers/of/device.c
 +++ b/drivers/of/device.c
 @@ -93,7 +93,7 @@ int of_dma_configure(struct device *dev, struct device_node *np, bool force_dma)
@@ -365451,7 +365466,7 @@ index da81583920103..e9127db7b0676 100644
  	coherent = of_dma_is_coherent(np);
  	dev_dbg(dev, "device is%sdma coherent\n",
 diff --git a/include/linux/device.h b/include/linux/device.h
-index 297239a08bb77..e396de656f207 100644
+index 297239a08bb7..e396de656f20 100644
 --- a/include/linux/device.h
 +++ b/include/linux/device.h
 @@ -1186,8 +1186,8 @@ struct dev_links_info {
@@ -365475,7 +365490,7 @@ index 297239a08bb77..e396de656f207 100644
  
  	struct device_dma_parameters *dma_parms;
 diff --git a/include/linux/dma-direct.h b/include/linux/dma-direct.h
-index 46370d9a2cf6a..dc227ce4102f1 100644
+index 46370d9a2cf6..dc227ce4102f 100644
 --- a/include/linux/dma-direct.h
 +++ b/include/linux/dma-direct.h
 @@ -63,7 +63,7 @@ static inline bool dma_capable(struct device *dev, dma_addr_t addr, size_t size,
@@ -365488,7 +365503,7 @@ index 46370d9a2cf6a..dc227ce4102f1 100644
  
  u64 dma_direct_get_required_mask(struct device *dev);
 diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
-index 4d450672b7d66..c4d8741264bd0 100644
+index 4d450672b7d6..c4d8741264bd 100644
 --- a/include/linux/dma-mapping.h
 +++ b/include/linux/dma-mapping.h
 @@ -697,7 +697,7 @@ static inline int dma_coerce_mask_and_coherent(struct device *dev, u64 mask)
@@ -365501,7 +365516,7 @@ index 4d450672b7d66..c4d8741264bd0 100644
  }
  
 diff --git a/kernel/dma/direct.c b/kernel/dma/direct.c
-index 803bb857aa1bf..085a0db545c74 100644
+index 803bb857aa1b..085a0db545c7 100644
 --- a/kernel/dma/direct.c
 +++ b/kernel/dma/direct.c
 @@ -26,10 +26,10 @@ static void report_addr(struct device *dev, dma_addr_t dma_addr, size_t size)
@@ -365607,7 +365622,7 @@ Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
  1 file changed, 30 insertions(+), 1 deletion(-)
 
 diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi
-index e2f6ffb00aa94..b56388ce12163 100644
+index e2f6ffb00aa9..b56388ce1216 100644
 --- a/arch/arm/boot/dts/bcm2711.dtsi
 +++ b/arch/arm/boot/dts/bcm2711.dtsi
 @@ -331,7 +331,36 @@
@@ -365678,7 +365693,7 @@ Reviewed-by: Jeremy Linton <jeremy.linton@arm.com>
  create mode 100644 drivers/pci/controller/pcie-brcmstb.c
 
 diff --git a/drivers/pci/controller/Kconfig b/drivers/pci/controller/Kconfig
-index 70e078238899f..00d791d126a54 100644
+index 70e078238899..00d791d126a5 100644
 --- a/drivers/pci/controller/Kconfig
 +++ b/drivers/pci/controller/Kconfig
 @@ -281,6 +281,14 @@ config VMD
@@ -365697,7 +365712,7 @@ index 70e078238899f..00d791d126a54 100644
  	tristate "Hyper-V PCI Interface"
  	depends on X86 && HYPERV && PCI_MSI && PCI_MSI_IRQ_DOMAIN && X86_64
 diff --git a/drivers/pci/controller/Makefile b/drivers/pci/controller/Makefile
-index a2a22c9d91afc..3fc0b0cf5b5bf 100644
+index a2a22c9d91af..3fc0b0cf5b5b 100644
 --- a/drivers/pci/controller/Makefile
 +++ b/drivers/pci/controller/Makefile
 @@ -30,6 +30,7 @@ obj-$(CONFIG_PCIE_MEDIATEK) += pcie-mediatek.o
@@ -365710,7 +365725,7 @@ index a2a22c9d91afc..3fc0b0cf5b5bf 100644
  
 diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c
 new file mode 100644
-index 0000000000000..3250a2e6b1b41
+index 000000000000..3250a2e6b1b4
 --- /dev/null
 +++ b/drivers/pci/controller/pcie-brcmstb.c
 @@ -0,0 +1,755 @@
@@ -366501,7 +366516,7 @@ Reviewed-by: Andrew Murray <andrew.murray@arm.com>
  2 files changed, 262 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/pci/controller/Kconfig b/drivers/pci/controller/Kconfig
-index 00d791d126a54..b83d318a50933 100644
+index 00d791d126a5..b83d318a5093 100644
 --- a/drivers/pci/controller/Kconfig
 +++ b/drivers/pci/controller/Kconfig
 @@ -285,6 +285,7 @@ config PCIE_BRCMSTB
@@ -366513,7 +366528,7 @@ index 00d791d126a54..b83d318a50933 100644
  	  Say Y here to enable PCIe host controller support for
  	  Broadcom STB based SoCs, like the Raspberry Pi 4.
 diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c
-index 3250a2e6b1b41..d20aabc26273c 100644
+index 3250a2e6b1b4..d20aabc26273 100644
 --- a/drivers/pci/controller/pcie-brcmstb.c
 +++ b/drivers/pci/controller/pcie-brcmstb.c
 @@ -2,6 +2,7 @@
@@ -366892,7 +366907,7 @@ Acked-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c
-index d20aabc26273c..3a10e678c7f47 100644
+index d20aabc26273..3a10e678c7f4 100644
 --- a/drivers/pci/controller/pcie-brcmstb.c
 +++ b/drivers/pci/controller/pcie-brcmstb.c
 @@ -670,7 +670,7 @@ static inline int brcm_pcie_get_rc_bar2_size_and_offset(struct brcm_pcie *pcie,
@@ -366923,7 +366938,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  2 files changed, 1 insertion(+), 42 deletions(-)
 
 diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
-index f5bd44ea2bf19..ec2a40447176c 100644
+index f5bd44ea2bf1..ec2a40447176 100644
 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
 +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
 @@ -163,7 +163,7 @@
@@ -366936,7 +366951,7 @@ index f5bd44ea2bf19..ec2a40447176c 100644
  
  	/delete-node/ wifi-pwrseq;
 diff --git a/arch/arm/boot/dts/bcm2711-rpi.dtsi b/arch/arm/boot/dts/bcm2711-rpi.dtsi
-index a71b2eb74723f..18ba012413aaf 100644
+index a71b2eb74723..18ba012413aa 100644
 --- a/arch/arm/boot/dts/bcm2711-rpi.dtsi
 +++ b/arch/arm/boot/dts/bcm2711-rpi.dtsi
 @@ -66,47 +66,6 @@
@@ -367006,7 +367021,7 @@ This reverts commit 39d484cb87cbe5da5035199fbdec1f3c0b71d2ea.
  delete mode 100644 drivers/media/i2c/imx219.c
 
 diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig
-index e57406240288d..656bc361e58cc 100644
+index e57406240288..656bc361e58c 100644
 --- a/drivers/media/i2c/Kconfig
 +++ b/drivers/media/i2c/Kconfig
 @@ -578,17 +578,6 @@ config VIDEO_IMX214
@@ -367028,7 +367043,7 @@ index e57406240288d..656bc361e58cc 100644
  	tristate "Sony IMX258 sensor support"
  	depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API
 diff --git a/drivers/media/i2c/Makefile b/drivers/media/i2c/Makefile
-index 52e4c40263075..4ba92c433615b 100644
+index 52e4c4026307..4ba92c433615 100644
 --- a/drivers/media/i2c/Makefile
 +++ b/drivers/media/i2c/Makefile
 @@ -111,7 +111,6 @@ obj-$(CONFIG_VIDEO_ML86V7667)	+= ml86v7667.o
@@ -367041,7 +367056,7 @@ index 52e4c40263075..4ba92c433615b 100644
  obj-$(CONFIG_VIDEO_IMX319)	+= imx319.o
 diff --git a/drivers/media/i2c/imx219.c b/drivers/media/i2c/imx219.c
 deleted file mode 100644
-index 682397a484922..0000000000000
+index 682397a48492..000000000000
 --- a/drivers/media/i2c/imx219.c
 +++ /dev/null
 @@ -1,1093 +0,0 @@
@@ -368156,7 +368171,7 @@ This reverts commit e3dca865875b345a2fa45e8295e32d701c666334.
 
 diff --git a/Documentation/devicetree/bindings/media/i2c/imx219.txt b/Documentation/devicetree/bindings/media/i2c/imx219.txt
 deleted file mode 100644
-index a02f1ce1e1204..0000000000000
+index a02f1ce1e120..000000000000
 --- a/Documentation/devicetree/bindings/media/i2c/imx219.txt
 +++ /dev/null
 @@ -1,59 +0,0 @@
@@ -368247,7 +368262,7 @@ Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
 
 diff --git a/Documentation/devicetree/bindings/media/i2c/imx219.yaml b/Documentation/devicetree/bindings/media/i2c/imx219.yaml
 new file mode 100644
-index 0000000000000..32d6b693274f0
+index 000000000000..32d6b693274f
 --- /dev/null
 +++ b/Documentation/devicetree/bindings/media/i2c/imx219.yaml
 @@ -0,0 +1,114 @@
@@ -368366,7 +368381,7 @@ index 0000000000000..32d6b693274f0
 +
 +...
 diff --git a/MAINTAINERS b/MAINTAINERS
-index b7685777a8061..d99bdf9347058 100644
+index b7685777a806..d99bdf934705 100644
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
 @@ -15143,6 +15143,14 @@ S:	Maintained
@@ -368416,7 +368431,7 @@ Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
  create mode 100644 drivers/media/i2c/imx219.c
 
 diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig
-index 656bc361e58cc..7ae2a94bb2ef5 100644
+index 656bc361e58c..7ae2a94bb2ef 100644
 --- a/drivers/media/i2c/Kconfig
 +++ b/drivers/media/i2c/Kconfig
 @@ -578,6 +578,17 @@ config VIDEO_IMX214
@@ -368438,7 +368453,7 @@ index 656bc361e58cc..7ae2a94bb2ef5 100644
  	tristate "Sony IMX258 sensor support"
  	depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API
 diff --git a/drivers/media/i2c/Makefile b/drivers/media/i2c/Makefile
-index 4ba92c433615b..52e4c40263075 100644
+index 4ba92c433615..52e4c4026307 100644
 --- a/drivers/media/i2c/Makefile
 +++ b/drivers/media/i2c/Makefile
 @@ -111,6 +111,7 @@ obj-$(CONFIG_VIDEO_ML86V7667)	+= ml86v7667.o
@@ -368451,7 +368466,7 @@ index 4ba92c433615b..52e4c40263075 100644
  obj-$(CONFIG_VIDEO_IMX319)	+= imx319.o
 diff --git a/drivers/media/i2c/imx219.c b/drivers/media/i2c/imx219.c
 new file mode 100644
-index 0000000000000..f1effb5a5f66a
+index 000000000000..f1effb5a5f66
 --- /dev/null
 +++ b/drivers/media/i2c/imx219.c
 @@ -0,0 +1,1312 @@
@@ -369786,7 +369801,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/arch/arm/boot/dts/overlays/imx219-overlay.dts b/arch/arm/boot/dts/overlays/imx219-overlay.dts
-index 2a1500d07b680..b9e3d9e5730d4 100644
+index 2a1500d07b68..b9e3d9e5730d 100644
 --- a/arch/arm/boot/dts/overlays/imx219-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/imx219-overlay.dts
 @@ -40,7 +40,7 @@
@@ -369818,7 +369833,7 @@ Signed-off-by: Nataliya Korovkina <malus.brandywine@gmail.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Makefile b/Makefile
-index 23f487d10cb26..0455b76e9f92c 100644
+index 94e027c8e7bc..36474e0b94d9 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -1269,7 +1269,7 @@ ifneq ($(dtstree),)
@@ -369853,7 +369868,7 @@ Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
  1 file changed, 27 insertions(+), 3 deletions(-)
 
 diff --git a/drivers/media/i2c/ov5647.c b/drivers/media/i2c/ov5647.c
-index 07550377be2ef..6ecc018ac4317 100644
+index 07550377be2e..6ecc018ac431 100644
 --- a/drivers/media/i2c/ov5647.c
 +++ b/drivers/media/i2c/ov5647.c
 @@ -214,9 +214,18 @@ static int ov5647_write(struct v4l2_subdev *sd, u16 reg, u8 val)
@@ -369939,7 +369954,7 @@ Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
  1 file changed, 202 insertions(+), 66 deletions(-)
 
 diff --git a/drivers/media/i2c/ov5647.c b/drivers/media/i2c/ov5647.c
-index 6ecc018ac4317..0d84b7640cf39 100644
+index 6ecc018ac431..0d84b7640cf3 100644
 --- a/drivers/media/i2c/ov5647.c
 +++ b/drivers/media/i2c/ov5647.c
 @@ -86,13 +86,17 @@ struct regval_list {
@@ -370350,7 +370365,7 @@ Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
  1 file changed, 174 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/media/i2c/ov5647.c b/drivers/media/i2c/ov5647.c
-index 0d84b7640cf39..16cfafc9cf9cb 100644
+index 0d84b7640cf3..16cfafc9cf9c 100644
 --- a/drivers/media/i2c/ov5647.c
 +++ b/drivers/media/i2c/ov5647.c
 @@ -29,11 +29,13 @@
@@ -370633,7 +370648,7 @@ Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
  1 file changed, 452 insertions(+), 11 deletions(-)
 
 diff --git a/drivers/media/i2c/ov5647.c b/drivers/media/i2c/ov5647.c
-index 16cfafc9cf9cb..fc6c5d9c4532c 100644
+index 16cfafc9cf9c..fc6c5d9c4532 100644
 --- a/drivers/media/i2c/ov5647.c
 +++ b/drivers/media/i2c/ov5647.c
 @@ -111,6 +111,7 @@ struct ov5647 {
@@ -371190,7 +371205,7 @@ Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
  1 file changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/drivers/media/i2c/ov5647.c b/drivers/media/i2c/ov5647.c
-index fc6c5d9c4532c..66b3ee5cc1909 100644
+index fc6c5d9c4532..66b3ee5cc190 100644
 --- a/drivers/media/i2c/ov5647.c
 +++ b/drivers/media/i2c/ov5647.c
 @@ -669,8 +669,8 @@ static struct ov5647_mode supported_modes_10bit[] = {
@@ -371242,7 +371257,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  1 file changed, 9 insertions(+), 9 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
-index b0c1096efbe59..2bfa10660fe09 100644
+index b0c1096efbe5..2bfa10660fe0 100644
 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 @@ -260,7 +260,7 @@ static inline struct vc4_crtc *to_vc4_crtc(struct drm_crtc *crtc)
@@ -371332,7 +371347,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  2 files changed, 14 insertions(+)
 
 diff --git a/drivers/gpu/drm/drm_fourcc.c b/drivers/gpu/drm/drm_fourcc.c
-index c630064ccf416..f64a59f3520de 100644
+index c630064ccf41..f64a59f3520d 100644
 --- a/drivers/gpu/drm/drm_fourcc.c
 +++ b/drivers/gpu/drm/drm_fourcc.c
 @@ -274,6 +274,9 @@ const struct drm_format_info *__drm_format_info(u32 format)
@@ -371346,7 +371361,7 @@ index c630064ccf416..f64a59f3520de 100644
  
  	unsigned int i;
 diff --git a/include/uapi/drm/drm_fourcc.h b/include/uapi/drm/drm_fourcc.h
-index 3feeaa3f987a7..9847286609a86 100644
+index 3feeaa3f987a..9847286609a8 100644
 --- a/include/uapi/drm/drm_fourcc.h
 +++ b/include/uapi/drm/drm_fourcc.h
 @@ -265,6 +265,13 @@ extern "C" {
@@ -371394,7 +371409,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  2 files changed, 24 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
-index 2bfa10660fe09..6701cd3a0249a 100644
+index 2bfa10660fe0..6701cd3a0249 100644
 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 @@ -216,6 +216,10 @@ static const struct vc_image_format {
@@ -371440,7 +371455,7 @@ index 2bfa10660fe09..6701cd3a0249a 100644
  	case DRM_FORMAT_RGB888:
  	case DRM_FORMAT_BGR888:
 diff --git a/drivers/gpu/drm/vc4/vc_image_types.h b/drivers/gpu/drm/vc4/vc_image_types.h
-index 0bdffe5dd1e9a..8e76576733ef4 100644
+index 0bdffe5dd1e9..8e76576733ef 100644
 --- a/drivers/gpu/drm/vc4/vc_image_types.h
 +++ b/drivers/gpu/drm/vc4/vc_image_types.h
 @@ -139,6 +139,10 @@ enum {
@@ -371481,7 +371496,7 @@ Signed-off-by: Matthias Reichl <hias@horus.com>
  2 files changed, 5 insertions(+)
 
 diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
-index 572edc7818ea7..d2306a2e0b63c 100644
+index 572edc7818ea..d2306a2e0b63 100644
 --- a/arch/arm/boot/dts/overlays/README
 +++ b/arch/arm/boot/dts/overlays/README
 @@ -754,6 +754,10 @@ Params: gpio_pin                Input pin number. Default is 18.
@@ -371496,7 +371511,7 @@ index 572edc7818ea7..d2306a2e0b63c 100644
                                  ir-keytable), defaults to "rc-rc6-mce"
  
 diff --git a/arch/arm/boot/dts/overlays/gpio-ir-overlay.dts b/arch/arm/boot/dts/overlays/gpio-ir-overlay.dts
-index 58f588498d68e..162b6ce07dc91 100644
+index 58f588498d68..162b6ce07dc9 100644
 --- a/arch/arm/boot/dts/overlays/gpio-ir-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/gpio-ir-overlay.dts
 @@ -42,6 +42,7 @@
@@ -371533,7 +371548,7 @@ Signed-off-by: AMuszkat <ariel.muszkat@gmail.com>
  create mode 100644 sound/soc/codecs/ma120x0p.c
 
 diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile
-index 66f5be258aa5c..85d8249a2f201 100644
+index 66f5be258aa5..85d8249a2f20 100644
 --- a/arch/arm/boot/dts/overlays/Makefile
 +++ b/arch/arm/boot/dts/overlays/Makefile
 @@ -103,6 +103,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
@@ -371545,7 +371560,7 @@ index 66f5be258aa5c..85d8249a2f201 100644
  	midi-uart1.dtbo \
  	miniuart-bt.dtbo \
 diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
-index d2306a2e0b63c..62ad35f78bada 100644
+index d2306a2e0b63..62ad35f78bad 100644
 --- a/arch/arm/boot/dts/overlays/README
 +++ b/arch/arm/boot/dts/overlays/README
 @@ -1662,6 +1662,12 @@ Params: speed                   Display SPI bus speed
@@ -371563,7 +371578,7 @@ index d2306a2e0b63c..62ad35f78bada 100644
          31.25kbaud, the frequency required for MIDI
 diff --git a/arch/arm/boot/dts/overlays/merus-amp-overlay.dts b/arch/arm/boot/dts/overlays/merus-amp-overlay.dts
 new file mode 100644
-index 0000000000000..4501fbdc253da
+index 000000000000..4501fbdc253d
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/merus-amp-overlay.dts
 @@ -0,0 +1,60 @@
@@ -371628,7 +371643,7 @@ index 0000000000000..4501fbdc253da
 +	};
 +};
 diff --git a/sound/soc/bcm/rpi-simple-soundcard.c b/sound/soc/bcm/rpi-simple-soundcard.c
-index 133b6d98f515f..41965c71c9120 100644
+index 133b6d98f515..41965c71c912 100644
 --- a/sound/soc/bcm/rpi-simple-soundcard.c
 +++ b/sound/soc/bcm/rpi-simple-soundcard.c
 @@ -16,6 +16,10 @@
@@ -371681,7 +371696,7 @@ index 133b6d98f515f..41965c71c9120 100644
  };
  
 diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
-index 2cc56e9a0e84c..c4160609a67b8 100644
+index 2cc56e9a0e84..c4160609a67b 100644
 --- a/sound/soc/codecs/Kconfig
 +++ b/sound/soc/codecs/Kconfig
 @@ -103,6 +103,7 @@ config SND_SOC_ALL_CODECS
@@ -371707,7 +371722,7 @@ index 2cc56e9a0e84c..c4160609a67b8 100644
  	tristate
  	default y if SND_SOC_CS47L15=y
 diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile
-index 9b201db7a1502..02560ad53894e 100644
+index 9b201db7a150..02560ad53894 100644
 --- a/sound/soc/codecs/Makefile
 +++ b/sound/soc/codecs/Makefile
 @@ -99,6 +99,7 @@ snd-soc-l3-objs := l3.o
@@ -371728,7 +371743,7 @@ index 9b201db7a1502..02560ad53894e 100644
  obj-$(CONFIG_SND_SOC_MAX9768)	+= snd-soc-max9768.o
 diff --git a/sound/soc/codecs/ma120x0p.c b/sound/soc/codecs/ma120x0p.c
 new file mode 100644
-index 0000000000000..39c74b17e0077
+index 000000000000..39c74b17e007
 --- /dev/null
 +++ b/sound/soc/codecs/ma120x0p.c
 @@ -0,0 +1,1384 @@
@@ -373135,7 +373150,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  1 file changed, 4 insertions(+)
 
 diff --git a/arch/arm/boot/dts/bcm2711-rpi.dtsi b/arch/arm/boot/dts/bcm2711-rpi.dtsi
-index 18ba012413aaf..b434b8392e9ef 100644
+index 18ba012413aa..b434b8392e9e 100644
 --- a/arch/arm/boot/dts/bcm2711-rpi.dtsi
 +++ b/arch/arm/boot/dts/bcm2711-rpi.dtsi
 @@ -12,6 +12,10 @@
@@ -373176,7 +373191,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  6 files changed, 1 insertion(+), 15 deletions(-)
 
 diff --git a/arch/arm/boot/dts/bcm2710.dtsi b/arch/arm/boot/dts/bcm2710.dtsi
-index 4e47480dd9338..e7e5c913f1d1c 100644
+index 4e47480dd933..e7e5c913f1d1 100644
 --- a/arch/arm/boot/dts/bcm2710.dtsi
 +++ b/arch/arm/boot/dts/bcm2710.dtsi
 @@ -5,11 +5,7 @@
@@ -373193,7 +373208,7 @@ index 4e47480dd9338..e7e5c913f1d1c 100644
  
  	soc {
 diff --git a/arch/arm64/boot/dts/broadcom/bcm2710-rpi-2-b.dts b/arch/arm64/boot/dts/broadcom/bcm2710-rpi-2-b.dts
-index 116cdbf94b9b0..36ecea71f0ef9 100644
+index 116cdbf94b9b..36ecea71f0ef 100644
 --- a/arch/arm64/boot/dts/broadcom/bcm2710-rpi-2-b.dts
 +++ b/arch/arm64/boot/dts/broadcom/bcm2710-rpi-2-b.dts
 @@ -1,3 +1 @@
@@ -373201,7 +373216,7 @@ index 116cdbf94b9b0..36ecea71f0ef9 100644
 -
  #include "../../../../arm/boot/dts/bcm2710-rpi-2-b.dts"
 diff --git a/arch/arm64/boot/dts/broadcom/bcm2710-rpi-3-b-plus.dts b/arch/arm64/boot/dts/broadcom/bcm2710-rpi-3-b-plus.dts
-index d9242ff77079c..22fc6a82f2a96 100644
+index d9242ff77079..22fc6a82f2a9 100644
 --- a/arch/arm64/boot/dts/broadcom/bcm2710-rpi-3-b-plus.dts
 +++ b/arch/arm64/boot/dts/broadcom/bcm2710-rpi-3-b-plus.dts
 @@ -1,3 +1 @@
@@ -373209,7 +373224,7 @@ index d9242ff77079c..22fc6a82f2a96 100644
 -
  #include "../../../../arm/boot/dts/bcm2710-rpi-3-b-plus.dts"
 diff --git a/arch/arm64/boot/dts/broadcom/bcm2710-rpi-3-b.dts b/arch/arm64/boot/dts/broadcom/bcm2710-rpi-3-b.dts
-index deb33441da952..4cacc5b72ae3c 100644
+index deb33441da95..4cacc5b72ae3 100644
 --- a/arch/arm64/boot/dts/broadcom/bcm2710-rpi-3-b.dts
 +++ b/arch/arm64/boot/dts/broadcom/bcm2710-rpi-3-b.dts
 @@ -1,3 +1 @@
@@ -373217,7 +373232,7 @@ index deb33441da952..4cacc5b72ae3c 100644
 -
  #include "../../../../arm/boot/dts/bcm2710-rpi-3-b.dts"
 diff --git a/arch/arm64/boot/dts/broadcom/bcm2710-rpi-cm3.dts b/arch/arm64/boot/dts/broadcom/bcm2710-rpi-cm3.dts
-index 1c2560017c02f..e1e13784cff63 100644
+index 1c2560017c02..e1e13784cff6 100644
 --- a/arch/arm64/boot/dts/broadcom/bcm2710-rpi-cm3.dts
 +++ b/arch/arm64/boot/dts/broadcom/bcm2710-rpi-cm3.dts
 @@ -1,3 +1 @@
@@ -373225,7 +373240,7 @@ index 1c2560017c02f..e1e13784cff63 100644
 -
  #include "../../../../arm/boot/dts/bcm2710-rpi-cm3.dts"
 diff --git a/arch/arm64/boot/dts/broadcom/bcm2711-rpi-4-b.dts b/arch/arm64/boot/dts/broadcom/bcm2711-rpi-4-b.dts
-index 1fd86f81f5426..bf69a4b0b172a 100644
+index 1fd86f81f542..bf69a4b0b172 100644
 --- a/arch/arm64/boot/dts/broadcom/bcm2711-rpi-4-b.dts
 +++ b/arch/arm64/boot/dts/broadcom/bcm2711-rpi-4-b.dts
 @@ -1,3 +1 @@
@@ -373259,7 +373274,7 @@ Signed-off-by: Matthias Reichl <hias@horus.com>
  1 file changed, 1 insertion(+)
 
 diff --git a/drivers/net/ethernet/broadcom/genet/bcmmii.c b/drivers/net/ethernet/broadcom/genet/bcmmii.c
-index 0516d14f47035..942ee7cc82668 100644
+index 0516d14f4703..942ee7cc8266 100644
 --- a/drivers/net/ethernet/broadcom/genet/bcmmii.c
 +++ b/drivers/net/ethernet/broadcom/genet/bcmmii.c
 @@ -292,6 +292,7 @@ int bcmgenet_mii_config(struct net_device *dev, bool init)
@@ -373300,7 +373315,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191118155134.30468-1-hdego
  1 file changed, 30 insertions(+), 38 deletions(-)
 
 diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c
-index 3fd35e6b9d535..86fb462a8ca12 100644
+index 3fd35e6b9d53..86fb462a8ca1 100644
 --- a/drivers/gpu/drm/drm_modes.c
 +++ b/drivers/gpu/drm/drm_modes.c
 @@ -1568,11 +1568,34 @@ static int drm_mode_parse_cmdline_res_mode(const char *str, unsigned int length,
@@ -373440,7 +373455,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191118155134.30468-2-hdego
  1 file changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c
-index 86fb462a8ca12..342fe8076ee7e 100644
+index 86fb462a8ca1..342fe8076ee7 100644
 --- a/drivers/gpu/drm/drm_modes.c
 +++ b/drivers/gpu/drm/drm_modes.c
 @@ -1591,15 +1591,15 @@ static int drm_mode_parse_cmdline_int(const char *delim, unsigned int *int_ret)
@@ -373505,7 +373520,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191118155134.30468-3-hdego
  3 files changed, 33 insertions(+), 4 deletions(-)
 
 diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c
-index 342fe8076ee7e..6d9324a0d00f9 100644
+index 342fe8076ee7..6d9324a0d00f 100644
 --- a/drivers/gpu/drm/drm_modes.c
 +++ b/drivers/gpu/drm/drm_modes.c
 @@ -1728,7 +1728,7 @@ bool drm_mode_parse_command_line_for_connector(const char *mode_option,
@@ -373533,7 +373548,7 @@ index 342fe8076ee7e..6d9324a0d00f9 100644
  		ret = drm_mode_parse_cmdline_extra(extra_ptr, len, false,
  						   connector, mode);
 diff --git a/drivers/gpu/drm/selftests/drm_cmdline_selftests.h b/drivers/gpu/drm/selftests/drm_cmdline_selftests.h
-index 84e6bc050bf2c..2785a38f58640 100644
+index 84e6bc050bf2..2785a38f5864 100644
 --- a/drivers/gpu/drm/selftests/drm_cmdline_selftests.h
 +++ b/drivers/gpu/drm/selftests/drm_cmdline_selftests.h
 @@ -61,3 +61,4 @@ cmdline_test(drm_cmdline_test_vmirror)
@@ -373542,7 +373557,7 @@ index 84e6bc050bf2c..2785a38f58640 100644
  cmdline_test(drm_cmdline_test_invalid_option)
 +cmdline_test(drm_cmdline_test_bpp_extra_and_option)
 diff --git a/drivers/gpu/drm/selftests/test-drm_cmdline_parser.c b/drivers/gpu/drm/selftests/test-drm_cmdline_parser.c
-index 035f86c5d6482..7b199acaf2926 100644
+index 035f86c5d648..7b199acaf292 100644
 --- a/drivers/gpu/drm/selftests/test-drm_cmdline_parser.c
 +++ b/drivers/gpu/drm/selftests/test-drm_cmdline_parser.c
 @@ -1003,6 +1003,32 @@ static int drm_cmdline_test_invalid_option(void *ignored)
@@ -373610,7 +373625,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191118155134.30468-4-hdego
  3 files changed, 26 insertions(+)
 
 diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c
-index 6d9324a0d00f9..ff9d9daf2631f 100644
+index 6d9324a0d00f..ff9d9daf2631 100644
 --- a/drivers/gpu/drm/drm_modes.c
 +++ b/drivers/gpu/drm/drm_modes.c
 @@ -1801,6 +1801,7 @@ bool drm_mode_parse_command_line_for_connector(const char *mode_option,
@@ -373622,7 +373637,7 @@ index 6d9324a0d00f9..ff9d9daf2631f 100644
  		mode_end = strlen(name);
  		parse_extras = true;
 diff --git a/drivers/gpu/drm/selftests/drm_cmdline_selftests.h b/drivers/gpu/drm/selftests/drm_cmdline_selftests.h
-index 2785a38f58640..628d11d74d6b6 100644
+index 2785a38f5864..628d11d74d6b 100644
 --- a/drivers/gpu/drm/selftests/drm_cmdline_selftests.h
 +++ b/drivers/gpu/drm/selftests/drm_cmdline_selftests.h
 @@ -62,3 +62,4 @@ cmdline_test(drm_cmdline_test_margin_options)
@@ -373631,7 +373646,7 @@ index 2785a38f58640..628d11d74d6b6 100644
  cmdline_test(drm_cmdline_test_bpp_extra_and_option)
 +cmdline_test(drm_cmdline_test_extra_and_option)
 diff --git a/drivers/gpu/drm/selftests/test-drm_cmdline_parser.c b/drivers/gpu/drm/selftests/test-drm_cmdline_parser.c
-index 7b199acaf2926..a1210b7bf937c 100644
+index 7b199acaf292..a1210b7bf937 100644
 --- a/drivers/gpu/drm/selftests/test-drm_cmdline_parser.c
 +++ b/drivers/gpu/drm/selftests/test-drm_cmdline_parser.c
 @@ -1029,6 +1029,30 @@ static int drm_cmdline_test_bpp_extra_and_option(void *ignored)
@@ -373692,7 +373707,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191118155134.30468-5-hdego
  1 file changed, 9 insertions(+), 12 deletions(-)
 
 diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c
-index ff9d9daf2631f..0d7de6f4dec00 100644
+index ff9d9daf2631..0d7de6f4dec0 100644
 --- a/drivers/gpu/drm/drm_modes.c
 +++ b/drivers/gpu/drm/drm_modes.c
 @@ -1591,23 +1591,21 @@ static int drm_mode_parse_cmdline_int(const char *delim, unsigned int *int_ret)
@@ -373773,7 +373788,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191118155134.30468-6-hdego
  1 file changed, 5 insertions(+)
 
 diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c
-index 0d7de6f4dec00..d4b9e7ed6dfeb 100644
+index 0d7de6f4dec0..d4b9e7ed6dfe 100644
 --- a/drivers/gpu/drm/drm_modes.c
 +++ b/drivers/gpu/drm/drm_modes.c
 @@ -1592,6 +1592,7 @@ static int drm_mode_parse_cmdline_int(const char *delim, unsigned int *int_ret)
@@ -373831,7 +373846,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191118155134.30468-7-hdego
  1 file changed, 5 insertions(+), 4 deletions(-)
 
 diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c
-index d4b9e7ed6dfeb..7b9f067a88984 100644
+index d4b9e7ed6dfe..7b9f067a8898 100644
 --- a/drivers/gpu/drm/drm_modes.c
 +++ b/drivers/gpu/drm/drm_modes.c
 @@ -1778,10 +1778,8 @@ bool drm_mode_parse_command_line_for_connector(const char *mode_option,
@@ -373904,7 +373919,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191118155134.30468-8-hdego
  3 files changed, 86 insertions(+), 58 deletions(-)
 
 diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c
-index 7b9f067a88984..a6814155239c5 100644
+index 7b9f067a8898..a6814155239c 100644
 --- a/drivers/gpu/drm/drm_modes.c
 +++ b/drivers/gpu/drm/drm_modes.c
 @@ -1684,17 +1684,6 @@ static const char * const drm_named_modes_whitelist[] = {
@@ -374058,7 +374073,7 @@ index 7b9f067a88984..a6814155239c5 100644
  		if (ret)
  			return false;
 diff --git a/drivers/gpu/drm/selftests/drm_cmdline_selftests.h b/drivers/gpu/drm/selftests/drm_cmdline_selftests.h
-index 628d11d74d6b6..fb21f15570f24 100644
+index 628d11d74d6b..fb21f15570f2 100644
 --- a/drivers/gpu/drm/selftests/drm_cmdline_selftests.h
 +++ b/drivers/gpu/drm/selftests/drm_cmdline_selftests.h
 @@ -63,3 +63,5 @@ cmdline_test(drm_cmdline_test_multiple_options)
@@ -374068,7 +374083,7 @@ index 628d11d74d6b6..fb21f15570f24 100644
 +cmdline_test(drm_cmdline_test_freestanding_options)
 +cmdline_test(drm_cmdline_test_freestanding_force_e_and_options)
 diff --git a/drivers/gpu/drm/selftests/test-drm_cmdline_parser.c b/drivers/gpu/drm/selftests/test-drm_cmdline_parser.c
-index a1210b7bf937c..9835dd329cfc9 100644
+index a1210b7bf937..9835dd329cfc 100644
 --- a/drivers/gpu/drm/selftests/test-drm_cmdline_parser.c
 +++ b/drivers/gpu/drm/selftests/test-drm_cmdline_parser.c
 @@ -1053,6 +1053,56 @@ static int drm_cmdline_test_extra_and_option(void *ignored)
@@ -374168,7 +374183,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191118155134.30468-9-hdego
  5 files changed, 66 insertions(+)
 
 diff --git a/Documentation/fb/modedb.rst b/Documentation/fb/modedb.rst
-index 9c4e3fd39e6d2..624d08fd28562 100644
+index 9c4e3fd39e6d..624d08fd2856 100644
 --- a/Documentation/fb/modedb.rst
 +++ b/Documentation/fb/modedb.rst
 @@ -65,6 +65,9 @@ Valid options are::
@@ -374182,7 +374197,7 @@ index 9c4e3fd39e6d2..624d08fd28562 100644
  
  -----------------------------------------------------------------------------
 diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c
-index a6814155239c5..378a915b81dd3 100644
+index a6814155239c..378a915b81dd 100644
 --- a/drivers/gpu/drm/drm_modes.c
 +++ b/drivers/gpu/drm/drm_modes.c
 @@ -1591,6 +1591,33 @@ static int drm_mode_parse_cmdline_int(const char *delim, unsigned int *int_ret)
@@ -374239,7 +374254,7 @@ index a6814155239c5..378a915b81dd3 100644
  	if (!mode_option)
  		mode_option = fb_mode_option;
 diff --git a/drivers/gpu/drm/selftests/drm_cmdline_selftests.h b/drivers/gpu/drm/selftests/drm_cmdline_selftests.h
-index fb21f15570f24..29e367db6118b 100644
+index fb21f15570f2..29e367db6118 100644
 --- a/drivers/gpu/drm/selftests/drm_cmdline_selftests.h
 +++ b/drivers/gpu/drm/selftests/drm_cmdline_selftests.h
 @@ -65,3 +65,4 @@ cmdline_test(drm_cmdline_test_bpp_extra_and_option)
@@ -374248,7 +374263,7 @@ index fb21f15570f24..29e367db6118b 100644
  cmdline_test(drm_cmdline_test_freestanding_force_e_and_options)
 +cmdline_test(drm_cmdline_test_panel_orientation)
 diff --git a/drivers/gpu/drm/selftests/test-drm_cmdline_parser.c b/drivers/gpu/drm/selftests/test-drm_cmdline_parser.c
-index 9835dd329cfc9..d96cd890def6e 100644
+index 9835dd329cfc..d96cd890def6 100644
 --- a/drivers/gpu/drm/selftests/test-drm_cmdline_parser.c
 +++ b/drivers/gpu/drm/selftests/test-drm_cmdline_parser.c
 @@ -1103,6 +1103,28 @@ static int drm_cmdline_test_freestanding_force_e_and_options(void *ignored)
@@ -374281,7 +374296,7 @@ index 9835dd329cfc9..d96cd890def6e 100644
  
  static int __init test_drm_cmdline_init(void)
 diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h
-index 681cb590f9521..3fbcf7d3fcafe 100644
+index 681cb590f952..3fbcf7d3fcaf 100644
 --- a/include/drm/drm_connector.h
 +++ b/include/drm/drm_connector.h
 @@ -1065,6 +1065,14 @@ struct drm_cmdline_mode {
@@ -374328,7 +374343,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191118155134.30468-10-hdeg
  1 file changed, 5 deletions(-)
 
 diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c
-index 378a915b81dd3..99149616fce05 100644
+index 378a915b81dd..99149616fce0 100644
 --- a/drivers/gpu/drm/drm_modes.c
 +++ b/drivers/gpu/drm/drm_modes.c
 @@ -1754,11 +1754,6 @@ bool drm_mode_parse_command_line_for_connector(const char *mode_option,
@@ -374372,7 +374387,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191118155134.30468-11-hdeg
  1 file changed, 2 insertions(+), 3 deletions(-)
 
 diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c
-index 99149616fce05..afc0ee99b1389 100644
+index 99149616fce0..afc0ee99b138 100644
 --- a/drivers/gpu/drm/drm_modes.c
 +++ b/drivers/gpu/drm/drm_modes.c
 @@ -1752,12 +1752,11 @@ bool drm_mode_parse_command_line_for_connector(const char *mode_option,
@@ -374426,7 +374441,7 @@ Co-authored-by: James Hughes <james.hughes@raspberrypi.com>
  1 file changed, 28 insertions(+), 13 deletions(-)
 
 diff --git a/drivers/gpu/drm/v3d/v3d_drv.h b/drivers/gpu/drm/v3d/v3d_drv.h
-index 15bc4e28b6ccd..197dd4a8a7e1e 100644
+index 15bc4e28b6cc..197dd4a8a7e1 100644
 --- a/drivers/gpu/drm/v3d/v3d_drv.h
 +++ b/drivers/gpu/drm/v3d/v3d_drv.h
 @@ -260,27 +260,42 @@ struct v3d_csd_job {
@@ -374511,7 +374526,7 @@ Signed-off-by: Nick B <nick@pelagiris.org>
  1 file changed, 30 insertions(+), 5 deletions(-)
 
 diff --git a/arch/arm/boot/dts/overlays/rpi-poe-overlay.dts b/arch/arm/boot/dts/overlays/rpi-poe-overlay.dts
-index 21f8fe6f12295..544038b614e10 100644
+index 21f8fe6f1229..544038b614e1 100644
 --- a/arch/arm/boot/dts/overlays/rpi-poe-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/rpi-poe-overlay.dts
 @@ -14,9 +14,9 @@
@@ -374609,7 +374624,7 @@ Signed-off-by: Petr Štetiar <ynezz@true.cz>
  2 files changed, 18 insertions(+)
 
 diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
-index 62ad35f78bada..0d7d00ac92c4b 100644
+index 62ad35f78bad..0d7d00ac92c4 100644
 --- a/arch/arm/boot/dts/overlays/README
 +++ b/arch/arm/boot/dts/overlays/README
 @@ -1261,6 +1261,9 @@ Params: addr                    Set the address for the BME280, BME680, BMP280,
@@ -374623,7 +374638,7 @@ index 62ad35f78bada..0d7d00ac92c4b 100644
                                  Valid addresses 0x48-0x4b, default 0x48
  
 diff --git a/arch/arm/boot/dts/overlays/i2c-sensor-overlay.dts b/arch/arm/boot/dts/overlays/i2c-sensor-overlay.dts
-index 40881d72a1574..ce97837b0db50 100644
+index 40881d72a157..ce97837b0db5 100644
 --- a/arch/arm/boot/dts/overlays/i2c-sensor-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/i2c-sensor-overlay.dts
 @@ -231,6 +231,20 @@
@@ -374678,7 +374693,7 @@ Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
  3 files changed, 69 insertions(+)
 
 diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c
-index 2161cc497abd7..9123372e22601 100644
+index 3796450cfee9..67da7b2b0b85 100644
 --- a/drivers/media/v4l2-core/v4l2-ctrls.c
 +++ b/drivers/media/v4l2-core/v4l2-ctrls.c
 @@ -1673,6 +1673,7 @@ static int std_validate_compound(const struct v4l2_ctrl *ctrl, u32 idx,
@@ -374701,7 +374716,7 @@ index 2161cc497abd7..9123372e22601 100644
  	default:
  		return -EINVAL;
  	}
-@@ -2423,6 +2429,9 @@ static struct v4l2_ctrl *v4l2_ctrl_new(struct v4l2_ctrl_handler *hdl,
+@@ -2431,6 +2437,9 @@ static struct v4l2_ctrl *v4l2_ctrl_new(struct v4l2_ctrl_handler *hdl,
  	case V4L2_CTRL_TYPE_VP8_FRAME_HEADER:
  		elem_size = sizeof(struct v4l2_ctrl_vp8_frame_header);
  		break;
@@ -374711,7 +374726,7 @@ index 2161cc497abd7..9123372e22601 100644
  	default:
  		if (type < V4L2_CTRL_COMPOUND_TYPES)
  			elem_size = sizeof(s32);
-@@ -4087,6 +4096,18 @@ int __v4l2_ctrl_s_ctrl_string(struct v4l2_ctrl *ctrl, const char *s)
+@@ -4098,6 +4107,18 @@ int __v4l2_ctrl_s_ctrl_string(struct v4l2_ctrl *ctrl, const char *s)
  }
  EXPORT_SYMBOL(__v4l2_ctrl_s_ctrl_string);
  
@@ -374731,7 +374746,7 @@ index 2161cc497abd7..9123372e22601 100644
  				struct v4l2_ctrl_handler *main_hdl)
  {
 diff --git a/include/media/v4l2-ctrls.h b/include/media/v4l2-ctrls.h
-index 570ff4b0205a9..e7f93109e4a42 100644
+index 570ff4b0205a..e7f93109e4a4 100644
 --- a/include/media/v4l2-ctrls.h
 +++ b/include/media/v4l2-ctrls.h
 @@ -50,6 +50,7 @@ struct poll_table_struct;
@@ -374798,7 +374813,7 @@ index 570ff4b0205a9..e7f93109e4a42 100644
  extern const struct v4l2_subscribed_event_ops v4l2_ctrl_sub_ev_ops;
  
 diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
-index 456dfa847ccb1..0ffaad82040d6 100644
+index 456dfa847ccb..0ffaad82040d 100644
 --- a/include/uapi/linux/videodev2.h
 +++ b/include/uapi/linux/videodev2.h
 @@ -426,6 +426,11 @@ struct v4l2_fract {
@@ -374847,7 +374862,7 @@ Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
  2 files changed, 6 insertions(+)
 
 diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c
-index 9123372e22601..0bb2532c4f39b 100644
+index 67da7b2b0b85..86634cd3804e 100644
 --- a/drivers/media/v4l2-core/v4l2-ctrls.c
 +++ b/drivers/media/v4l2-core/v4l2-ctrls.c
 @@ -995,6 +995,7 @@ const char *v4l2_ctrl_get_name(u32 id)
@@ -374870,7 +374885,7 @@ index 9123372e22601..0bb2532c4f39b 100644
  		*type = V4L2_CTRL_TYPE_INTEGER;
  		break;
 diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-controls.h
-index 616a7c64c4d20..d21ac75456263 100644
+index 616a7c64c4d2..d21ac7545626 100644
 --- a/include/uapi/linux/v4l2-controls.h
 +++ b/include/uapi/linux/v4l2-controls.h
 @@ -1035,6 +1035,7 @@ enum v4l2_jpeg_chroma_subsampling {
@@ -374912,7 +374927,7 @@ Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
  2 files changed, 95 insertions(+), 64 deletions(-)
 
 diff --git a/drivers/media/v4l2-core/v4l2-common.c b/drivers/media/v4l2-core/v4l2-common.c
-index 62f7aa92ac29f..09a3915b98a33 100644
+index 62f7aa92ac29..09a3915b98a3 100644
 --- a/drivers/media/v4l2-core/v4l2-common.c
 +++ b/drivers/media/v4l2-core/v4l2-common.c
 @@ -236,77 +236,77 @@ const struct v4l2_format_info *v4l2_format_info(u32 format)
@@ -375057,7 +375072,7 @@ index 62f7aa92ac29f..09a3915b98a33 100644
  	unsigned int i;
  
 diff --git a/include/media/v4l2-common.h b/include/media/v4l2-common.h
-index c070d8ae11e5e..d8c29e0890009 100644
+index c070d8ae11e5..d8c29e089000 100644
 --- a/include/media/v4l2-common.h
 +++ b/include/media/v4l2-common.h
 @@ -456,9 +456,25 @@ int v4l2_s_parm_cap(struct video_device *vdev,
@@ -375140,7 +375155,7 @@ Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
  1 file changed, 2 insertions(+)
 
 diff --git a/drivers/media/v4l2-core/v4l2-common.c b/drivers/media/v4l2-core/v4l2-common.c
-index 09a3915b98a33..d0e5ebc736f9f 100644
+index 09a3915b98a3..d0e5ebc736f9 100644
 --- a/drivers/media/v4l2-core/v4l2-common.c
 +++ b/drivers/media/v4l2-core/v4l2-common.c
 @@ -251,6 +251,8 @@ const struct v4l2_format_info *v4l2_format_info(u32 format)
@@ -375183,7 +375198,7 @@ Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
  6 files changed, 45 insertions(+), 7 deletions(-)
 
 diff --git a/Documentation/media/uapi/v4l/buffer.rst b/Documentation/media/uapi/v4l/buffer.rst
-index 1cbd9cde57f37..9149b57728e54 100644
+index 1cbd9cde57f3..9149b57728e5 100644
 --- a/Documentation/media/uapi/v4l/buffer.rst
 +++ b/Documentation/media/uapi/v4l/buffer.rst
 @@ -607,6 +607,19 @@ Buffer Flags
@@ -375207,7 +375222,7 @@ index 1cbd9cde57f37..9149b57728e54 100644
  
        - ``V4L2_BUF_FLAG_LAST``
 diff --git a/Documentation/media/uapi/v4l/vidioc-reqbufs.rst b/Documentation/media/uapi/v4l/vidioc-reqbufs.rst
-index d7faef10e39ba..d0c643db477aa 100644
+index d7faef10e39b..d0c643db477a 100644
 --- a/Documentation/media/uapi/v4l/vidioc-reqbufs.rst
 +++ b/Documentation/media/uapi/v4l/vidioc-reqbufs.rst
 @@ -125,6 +125,7 @@ aborting or finishing any DMA in progress, an implicit
@@ -375231,7 +375246,7 @@ index d7faef10e39ba..d0c643db477aa 100644
  Return Value
  ============
 diff --git a/drivers/media/common/videobuf2/videobuf2-v4l2.c b/drivers/media/common/videobuf2/videobuf2-v4l2.c
-index 5a9ba3846f0a5..e652f43182840 100644
+index 5a9ba3846f0a..e652f4318284 100644
 --- a/drivers/media/common/videobuf2/videobuf2-v4l2.c
 +++ b/drivers/media/common/videobuf2/videobuf2-v4l2.c
 @@ -49,8 +49,11 @@ module_param(debug, int, 0644);
@@ -375275,7 +375290,7 @@ index 5a9ba3846f0a5..e652f43182840 100644
  	if (q->supports_requests)
  		*caps |= V4L2_BUF_CAP_SUPPORTS_REQUESTS;
 diff --git a/include/media/videobuf2-core.h b/include/media/videobuf2-core.h
-index d86d888247a15..b4034a1034c28 100644
+index d86d888247a1..b4034a1034c2 100644
 --- a/include/media/videobuf2-core.h
 +++ b/include/media/videobuf2-core.h
 @@ -505,6 +505,8 @@ struct vb2_buf_ops {
@@ -375296,7 +375311,7 @@ index d86d888247a15..b4034a1034c28 100644
  	u32				timestamp_flags;
  	gfp_t				gfp_flags;
 diff --git a/include/media/videobuf2-v4l2.h b/include/media/videobuf2-v4l2.h
-index 8a10889dc2fdf..59bf33a12648b 100644
+index 8a10889dc2fd..59bf33a12648 100644
 --- a/include/media/videobuf2-v4l2.h
 +++ b/include/media/videobuf2-v4l2.h
 @@ -33,6 +33,7 @@
@@ -375322,7 +375337,7 @@ index 8a10889dc2fdf..59bf33a12648b 100644
   * to_vb2_v4l2_buffer() - cast struct vb2_buffer * to struct vb2_v4l2_buffer *
   */
 diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
-index 0ffaad82040d6..a3fc685be5148 100644
+index 0ffaad82040d..a3fc685be514 100644
 --- a/include/uapi/linux/videodev2.h
 +++ b/include/uapi/linux/videodev2.h
 @@ -924,11 +924,12 @@ struct v4l2_requestbuffers {
@@ -375381,7 +375396,7 @@ Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
  2 files changed, 128 insertions(+), 35 deletions(-)
 
 diff --git a/drivers/media/v4l2-core/v4l2-mem2mem.c b/drivers/media/v4l2-core/v4l2-mem2mem.c
-index 3d6a6306cec77..001fee23e9c11 100644
+index 3d6a6306cec7..001fee23e9c1 100644
 --- a/drivers/media/v4l2-core/v4l2-mem2mem.c
 +++ b/drivers/media/v4l2-core/v4l2-mem2mem.c
 @@ -284,7 +284,8 @@ static void v4l2_m2m_try_run(struct v4l2_m2m_dev *m2m_dev)
@@ -375563,7 +375578,7 @@ index 3d6a6306cec77..001fee23e9c11 100644
  		     struct v4l2_requestbuffers *reqbufs)
  {
 diff --git a/include/media/v4l2-mem2mem.h b/include/media/v4l2-mem2mem.h
-index 0b9c3a287061e..229d9f5d43708 100644
+index 0b9c3a287061..229d9f5d4370 100644
 --- a/include/media/v4l2-mem2mem.h
 +++ b/include/media/v4l2-mem2mem.h
 @@ -21,7 +21,8 @@
@@ -375643,7 +375658,7 @@ Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
  3 files changed, 11 insertions(+), 1 deletion(-)
 
 diff --git a/Documentation/media/uapi/v4l/vidioc-decoder-cmd.rst b/Documentation/media/uapi/v4l/vidioc-decoder-cmd.rst
-index 57f0066f4cfff..f1a504836f31e 100644
+index 57f0066f4cff..f1a504836f31 100644
 --- a/Documentation/media/uapi/v4l/vidioc-decoder-cmd.rst
 +++ b/Documentation/media/uapi/v4l/vidioc-decoder-cmd.rst
 @@ -208,7 +208,15 @@ introduced in Linux 3.3. They are, however, mandatory for stateful mem2mem decod
@@ -375664,7 +375679,7 @@ index 57f0066f4cfff..f1a504836f31e 100644
  Return Value
  ============
 diff --git a/Documentation/media/videodev2.h.rst.exceptions b/Documentation/media/videodev2.h.rst.exceptions
-index adeb6b7a15cb3..a79028e4d9296 100644
+index adeb6b7a15cb..a79028e4d929 100644
 --- a/Documentation/media/videodev2.h.rst.exceptions
 +++ b/Documentation/media/videodev2.h.rst.exceptions
 @@ -434,6 +434,7 @@ replace define V4L2_DEC_CMD_START decoder-cmds
@@ -375676,7 +375691,7 @@ index adeb6b7a15cb3..a79028e4d9296 100644
  replace define V4L2_DEC_CMD_START_MUTE_AUDIO decoder-cmds
  replace define V4L2_DEC_CMD_PAUSE_TO_BLACK decoder-cmds
 diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
-index a3fc685be5148..05ed1aaf0e9e3 100644
+index a3fc685be514..05ed1aaf0e9e 100644
 --- a/include/uapi/linux/videodev2.h
 +++ b/include/uapi/linux/videodev2.h
 @@ -1988,6 +1988,7 @@ struct v4l2_encoder_cmd {
@@ -375713,7 +375728,7 @@ Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
  2 files changed, 57 insertions(+)
 
 diff --git a/drivers/media/v4l2-core/v4l2-mem2mem.c b/drivers/media/v4l2-core/v4l2-mem2mem.c
-index 001fee23e9c11..9f8b816d14a0c 100644
+index 001fee23e9c1..9f8b816d14a0 100644
 --- a/drivers/media/v4l2-core/v4l2-mem2mem.c
 +++ b/drivers/media/v4l2-core/v4l2-mem2mem.c
 @@ -1218,6 +1218,59 @@ int v4l2_m2m_ioctl_try_decoder_cmd(struct file *file, void *fh,
@@ -375777,7 +375792,7 @@ index 001fee23e9c11..9f8b816d14a0c 100644
   * v4l2_file_operations helpers. It is assumed here same lock is used
   * for the output and the capture buffer queue.
 diff --git a/include/media/v4l2-mem2mem.h b/include/media/v4l2-mem2mem.h
-index 229d9f5d43708..3d9e48ed88170 100644
+index 229d9f5d4370..3d9e48ed8817 100644
 --- a/include/media/v4l2-mem2mem.h
 +++ b/include/media/v4l2-mem2mem.h
 @@ -701,6 +701,10 @@ int v4l2_m2m_ioctl_try_encoder_cmd(struct file *file, void *fh,
@@ -375815,7 +375830,7 @@ Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
  2 files changed, 16 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/media/v4l2-core/v4l2-mem2mem.c b/drivers/media/v4l2-core/v4l2-mem2mem.c
-index 9f8b816d14a0c..5867d81f3d2c6 100644
+index 9f8b816d14a0..5867d81f3d2c 100644
 --- a/drivers/media/v4l2-core/v4l2-mem2mem.c
 +++ b/drivers/media/v4l2-core/v4l2-mem2mem.c
 @@ -319,8 +319,10 @@ static void __v4l2_m2m_try_queue(struct v4l2_m2m_dev *m2m_dev,
@@ -375844,7 +375859,7 @@ index 9f8b816d14a0c..5867d81f3d2c6 100644
  		&& (!m2m_dev->m2m_ops->job_ready(m2m_ctx->priv))) {
  		dprintk("Driver not ready\n");
 diff --git a/include/media/v4l2-mem2mem.h b/include/media/v4l2-mem2mem.h
-index 3d9e48ed88170..1d85e24791e42 100644
+index 3d9e48ed8817..1d85e24791e4 100644
 --- a/include/media/v4l2-mem2mem.h
 +++ b/include/media/v4l2-mem2mem.h
 @@ -75,6 +75,11 @@ struct v4l2_m2m_queue_ctx {
@@ -375894,7 +375909,7 @@ Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
  2 files changed, 7 insertions(+)
 
 diff --git a/Documentation/media/uapi/v4l/vidioc-queryctrl.rst b/Documentation/media/uapi/v4l/vidioc-queryctrl.rst
-index a3d56ffbf4cc4..33aff21b7d115 100644
+index a3d56ffbf4cc..33aff21b7d11 100644
 --- a/Documentation/media/uapi/v4l/vidioc-queryctrl.rst
 +++ b/Documentation/media/uapi/v4l/vidioc-queryctrl.rst
 @@ -443,6 +443,12 @@ See also the examples in :ref:`control`.
@@ -375911,7 +375926,7 @@ index a3d56ffbf4cc4..33aff21b7d115 100644
        - n/a
        - n/a
 diff --git a/Documentation/media/videodev2.h.rst.exceptions b/Documentation/media/videodev2.h.rst.exceptions
-index a79028e4d9296..c23e5ef30c78d 100644
+index a79028e4d929..c23e5ef30c78 100644
 --- a/Documentation/media/videodev2.h.rst.exceptions
 +++ b/Documentation/media/videodev2.h.rst.exceptions
 @@ -141,6 +141,7 @@ replace symbol V4L2_CTRL_TYPE_H264_PPS :c:type:`v4l2_ctrl_type`
@@ -375968,7 +375983,7 @@ Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
  create mode 100644 include/media/hevc-ctrls.h
 
 diff --git a/Documentation/media/uapi/v4l/biblio.rst b/Documentation/media/uapi/v4l/biblio.rst
-index ad2ff258afa89..8095f57d3d752 100644
+index ad2ff258afa8..8095f57d3d75 100644
 --- a/Documentation/media/uapi/v4l/biblio.rst
 +++ b/Documentation/media/uapi/v4l/biblio.rst
 @@ -131,6 +131,15 @@ ITU-T Rec. H.264 Specification (04/2017 Edition)
@@ -375988,7 +376003,7 @@ index ad2ff258afa89..8095f57d3d752 100644
  
  JFIF
 diff --git a/Documentation/media/uapi/v4l/ext-ctrls-codec.rst b/Documentation/media/uapi/v4l/ext-ctrls-codec.rst
-index bc5dd8e76567b..2d011241ff924 100644
+index bc5dd8e76567..2d011241ff92 100644
 --- a/Documentation/media/uapi/v4l/ext-ctrls-codec.rst
 +++ b/Documentation/media/uapi/v4l/ext-ctrls-codec.rst
 @@ -1983,9 +1983,9 @@ enum v4l2_mpeg_video_h264_hierarchical_coding_type -
@@ -376556,7 +376571,7 @@ index bc5dd8e76567b..2d011241ff924 100644
 +        to be prefixed by Annex B start codes. According to :ref:`hevc`
 +        valid start codes can be 3-bytes 0x000001 or 4-bytes 0x00000001.
 diff --git a/Documentation/media/uapi/v4l/vidioc-queryctrl.rst b/Documentation/media/uapi/v4l/vidioc-queryctrl.rst
-index 33aff21b7d115..6690928e657b7 100644
+index 33aff21b7d11..6690928e657b 100644
 --- a/Documentation/media/uapi/v4l/vidioc-queryctrl.rst
 +++ b/Documentation/media/uapi/v4l/vidioc-queryctrl.rst
 @@ -479,6 +479,24 @@ See also the examples in :ref:`control`.
@@ -376585,7 +376600,7 @@ index 33aff21b7d115..6690928e657b7 100644
  .. tabularcolumns:: |p{6.6cm}|p{2.2cm}|p{8.7cm}|
  
 diff --git a/Documentation/media/videodev2.h.rst.exceptions b/Documentation/media/videodev2.h.rst.exceptions
-index c23e5ef30c78d..cb6ccf91776e6 100644
+index c23e5ef30c78..cb6ccf91776e 100644
 --- a/Documentation/media/videodev2.h.rst.exceptions
 +++ b/Documentation/media/videodev2.h.rst.exceptions
 @@ -141,6 +141,9 @@ replace symbol V4L2_CTRL_TYPE_H264_PPS :c:type:`v4l2_ctrl_type`
@@ -376599,7 +376614,7 @@ index c23e5ef30c78d..cb6ccf91776e6 100644
  
  # V4L2 capability defines
 diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c
-index 0bb2532c4f39b..d34a95d41afbf 100644
+index 86634cd3804e..4824d7482315 100644
 --- a/drivers/media/v4l2-core/v4l2-ctrls.c
 +++ b/drivers/media/v4l2-core/v4l2-ctrls.c
 @@ -567,6 +567,16 @@ const char * const *v4l2_ctrl_get_menu(u32 id)
@@ -376758,7 +376773,7 @@ index 0bb2532c4f39b..d34a95d41afbf 100644
  	default:
  		return -EINVAL;
  	}
-@@ -2434,6 +2532,15 @@ static struct v4l2_ctrl *v4l2_ctrl_new(struct v4l2_ctrl_handler *hdl,
+@@ -2442,6 +2540,15 @@ static struct v4l2_ctrl *v4l2_ctrl_new(struct v4l2_ctrl_handler *hdl,
  	case V4L2_CTRL_TYPE_VP8_FRAME_HEADER:
  		elem_size = sizeof(struct v4l2_ctrl_vp8_frame_header);
  		break;
@@ -376775,7 +376790,7 @@ index 0bb2532c4f39b..d34a95d41afbf 100644
  		elem_size = sizeof(struct v4l2_area);
  		break;
 diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
-index 24db33f803c06..4f4fcbe09fbd8 100644
+index 24db33f803c0..4f4fcbe09fbd 100644
 --- a/drivers/media/v4l2-core/v4l2-ioctl.c
 +++ b/drivers/media/v4l2-core/v4l2-ioctl.c
 @@ -1356,6 +1356,7 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt)
@@ -376788,7 +376803,7 @@ index 24db33f803c06..4f4fcbe09fbd8 100644
  		case V4L2_PIX_FMT_CPIA1:	descr = "GSPCA CPiA YUV"; break;
 diff --git a/include/media/hevc-ctrls.h b/include/media/hevc-ctrls.h
 new file mode 100644
-index 0000000000000..1009cf0891cc6
+index 000000000000..1009cf0891cc
 --- /dev/null
 +++ b/include/media/hevc-ctrls.h
 @@ -0,0 +1,212 @@
@@ -377005,7 +377020,7 @@ index 0000000000000..1009cf0891cc6
 +
 +#endif
 diff --git a/include/media/v4l2-ctrls.h b/include/media/v4l2-ctrls.h
-index e7f93109e4a42..65575e9b5a2b1 100644
+index e7f93109e4a4..65575e9b5a2b 100644
 --- a/include/media/v4l2-ctrls.h
 +++ b/include/media/v4l2-ctrls.h
 @@ -21,6 +21,7 @@
@@ -377058,7 +377073,7 @@ Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/media/v4l2-core/v4l2-mem2mem.c b/drivers/media/v4l2-core/v4l2-mem2mem.c
-index 5867d81f3d2c6..cc34c5ab70099 100644
+index 5867d81f3d2c..cc34c5ab7009 100644
 --- a/drivers/media/v4l2-core/v4l2-mem2mem.c
 +++ b/drivers/media/v4l2-core/v4l2-mem2mem.c
 @@ -335,7 +335,7 @@ static void __v4l2_m2m_try_queue(struct v4l2_m2m_dev *m2m_dev,
@@ -377102,7 +377117,7 @@ Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
  1 file changed, 23 insertions(+)
 
 diff --git a/Documentation/media/uapi/v4l/pixfmt-compressed.rst b/Documentation/media/uapi/v4l/pixfmt-compressed.rst
-index 292fdc116c777..7e9b2b939e594 100644
+index 292fdc116c77..7e9b2b939e59 100644
 --- a/Documentation/media/uapi/v4l/pixfmt-compressed.rst
 +++ b/Documentation/media/uapi/v4l/pixfmt-compressed.rst
 @@ -188,6 +188,29 @@ Compressed Formats
@@ -377158,7 +377173,7 @@ Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
  4 files changed, 63 insertions(+)
 
 diff --git a/Documentation/media/uapi/v4l/ext-ctrls-codec.rst b/Documentation/media/uapi/v4l/ext-ctrls-codec.rst
-index 2d011241ff924..e3d735f75e65d 100644
+index 2d011241ff92..e3d735f75e65 100644
 --- a/Documentation/media/uapi/v4l/ext-ctrls-codec.rst
 +++ b/Documentation/media/uapi/v4l/ext-ctrls-codec.rst
 @@ -4174,6 +4174,47 @@ enum v4l2_mpeg_video_hevc_size_of_length_field -
@@ -377210,7 +377225,7 @@ index 2d011241ff924..e3d735f75e65d 100644
      Specifies the decoding mode to use. Currently exposes slice-based and
      frame-based decoding but new modes might be added later on.
 diff --git a/Documentation/media/uapi/v4l/pixfmt-compressed.rst b/Documentation/media/uapi/v4l/pixfmt-compressed.rst
-index 7e9b2b939e594..2069e5fc2b995 100644
+index 7e9b2b939e59..2069e5fc2b99 100644
 --- a/Documentation/media/uapi/v4l/pixfmt-compressed.rst
 +++ b/Documentation/media/uapi/v4l/pixfmt-compressed.rst
 @@ -203,6 +203,7 @@ Compressed Formats
@@ -377222,7 +377237,7 @@ index 7e9b2b939e594..2069e5fc2b995 100644
  	Buffers associated with this pixel format must contain the appropriate
  	number of macroblocks to decode a full corresponding frame.
 diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c
-index d34a95d41afbf..b733ada15e551 100644
+index 4824d7482315..412e972a17cd 100644
 --- a/drivers/media/v4l2-core/v4l2-ctrls.c
 +++ b/drivers/media/v4l2-core/v4l2-ctrls.c
 @@ -974,6 +974,7 @@ const char *v4l2_ctrl_get_name(u32 id)
@@ -377253,7 +377268,7 @@ index d34a95d41afbf..b733ada15e551 100644
  	case V4L2_CTRL_TYPE_AREA:
  		area = p;
  		if (!area->width || !area->height)
-@@ -2541,6 +2548,9 @@ static struct v4l2_ctrl *v4l2_ctrl_new(struct v4l2_ctrl_handler *hdl,
+@@ -2549,6 +2556,9 @@ static struct v4l2_ctrl *v4l2_ctrl_new(struct v4l2_ctrl_handler *hdl,
  	case V4L2_CTRL_TYPE_HEVC_SLICE_PARAMS:
  		elem_size = sizeof(struct v4l2_ctrl_hevc_slice_params);
  		break;
@@ -377264,7 +377279,7 @@ index d34a95d41afbf..b733ada15e551 100644
  		elem_size = sizeof(struct v4l2_area);
  		break;
 diff --git a/include/media/hevc-ctrls.h b/include/media/hevc-ctrls.h
-index 1009cf0891cc6..1592e52c36144 100644
+index 1009cf0891cc..1592e52c3614 100644
 --- a/include/media/hevc-ctrls.h
 +++ b/include/media/hevc-ctrls.h
 @@ -19,6 +19,7 @@
@@ -377321,7 +377336,7 @@ Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
  2 files changed, 8 insertions(+), 2 deletions(-)
 
 diff --git a/Documentation/media/uapi/v4l/ext-ctrls-codec.rst b/Documentation/media/uapi/v4l/ext-ctrls-codec.rst
-index e3d735f75e65d..86d185bcb4512 100644
+index e3d735f75e65..86d185bcb451 100644
 --- a/Documentation/media/uapi/v4l/ext-ctrls-codec.rst
 +++ b/Documentation/media/uapi/v4l/ext-ctrls-codec.rst
 @@ -3969,6 +3969,9 @@ enum v4l2_mpeg_video_hevc_size_of_length_field -
@@ -377344,7 +377359,7 @@ index e3d735f75e65d..86d185bcb4512 100644
      * - struct :c:type:`v4l2_hevc_dpb_entry`
        - ``dpb[V4L2_HEVC_DPB_ENTRIES_NUM_MAX]``
 diff --git a/include/media/hevc-ctrls.h b/include/media/hevc-ctrls.h
-index 1592e52c36144..3e2e320983128 100644
+index 1592e52c3614..3e2e32098312 100644
 --- a/include/media/hevc-ctrls.h
 +++ b/include/media/hevc-ctrls.h
 @@ -167,6 +167,9 @@ struct v4l2_ctrl_hevc_slice_params {
@@ -377384,7 +377399,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 1 insertion(+)
 
 diff --git a/include/media/hevc-ctrls.h b/include/media/hevc-ctrls.h
-index 3e2e320983128..0ba7735465a24 100644
+index 3e2e32098312..0ba7735465a2 100644
 --- a/include/media/hevc-ctrls.h
 +++ b/include/media/hevc-ctrls.h
 @@ -162,6 +162,7 @@ struct v4l2_hevc_pred_weight_table {
@@ -377419,7 +377434,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/include/media/hevc-ctrls.h b/include/media/hevc-ctrls.h
-index 0ba7735465a24..9c976b3cf0924 100644
+index 0ba7735465a2..9c976b3cf092 100644
 --- a/include/media/hevc-ctrls.h
 +++ b/include/media/hevc-ctrls.h
 @@ -170,6 +170,7 @@ struct v4l2_ctrl_hevc_slice_params {
@@ -377467,7 +377482,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
 
 diff --git a/Documentation/media/uapi/v4l/pixfmt-nv12-col128.rst b/Documentation/media/uapi/v4l/pixfmt-nv12-col128.rst
 new file mode 100644
-index 0000000000000..196ca33a5dff8
+index 000000000000..196ca33a5dff
 --- /dev/null
 +++ b/Documentation/media/uapi/v4l/pixfmt-nv12-col128.rst
 @@ -0,0 +1,215 @@
@@ -377687,7 +377702,7 @@ index 0000000000000..196ca33a5dff8
 +
 +
 diff --git a/Documentation/media/uapi/v4l/pixfmt-nv12.rst b/Documentation/media/uapi/v4l/pixfmt-nv12.rst
-index b8c021b07fd2b..931680e9be443 100644
+index b8c021b07fd2..931680e9be44 100644
 --- a/Documentation/media/uapi/v4l/pixfmt-nv12.rst
 +++ b/Documentation/media/uapi/v4l/pixfmt-nv12.rst
 @@ -10,9 +10,9 @@
@@ -377719,7 +377734,7 @@ index b8c021b07fd2b..931680e9be443 100644
  Each cell is one byte.
  
 diff --git a/Documentation/media/uapi/v4l/yuv-formats.rst b/Documentation/media/uapi/v4l/yuv-formats.rst
-index 867470e5f9e12..962f5c367ebcd 100644
+index 867470e5f9e1..962f5c367ebc 100644
 --- a/Documentation/media/uapi/v4l/yuv-formats.rst
 +++ b/Documentation/media/uapi/v4l/yuv-formats.rst
 @@ -57,6 +57,7 @@ to brightness information.
@@ -377731,7 +377746,7 @@ index 867470e5f9e12..962f5c367ebcd 100644
      pixfmt-nv16m
      pixfmt-nv24
 diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
-index 4f4fcbe09fbd8..1e37b3591b898 100644
+index 4f4fcbe09fbd..1e37b3591b89 100644
 --- a/drivers/media/v4l2-core/v4l2-ioctl.c
 +++ b/drivers/media/v4l2-core/v4l2-ioctl.c
 @@ -1258,6 +1258,8 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt)
@@ -377744,7 +377759,7 @@ index 4f4fcbe09fbd8..1e37b3591b898 100644
  	case V4L2_PIX_FMT_YVU420M:	descr = "Planar YVU 4:2:0 (N-C)"; break;
  	case V4L2_PIX_FMT_YUV422M:	descr = "Planar YUV 4:2:2 (N-C)"; break;
 diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
-index 05ed1aaf0e9e3..5d28d8ef6c0cc 100644
+index 05ed1aaf0e9e..5d28d8ef6c0c 100644
 --- a/include/uapi/linux/videodev2.h
 +++ b/include/uapi/linux/videodev2.h
 @@ -736,6 +736,10 @@ struct v4l2_pix_format {
@@ -377781,7 +377796,7 @@ Signed-off-by: John Cox <jc@kynesim.co.uk>
  3 files changed, 149 insertions(+), 6 deletions(-)
 
 diff --git a/drivers/media/v4l2-core/v4l2-mem2mem.c b/drivers/media/v4l2-core/v4l2-mem2mem.c
-index cc34c5ab70099..73d10948d2fee 100644
+index cc34c5ab7009..73d10948d2fe 100644
 --- a/drivers/media/v4l2-core/v4l2-mem2mem.c
 +++ b/drivers/media/v4l2-core/v4l2-mem2mem.c
 @@ -399,15 +399,18 @@ static void v4l2_m2m_cancel_job(struct v4l2_m2m_ctx *m2m_ctx)
@@ -377950,7 +377965,7 @@ index cc34c5ab70099..73d10948d2fee 100644
  	spin_lock_init(&cap_q_ctx->rdy_spinlock);
  
 diff --git a/include/media/v4l2-mem2mem.h b/include/media/v4l2-mem2mem.h
-index 1d85e24791e42..f72ac9a27093f 100644
+index 1d85e24791e4..f72ac9a27093 100644
 --- a/include/media/v4l2-mem2mem.h
 +++ b/include/media/v4l2-mem2mem.h
 @@ -88,6 +88,9 @@ struct v4l2_m2m_queue_ctx {
@@ -378022,7 +378037,7 @@ index 1d85e24791e42..f72ac9a27093f 100644
   * v4l2_m2m_reqbufs() - multi-queue-aware REQBUFS multiplexer
   *
 diff --git a/include/media/videobuf2-v4l2.h b/include/media/videobuf2-v4l2.h
-index 59bf33a12648b..b5b5fad97de72 100644
+index 59bf33a12648..b5b5fad97de7 100644
 --- a/include/media/videobuf2-v4l2.h
 +++ b/include/media/videobuf2-v4l2.h
 @@ -35,6 +35,8 @@
@@ -378063,7 +378078,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
 
 diff --git a/Documentation/devicetree/bindings/media/rpivid_hevc.yaml b/Documentation/devicetree/bindings/media/rpivid_hevc.yaml
 new file mode 100644
-index 0000000000000..ce6b81a103030
+index 000000000000..ce6b81a10303
 --- /dev/null
 +++ b/Documentation/devicetree/bindings/media/rpivid_hevc.yaml
 @@ -0,0 +1,72 @@
@@ -378140,7 +378155,7 @@ index 0000000000000..ce6b81a103030
 +
 +...
 diff --git a/MAINTAINERS b/MAINTAINERS
-index d99bdf9347058..9a76a6de3e984 100644
+index d99bdf934705..9a76a6de3e98 100644
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
 @@ -3198,6 +3198,13 @@ N:	bcm2711
@@ -378199,7 +378214,7 @@ Signed-off-by: John Cox <jc@kynesim.co.uk>
  create mode 100644 drivers/staging/media/rpivid/rpivid_video.h
 
 diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig
-index 5fe23a0bf27fe..e4ea63553dc06 100644
+index 5fe23a0bf27f..e4ea63553dc0 100644
 --- a/arch/arm/configs/bcm2711_defconfig
 +++ b/arch/arm/configs/bcm2711_defconfig
 @@ -731,6 +731,7 @@ CONFIG_MEDIA_CAMERA_SUPPORT=y
@@ -378219,7 +378234,7 @@ index 5fe23a0bf27fe..e4ea63553dc06 100644
  CONFIG_FB_TFT_AGM1264K_FL=m
  CONFIG_FB_TFT_BD663474=m
 diff --git a/drivers/staging/media/Kconfig b/drivers/staging/media/Kconfig
-index 642adc4c24d2d..4aafb150ecb20 100644
+index 642adc4c24d2..4aafb150ecb2 100644
 --- a/drivers/staging/media/Kconfig
 +++ b/drivers/staging/media/Kconfig
 @@ -30,6 +30,8 @@ source "drivers/staging/media/meson/vdec/Kconfig"
@@ -378232,7 +378247,7 @@ index 642adc4c24d2d..4aafb150ecb20 100644
  
  source "drivers/staging/media/tegra-vde/Kconfig"
 diff --git a/drivers/staging/media/Makefile b/drivers/staging/media/Makefile
-index 2f1711a8aeed2..dad2d30a508a8 100644
+index 2f1711a8aeed..dad2d30a508a 100644
 --- a/drivers/staging/media/Makefile
 +++ b/drivers/staging/media/Makefile
 @@ -3,6 +3,7 @@ obj-$(CONFIG_VIDEO_ALLEGRO_DVT)	+= allegro-dvt/
@@ -378245,7 +378260,7 @@ index 2f1711a8aeed2..dad2d30a508a8 100644
  obj-$(CONFIG_VIDEO_HANTRO)	+= hantro/
 diff --git a/drivers/staging/media/rpivid/Kconfig b/drivers/staging/media/rpivid/Kconfig
 new file mode 100644
-index 0000000000000..58b470c80db11
+index 000000000000..58b470c80db1
 --- /dev/null
 +++ b/drivers/staging/media/rpivid/Kconfig
 @@ -0,0 +1,16 @@
@@ -378267,7 +378282,7 @@ index 0000000000000..58b470c80db11
 +
 diff --git a/drivers/staging/media/rpivid/Makefile b/drivers/staging/media/rpivid/Makefile
 new file mode 100644
-index 0000000000000..990257052b072
+index 000000000000..990257052b07
 --- /dev/null
 +++ b/drivers/staging/media/rpivid/Makefile
 @@ -0,0 +1,5 @@
@@ -378278,7 +378293,7 @@ index 0000000000000..990257052b072
 +		 rpivid_hw.o rpivid_h265.o
 diff --git a/drivers/staging/media/rpivid/rpivid.c b/drivers/staging/media/rpivid/rpivid.c
 new file mode 100644
-index 0000000000000..6bbc732ca4eb5
+index 000000000000..6bbc732ca4eb
 --- /dev/null
 +++ b/drivers/staging/media/rpivid/rpivid.c
 @@ -0,0 +1,432 @@
@@ -378716,7 +378731,7 @@ index 0000000000000..6bbc732ca4eb5
 +MODULE_DESCRIPTION("Raspberry Pi HEVC V4L2 driver");
 diff --git a/drivers/staging/media/rpivid/rpivid.h b/drivers/staging/media/rpivid/rpivid.h
 new file mode 100644
-index 0000000000000..faafe936b8787
+index 000000000000..faafe936b878
 --- /dev/null
 +++ b/drivers/staging/media/rpivid/rpivid.h
 @@ -0,0 +1,181 @@
@@ -378903,7 +378918,7 @@ index 0000000000000..faafe936b8787
 +#endif
 diff --git a/drivers/staging/media/rpivid/rpivid_dec.c b/drivers/staging/media/rpivid/rpivid_dec.c
 new file mode 100644
-index 0000000000000..d81aa46de017a
+index 000000000000..d81aa46de017
 --- /dev/null
 +++ b/drivers/staging/media/rpivid/rpivid_dec.c
 @@ -0,0 +1,79 @@
@@ -378988,7 +379003,7 @@ index 0000000000000..d81aa46de017a
 +}
 diff --git a/drivers/staging/media/rpivid/rpivid_dec.h b/drivers/staging/media/rpivid/rpivid_dec.h
 new file mode 100644
-index 0000000000000..8f15bb6406abc
+index 000000000000..8f15bb6406ab
 --- /dev/null
 +++ b/drivers/staging/media/rpivid/rpivid_dec.h
 @@ -0,0 +1,19 @@
@@ -379013,7 +379028,7 @@ index 0000000000000..8f15bb6406abc
 +#endif
 diff --git a/drivers/staging/media/rpivid/rpivid_h265.c b/drivers/staging/media/rpivid/rpivid_h265.c
 new file mode 100644
-index 0000000000000..47d4de42c5844
+index 000000000000..47d4de42c584
 --- /dev/null
 +++ b/drivers/staging/media/rpivid/rpivid_h265.c
 @@ -0,0 +1,2275 @@
@@ -381294,7 +381309,7 @@ index 0000000000000..47d4de42c5844
 +};
 diff --git a/drivers/staging/media/rpivid/rpivid_hw.c b/drivers/staging/media/rpivid/rpivid_hw.c
 new file mode 100644
-index 0000000000000..5f86bbed8c1c1
+index 000000000000..5f86bbed8c1c
 --- /dev/null
 +++ b/drivers/staging/media/rpivid/rpivid_hw.c
 @@ -0,0 +1,321 @@
@@ -381621,7 +381636,7 @@ index 0000000000000..5f86bbed8c1c1
 +
 diff --git a/drivers/staging/media/rpivid/rpivid_hw.h b/drivers/staging/media/rpivid/rpivid_hw.h
 new file mode 100644
-index 0000000000000..cf4cc8be8a552
+index 000000000000..cf4cc8be8a55
 --- /dev/null
 +++ b/drivers/staging/media/rpivid/rpivid_hw.h
 @@ -0,0 +1,300 @@
@@ -381927,7 +381942,7 @@ index 0000000000000..cf4cc8be8a552
 +#endif
 diff --git a/drivers/staging/media/rpivid/rpivid_video.c b/drivers/staging/media/rpivid/rpivid_video.c
 new file mode 100644
-index 0000000000000..3b9e51ca05b3f
+index 000000000000..3b9e51ca05b3
 --- /dev/null
 +++ b/drivers/staging/media/rpivid/rpivid_video.c
 @@ -0,0 +1,593 @@
@@ -382526,7 +382541,7 @@ index 0000000000000..3b9e51ca05b3f
 +}
 diff --git a/drivers/staging/media/rpivid/rpivid_video.h b/drivers/staging/media/rpivid/rpivid_video.h
 new file mode 100644
-index 0000000000000..9c4f3fb2f9f6b
+index 000000000000..9c4f3fb2f9f6
 --- /dev/null
 +++ b/drivers/staging/media/rpivid/rpivid_video.h
 @@ -0,0 +1,30 @@
@@ -382584,7 +382599,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  create mode 100644 arch/arm/boot/dts/overlays/rpivid-v4l2-overlay.dts
 
 diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile
-index 85d8249a2f201..9e5e3ff0bf616 100644
+index 85d8249a2f20..9e5e3ff0bf61 100644
 --- a/arch/arm/boot/dts/overlays/Makefile
 +++ b/arch/arm/boot/dts/overlays/Makefile
 @@ -140,6 +140,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
@@ -382596,7 +382611,7 @@ index 85d8249a2f201..9e5e3ff0bf616 100644
  	sc16is750-i2c.dtbo \
  	sc16is752-i2c.dtbo \
 diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
-index 0d7d00ac92c4b..4f7790755fd82 100644
+index 0d7d00ac92c4..4f7790755fd8 100644
 --- a/arch/arm/boot/dts/overlays/README
 +++ b/arch/arm/boot/dts/overlays/README
 @@ -2064,6 +2064,13 @@ Load:   dtoverlay=rpi-tv
@@ -382615,7 +382630,7 @@ index 0d7d00ac92c4b..4f7790755fd82 100644
  Load:   dtoverlay=rra-digidac1-wm8741-audio
 diff --git a/arch/arm/boot/dts/overlays/rpivid-v4l2-overlay.dts b/arch/arm/boot/dts/overlays/rpivid-v4l2-overlay.dts
 new file mode 100644
-index 0000000000000..e6ece0570e90d
+index 000000000000..e6ece0570e90
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/rpivid-v4l2-overlay.dts
 @@ -0,0 +1,55 @@
@@ -382675,7 +382690,7 @@ index 0000000000000..e6ece0570e90d
 +	};
 +};
 diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig
-index e4ea63553dc06..5fe23a0bf27fe 100644
+index e4ea63553dc0..5fe23a0bf27f 100644
 --- a/arch/arm/configs/bcm2711_defconfig
 +++ b/arch/arm/configs/bcm2711_defconfig
 @@ -731,7 +731,6 @@ CONFIG_MEDIA_CAMERA_SUPPORT=y
@@ -382712,7 +382727,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 2 insertions(+)
 
 diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig
-index 5fe23a0bf27fe..e4ea63553dc06 100644
+index 5fe23a0bf27f..e4ea63553dc0 100644
 --- a/arch/arm/configs/bcm2711_defconfig
 +++ b/arch/arm/configs/bcm2711_defconfig
 @@ -731,6 +731,7 @@ CONFIG_MEDIA_CAMERA_SUPPORT=y
@@ -382749,7 +382764,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
-index a1aeb2e105641..86586f08a853e 100644
+index 92709232529a..e6061a879eac 100644
 --- a/drivers/mmc/host/sdhci.c
 +++ b/drivers/mmc/host/sdhci.c
 @@ -39,7 +39,7 @@
@@ -382761,7 +382776,7 @@ index a1aeb2e105641..86586f08a853e 100644
  
  #define MAX_TUNING_LOOP 40
  
-@@ -2756,7 +2756,7 @@ static void sdhci_timeout_timer(struct timer_list *t)
+@@ -2758,7 +2758,7 @@ static void sdhci_timeout_timer(struct timer_list *t)
  	spin_lock_irqsave(&host->lock, flags);
  
  	if (host->cmd && !sdhci_data_line_cmd(host->cmd)) {
@@ -382770,7 +382785,7 @@ index a1aeb2e105641..86586f08a853e 100644
  		       mmc_hostname(host->mmc));
  		sdhci_dumpregs(host);
  
-@@ -2778,7 +2778,7 @@ static void sdhci_timeout_data_timer(struct timer_list *t)
+@@ -2780,7 +2780,7 @@ static void sdhci_timeout_data_timer(struct timer_list *t)
  
  	if (host->data || host->data_cmd ||
  	    (host->cmd && sdhci_data_line_cmd(host->cmd))) {
@@ -382794,7 +382809,7 @@ This reverts commit 229fbb896ca6e0a40272cc846e41eeb0c29a551f.
  1 file changed, 1 insertion(+), 3 deletions(-)
 
 diff --git a/drivers/gpu/drm/v3d/v3d_drv.c b/drivers/gpu/drm/v3d/v3d_drv.c
-index 87ce683f3c04d..91b0769b69efe 100644
+index 87ce683f3c04..91b0769b69ef 100644
 --- a/drivers/gpu/drm/v3d/v3d_drv.c
 +++ b/drivers/gpu/drm/v3d/v3d_drv.c
 @@ -285,9 +285,7 @@ static int v3d_platform_drm_probe(struct platform_device *pdev)
@@ -382823,7 +382838,7 @@ This reverts commit 54354f31352ca1e058b029abd384819435c9ef47.
  1 file changed, 89 insertions(+), 412 deletions(-)
 
 diff --git a/drivers/clk/bcm/clk-raspberrypi.c b/drivers/clk/bcm/clk-raspberrypi.c
-index 8daf26df54308..e4e1392403406 100644
+index 8daf26df5430..e4e139240340 100644
 --- a/drivers/clk/bcm/clk-raspberrypi.c
 +++ b/drivers/clk/bcm/clk-raspberrypi.c
 @@ -15,103 +15,33 @@
@@ -383477,7 +383492,7 @@ This reverts commit 60dc4841efc8fe97b710b49d37d50bd719e8ca07.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/clk/bcm/clk-raspberrypi.c b/drivers/clk/bcm/clk-raspberrypi.c
-index e4e1392403406..1654fd0eedc94 100644
+index e4e139240340..1654fd0eedc9 100644
 --- a/drivers/clk/bcm/clk-raspberrypi.c
 +++ b/drivers/clk/bcm/clk-raspberrypi.c
 @@ -70,7 +70,7 @@ static int raspberrypi_clock_property(struct rpi_firmware *firmware, u32 tag,
@@ -383519,7 +383534,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
 
 diff --git a/Documentation/devicetree/bindings/i2c/brcm,brcmstb-i2c.yaml b/Documentation/devicetree/bindings/i2c/brcm,brcmstb-i2c.yaml
 new file mode 100644
-index 0000000000000..3189d74096e89
+index 000000000000..3189d74096e8
 --- /dev/null
 +++ b/Documentation/devicetree/bindings/i2c/brcm,brcmstb-i2c.yaml
 @@ -0,0 +1,59 @@
@@ -383584,7 +383599,7 @@ index 0000000000000..3189d74096e89
 +...
 diff --git a/Documentation/devicetree/bindings/i2c/i2c-brcmstb.txt b/Documentation/devicetree/bindings/i2c/i2c-brcmstb.txt
 deleted file mode 100644
-index 0380609b177a4..0000000000000
+index 0380609b177a..000000000000
 --- a/Documentation/devicetree/bindings/i2c/i2c-brcmstb.txt
 +++ /dev/null
 @@ -1,26 +0,0 @@
@@ -383615,7 +383630,7 @@ index 0380609b177a4..0000000000000
 -};
 -
 diff --git a/MAINTAINERS b/MAINTAINERS
-index 9a76a6de3e984..faa83d7e339fe 100644
+index 9a76a6de3e98..faa83d7e339f 100644
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
 @@ -3349,7 +3349,7 @@ L:	linux-i2c@vger.kernel.org
@@ -383663,7 +383678,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  1 file changed, 39 insertions(+), 1 deletion(-)
 
 diff --git a/Documentation/devicetree/bindings/i2c/brcm,brcmstb-i2c.yaml b/Documentation/devicetree/bindings/i2c/brcm,brcmstb-i2c.yaml
-index 3189d74096e89..edbca24761283 100644
+index 3189d74096e8..edbca2476128 100644
 --- a/Documentation/devicetree/bindings/i2c/brcm,brcmstb-i2c.yaml
 +++ b/Documentation/devicetree/bindings/i2c/brcm,brcmstb-i2c.yaml
 @@ -15,11 +15,21 @@ allOf:
@@ -383765,7 +383780,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  1 file changed, 33 insertions(+)
 
 diff --git a/drivers/i2c/busses/i2c-brcmstb.c b/drivers/i2c/busses/i2c-brcmstb.c
-index 5e89cd6b690ce..d2cde8e2a3703 100644
+index 5e89cd6b690c..d2cde8e2a370 100644
 --- a/drivers/i2c/busses/i2c-brcmstb.c
 +++ b/drivers/i2c/busses/i2c-brcmstb.c
 @@ -580,6 +580,31 @@ static void brcmstb_i2c_set_bsc_reg_defaults(struct brcmstb_i2c_dev *dev)
@@ -383845,7 +383860,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
-index 539f9309f6e67..f82da9d5c0f99 100644
+index 539f9309f6e6..f82da9d5c0f9 100644
 --- a/drivers/i2c/busses/Kconfig
 +++ b/drivers/i2c/busses/Kconfig
 @@ -491,8 +491,8 @@ config I2C_BCM_KONA
@@ -383886,7 +383901,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
 
 diff --git a/Documentation/devicetree/bindings/clock/raspberrypi,firmware-clocks.yaml b/Documentation/devicetree/bindings/clock/raspberrypi,firmware-clocks.yaml
 new file mode 100644
-index 0000000000000..d37bc311321de
+index 000000000000..d37bc311321d
 --- /dev/null
 +++ b/Documentation/devicetree/bindings/clock/raspberrypi,firmware-clocks.yaml
 @@ -0,0 +1,39 @@
@@ -383958,7 +383973,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  1 file changed, 8 insertions(+), 3 deletions(-)
 
 diff --git a/drivers/clk/bcm/clk-raspberrypi.c b/drivers/clk/bcm/clk-raspberrypi.c
-index 1654fd0eedc94..94870234824cd 100644
+index 1654fd0eedc9..94870234824c 100644
 --- a/drivers/clk/bcm/clk-raspberrypi.c
 +++ b/drivers/clk/bcm/clk-raspberrypi.c
 @@ -255,15 +255,13 @@ static int raspberrypi_clk_probe(struct platform_device *pdev)
@@ -384017,7 +384032,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  1 file changed, 1 insertion(+), 2 deletions(-)
 
 diff --git a/drivers/clk/bcm/clk-raspberrypi.c b/drivers/clk/bcm/clk-raspberrypi.c
-index 94870234824cd..64fd91b5ffe9d 100644
+index 94870234824c..64fd91b5ffe9 100644
 --- a/drivers/clk/bcm/clk-raspberrypi.c
 +++ b/drivers/clk/bcm/clk-raspberrypi.c
 @@ -175,11 +175,10 @@ static const struct clk_ops raspberrypi_firmware_pll_clk_ops = {
@@ -384057,7 +384072,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  1 file changed, 18 insertions(+), 6 deletions(-)
 
 diff --git a/drivers/clk/bcm/clk-raspberrypi.c b/drivers/clk/bcm/clk-raspberrypi.c
-index 64fd91b5ffe9d..48cffa44db648 100644
+index 64fd91b5ffe9..48cffa44db64 100644
 --- a/drivers/clk/bcm/clk-raspberrypi.c
 +++ b/drivers/clk/bcm/clk-raspberrypi.c
 @@ -225,16 +225,28 @@ static int raspberrypi_register_pllb(struct raspberrypi_clk *rpi)
@@ -384119,7 +384134,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  1 file changed, 3 insertions(+), 4 deletions(-)
 
 diff --git a/drivers/clk/bcm/clk-raspberrypi.c b/drivers/clk/bcm/clk-raspberrypi.c
-index 48cffa44db648..61a942f9a6a2a 100644
+index 48cffa44db64..61a942f9a6a2 100644
 --- a/drivers/clk/bcm/clk-raspberrypi.c
 +++ b/drivers/clk/bcm/clk-raspberrypi.c
 @@ -40,7 +40,6 @@ struct raspberrypi_clk {
@@ -384172,7 +384187,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  1 file changed, 1 insertion(+), 2 deletions(-)
 
 diff --git a/drivers/clk/bcm/clk-raspberrypi.c b/drivers/clk/bcm/clk-raspberrypi.c
-index 61a942f9a6a2a..783c8c5e53734 100644
+index 61a942f9a6a2..783c8c5e5373 100644
 --- a/drivers/clk/bcm/clk-raspberrypi.c
 +++ b/drivers/clk/bcm/clk-raspberrypi.c
 @@ -240,7 +240,7 @@ static int raspberrypi_register_pllb_arm(struct raspberrypi_clk *rpi)
@@ -384218,7 +384233,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/drivers/clk/bcm/clk-raspberrypi.c b/drivers/clk/bcm/clk-raspberrypi.c
-index 783c8c5e53734..0c1d6c2923029 100644
+index 783c8c5e5373..0c1d6c292302 100644
 --- a/drivers/clk/bcm/clk-raspberrypi.c
 +++ b/drivers/clk/bcm/clk-raspberrypi.c
 @@ -40,7 +40,6 @@ struct raspberrypi_clk {
@@ -384273,7 +384288,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  1 file changed, 5 insertions(+), 6 deletions(-)
 
 diff --git a/drivers/clk/bcm/clk-raspberrypi.c b/drivers/clk/bcm/clk-raspberrypi.c
-index 0c1d6c2923029..b97c7ec613769 100644
+index 0c1d6c292302..b97c7ec61376 100644
 --- a/drivers/clk/bcm/clk-raspberrypi.c
 +++ b/drivers/clk/bcm/clk-raspberrypi.c
 @@ -237,7 +237,6 @@ static struct clk_fixed_factor raspberrypi_clk_pllb_arm = {
@@ -384327,7 +384342,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  1 file changed, 3 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/clk/bcm/clk-raspberrypi.c b/drivers/clk/bcm/clk-raspberrypi.c
-index b97c7ec613769..b8b55134ba3fa 100644
+index b97c7ec61376..b8b55134ba3f 100644
 --- a/drivers/clk/bcm/clk-raspberrypi.c
 +++ b/drivers/clk/bcm/clk-raspberrypi.c
 @@ -245,8 +245,9 @@ static int raspberrypi_register_pllb_arm(struct raspberrypi_clk *rpi)
@@ -384369,7 +384384,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  1 file changed, 26 insertions(+), 14 deletions(-)
 
 diff --git a/drivers/clk/bcm/clk-raspberrypi.c b/drivers/clk/bcm/clk-raspberrypi.c
-index b8b55134ba3fa..964fc8f792cc7 100644
+index b8b55134ba3f..964fc8f792cc 100644
 --- a/drivers/clk/bcm/clk-raspberrypi.c
 +++ b/drivers/clk/bcm/clk-raspberrypi.c
 @@ -35,11 +35,15 @@ struct raspberrypi_clk {
@@ -384499,7 +384514,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  1 file changed, 7 insertions(+), 9 deletions(-)
 
 diff --git a/drivers/clk/bcm/clk-raspberrypi.c b/drivers/clk/bcm/clk-raspberrypi.c
-index 964fc8f792cc7..e796dabbc6415 100644
+index 964fc8f792cc..e796dabbc641 100644
 --- a/drivers/clk/bcm/clk-raspberrypi.c
 +++ b/drivers/clk/bcm/clk-raspberrypi.c
 @@ -39,6 +39,7 @@ struct raspberrypi_clk {
@@ -384591,7 +384606,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  1 file changed, 14 insertions(+), 15 deletions(-)
 
 diff --git a/drivers/clk/bcm/clk-raspberrypi.c b/drivers/clk/bcm/clk-raspberrypi.c
-index e796dabbc6415..055dd34c5acc1 100644
+index e796dabbc641..055dd34c5acc 100644
 --- a/drivers/clk/bcm/clk-raspberrypi.c
 +++ b/drivers/clk/bcm/clk-raspberrypi.c
 @@ -67,11 +67,12 @@ struct raspberrypi_firmware_prop {
@@ -384694,7 +384709,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/clk/bcm/clk-raspberrypi.c b/drivers/clk/bcm/clk-raspberrypi.c
-index 055dd34c5acc1..2f10bccf03a54 100644
+index 055dd34c5acc..2f10bccf03a5 100644
 --- a/drivers/clk/bcm/clk-raspberrypi.c
 +++ b/drivers/clk/bcm/clk-raspberrypi.c
 @@ -87,7 +87,7 @@ static int raspberrypi_clock_property(struct rpi_firmware *firmware,
@@ -384738,7 +384753,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  1 file changed, 22 insertions(+), 8 deletions(-)
 
 diff --git a/drivers/clk/bcm/clk-raspberrypi.c b/drivers/clk/bcm/clk-raspberrypi.c
-index 2f10bccf03a54..d1b5826c95bb2 100644
+index 2f10bccf03a5..d1b5826c95bb 100644
 --- a/drivers/clk/bcm/clk-raspberrypi.c
 +++ b/drivers/clk/bcm/clk-raspberrypi.c
 @@ -104,8 +104,8 @@ static int raspberrypi_fw_is_prepared(struct clk_hw *hw)
@@ -384830,7 +384845,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  1 file changed, 22 insertions(+), 18 deletions(-)
 
 diff --git a/drivers/clk/bcm/clk-raspberrypi.c b/drivers/clk/bcm/clk-raspberrypi.c
-index d1b5826c95bb2..05ed2f2cde318 100644
+index d1b5826c95bb..05ed2f2cde31 100644
 --- a/drivers/clk/bcm/clk-raspberrypi.c
 +++ b/drivers/clk/bcm/clk-raspberrypi.c
 @@ -190,7 +190,7 @@ static const struct clk_ops raspberrypi_firmware_pll_clk_ops = {
@@ -384972,7 +384987,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  1 file changed, 16 insertions(+)
 
 diff --git a/drivers/clk/bcm/clk-raspberrypi.c b/drivers/clk/bcm/clk-raspberrypi.c
-index 05ed2f2cde318..f2fbcef54c9c7 100644
+index 05ed2f2cde31..f2fbcef54c9c 100644
 --- a/drivers/clk/bcm/clk-raspberrypi.c
 +++ b/drivers/clk/bcm/clk-raspberrypi.c
 @@ -31,6 +31,8 @@
@@ -385061,7 +385076,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  2 files changed, 97 insertions(+), 12 deletions(-)
 
 diff --git a/drivers/clk/bcm/clk-raspberrypi.c b/drivers/clk/bcm/clk-raspberrypi.c
-index f2fbcef54c9c7..86b18f8cc98d8 100644
+index f2fbcef54c9c..86b18f8cc98d 100644
 --- a/drivers/clk/bcm/clk-raspberrypi.c
 +++ b/drivers/clk/bcm/clk-raspberrypi.c
 @@ -285,6 +285,95 @@ static struct clk_hw *raspberrypi_register_pllb_arm(struct raspberrypi_clk *rpi)
@@ -385190,7 +385205,7 @@ index f2fbcef54c9c7..86b18f8cc98d8 100644
  	ret = devm_of_clk_add_hw_provider(dev, of_clk_hw_onecell_get,
  					  clk_data);
 diff --git a/include/soc/bcm2835/raspberrypi-firmware.h b/include/soc/bcm2835/raspberrypi-firmware.h
-index 05c6989ec4c66..3335c2a2993c2 100644
+index 05c6989ec4c6..3335c2a2993c 100644
 --- a/include/soc/bcm2835/raspberrypi-firmware.h
 +++ b/include/soc/bcm2835/raspberrypi-firmware.h
 @@ -160,6 +160,11 @@ enum rpi_firmware_property_tag {
@@ -385224,7 +385239,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  2 files changed, 6 insertions(+), 1 deletion(-)
 
 diff --git a/arch/arm/boot/dts/bcm2711-rpi.dtsi b/arch/arm/boot/dts/bcm2711-rpi.dtsi
-index b434b8392e9ef..207c15f37a23b 100644
+index b434b8392e9e..207c15f37a23 100644
 --- a/arch/arm/boot/dts/bcm2711-rpi.dtsi
 +++ b/arch/arm/boot/dts/bcm2711-rpi.dtsi
 @@ -33,7 +33,7 @@
@@ -385237,7 +385252,7 @@ index b434b8392e9ef..207c15f37a23b 100644
  			status = "disabled";
  		};
 diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi
-index b56388ce12163..7acd4a3cf1e55 100644
+index b56388ce1216..7acd4a3cf1e5 100644
 --- a/arch/arm/boot/dts/bcm2711.dtsi
 +++ b/arch/arm/boot/dts/bcm2711.dtsi
 @@ -31,6 +31,11 @@
@@ -385278,7 +385293,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  rename {drivers => include/linux}/reset/reset-simple.h (100%)
 
 diff --git a/drivers/reset/reset-simple.c b/drivers/reset/reset-simple.c
-index 067e7e7b34f12..c854aa3516402 100644
+index 067e7e7b34f1..c854aa351640 100644
 --- a/drivers/reset/reset-simple.c
 +++ b/drivers/reset/reset-simple.c
 @@ -18,10 +18,9 @@
@@ -385294,7 +385309,7 @@ index 067e7e7b34f12..c854aa3516402 100644
  to_reset_simple_data(struct reset_controller_dev *rcdev)
  {
 diff --git a/drivers/reset/reset-socfpga.c b/drivers/reset/reset-socfpga.c
-index 96953992c2bb5..bdd9842961960 100644
+index 96953992c2bb..bdd984296196 100644
 --- a/drivers/reset/reset-socfpga.c
 +++ b/drivers/reset/reset-socfpga.c
 @@ -11,13 +11,12 @@
@@ -385313,7 +385328,7 @@ index 96953992c2bb5..bdd9842961960 100644
  
  static int a10_reset_init(struct device_node *np)
 diff --git a/drivers/reset/reset-sunxi.c b/drivers/reset/reset-sunxi.c
-index e7f169e57bcff..e752594b6971c 100644
+index e7f169e57bcf..e752594b6971 100644
 --- a/drivers/reset/reset-sunxi.c
 +++ b/drivers/reset/reset-sunxi.c
 @@ -14,13 +14,12 @@
@@ -385332,7 +385347,7 @@ index e7f169e57bcff..e752594b6971c 100644
  {
  	struct reset_simple_data *data;
 diff --git a/drivers/reset/reset-uniphier-glue.c b/drivers/reset/reset-uniphier-glue.c
-index a45923f4df6dc..fa2a498b0e55c 100644
+index a45923f4df6d..fa2a498b0e55 100644
 --- a/drivers/reset/reset-uniphier-glue.c
 +++ b/drivers/reset/reset-uniphier-glue.c
 @@ -9,8 +9,7 @@
@@ -385370,7 +385385,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  2 files changed, 30 insertions(+)
 
 diff --git a/drivers/reset/reset-simple.c b/drivers/reset/reset-simple.c
-index c854aa3516402..7e395cb2837da 100644
+index c854aa351640..7e395cb2837d 100644
 --- a/drivers/reset/reset-simple.c
 +++ b/drivers/reset/reset-simple.c
 @@ -11,6 +11,7 @@
@@ -385419,7 +385434,7 @@ index c854aa3516402..7e395cb2837da 100644
  };
  EXPORT_SYMBOL_GPL(reset_simple_ops);
 diff --git a/include/linux/reset/reset-simple.h b/include/linux/reset/reset-simple.h
-index 08ccb25a55e65..5eb83625a495f 100644
+index 08ccb25a55e6..5eb83625a495 100644
 --- a/include/linux/reset/reset-simple.h
 +++ b/include/linux/reset/reset-simple.h
 @@ -27,6 +27,11 @@
@@ -385466,7 +385481,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
 
 diff --git a/Documentation/devicetree/bindings/clock/brcm,bcm2711-dvp.yaml b/Documentation/devicetree/bindings/clock/brcm,bcm2711-dvp.yaml
 new file mode 100644
-index 0000000000000..08543ecbe35b2
+index 000000000000..08543ecbe35b
 --- /dev/null
 +++ b/Documentation/devicetree/bindings/clock/brcm,bcm2711-dvp.yaml
 @@ -0,0 +1,47 @@
@@ -385546,7 +385561,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  create mode 100644 drivers/clk/bcm/clk-bcm2711-dvp.c
 
 diff --git a/drivers/clk/bcm/Kconfig b/drivers/clk/bcm/Kconfig
-index 8c83977a7dc42..03bbd80404514 100644
+index 8c83977a7dc4..03bbd8040451 100644
 --- a/drivers/clk/bcm/Kconfig
 +++ b/drivers/clk/bcm/Kconfig
 @@ -4,6 +4,7 @@ config CLK_BCM2835
@@ -385558,7 +385573,7 @@ index 8c83977a7dc42..03bbd80404514 100644
  	  Enable common clock framework support for Broadcom BCM2835
  	  SoCs.
 diff --git a/drivers/clk/bcm/Makefile b/drivers/clk/bcm/Makefile
-index 0070ddf6cdd24..2c13490621472 100644
+index 0070ddf6cdd2..2c1349062147 100644
 --- a/drivers/clk/bcm/Makefile
 +++ b/drivers/clk/bcm/Makefile
 @@ -6,6 +6,7 @@ obj-$(CONFIG_CLK_BCM_KONA)	+= clk-kona-setup.o
@@ -385571,7 +385586,7 @@ index 0070ddf6cdd24..2c13490621472 100644
  obj-$(CONFIG_CLK_RASPBERRYPI)	+= clk-raspberrypi.o
 diff --git a/drivers/clk/bcm/clk-bcm2711-dvp.c b/drivers/clk/bcm/clk-bcm2711-dvp.c
 new file mode 100644
-index 0000000000000..bfe4e5b4a1482
+index 000000000000..bfe4e5b4a148
 --- /dev/null
 +++ b/drivers/clk/bcm/clk-bcm2711-dvp.c
 @@ -0,0 +1,125 @@
@@ -385717,7 +385732,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  1 file changed, 15 insertions(+)
 
 diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi
-index 7acd4a3cf1e55..7cf1a9748f006 100644
+index 7acd4a3cf1e5..7cf1a9748f00 100644
 --- a/arch/arm/boot/dts/bcm2711.dtsi
 +++ b/arch/arm/boot/dts/bcm2711.dtsi
 @@ -31,6 +31,13 @@
@@ -385799,7 +385814,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
 
 diff --git a/Documentation/devicetree/bindings/display/brcm,bcm-vc4.txt b/Documentation/devicetree/bindings/display/brcm,bcm-vc4.txt
 deleted file mode 100644
-index 26649b4c4dd8d..0000000000000
+index 26649b4c4dd8..000000000000
 --- a/Documentation/devicetree/bindings/display/brcm,bcm-vc4.txt
 +++ /dev/null
 @@ -1,174 +0,0 @@
@@ -385979,7 +385994,7 @@ index 26649b4c4dd8d..0000000000000
 -};
 diff --git a/Documentation/devicetree/bindings/display/brcm,bcm2835-dpi.yaml b/Documentation/devicetree/bindings/display/brcm,bcm2835-dpi.yaml
 new file mode 100644
-index 0000000000000..288494b70e821
+index 000000000000..288494b70e82
 --- /dev/null
 +++ b/Documentation/devicetree/bindings/display/brcm,bcm2835-dpi.yaml
 @@ -0,0 +1,66 @@
@@ -386051,7 +386066,7 @@ index 0000000000000..288494b70e821
 +...
 diff --git a/Documentation/devicetree/bindings/display/brcm,bcm2835-dsi0.yaml b/Documentation/devicetree/bindings/display/brcm,bcm2835-dsi0.yaml
 new file mode 100644
-index 0000000000000..3887675f844ec
+index 000000000000..3887675f844e
 --- /dev/null
 +++ b/Documentation/devicetree/bindings/display/brcm,bcm2835-dsi0.yaml
 @@ -0,0 +1,73 @@
@@ -386130,7 +386145,7 @@ index 0000000000000..3887675f844ec
 +...
 diff --git a/Documentation/devicetree/bindings/display/brcm,bcm2835-hdmi.yaml b/Documentation/devicetree/bindings/display/brcm,bcm2835-hdmi.yaml
 new file mode 100644
-index 0000000000000..834cc5f1c2546
+index 000000000000..834cc5f1c254
 --- /dev/null
 +++ b/Documentation/devicetree/bindings/display/brcm,bcm2835-hdmi.yaml
 @@ -0,0 +1,75 @@
@@ -386211,7 +386226,7 @@ index 0000000000000..834cc5f1c2546
 +...
 diff --git a/Documentation/devicetree/bindings/display/brcm,bcm2835-hvs.yaml b/Documentation/devicetree/bindings/display/brcm,bcm2835-hvs.yaml
 new file mode 100644
-index 0000000000000..02410f8d6d498
+index 000000000000..02410f8d6d49
 --- /dev/null
 +++ b/Documentation/devicetree/bindings/display/brcm,bcm2835-hvs.yaml
 @@ -0,0 +1,37 @@
@@ -386254,7 +386269,7 @@ index 0000000000000..02410f8d6d498
 +...
 diff --git a/Documentation/devicetree/bindings/display/brcm,bcm2835-pixelvalve0.yaml b/Documentation/devicetree/bindings/display/brcm,bcm2835-pixelvalve0.yaml
 new file mode 100644
-index 0000000000000..e60791db1fa12
+index 000000000000..e60791db1fa1
 --- /dev/null
 +++ b/Documentation/devicetree/bindings/display/brcm,bcm2835-pixelvalve0.yaml
 @@ -0,0 +1,40 @@
@@ -386300,7 +386315,7 @@ index 0000000000000..e60791db1fa12
 +...
 diff --git a/Documentation/devicetree/bindings/display/brcm,bcm2835-txp.yaml b/Documentation/devicetree/bindings/display/brcm,bcm2835-txp.yaml
 new file mode 100644
-index 0000000000000..bb186197e471e
+index 000000000000..bb186197e471
 --- /dev/null
 +++ b/Documentation/devicetree/bindings/display/brcm,bcm2835-txp.yaml
 @@ -0,0 +1,37 @@
@@ -386343,7 +386358,7 @@ index 0000000000000..bb186197e471e
 +...
 diff --git a/Documentation/devicetree/bindings/display/brcm,bcm2835-v3d.yaml b/Documentation/devicetree/bindings/display/brcm,bcm2835-v3d.yaml
 new file mode 100644
-index 0000000000000..8a73780f573d3
+index 000000000000..8a73780f573d
 --- /dev/null
 +++ b/Documentation/devicetree/bindings/display/brcm,bcm2835-v3d.yaml
 @@ -0,0 +1,42 @@
@@ -386391,7 +386406,7 @@ index 0000000000000..8a73780f573d3
 +...
 diff --git a/Documentation/devicetree/bindings/display/brcm,bcm2835-vc4.yaml b/Documentation/devicetree/bindings/display/brcm,bcm2835-vc4.yaml
 new file mode 100644
-index 0000000000000..0dcf0c3973759
+index 000000000000..0dcf0c397375
 --- /dev/null
 +++ b/Documentation/devicetree/bindings/display/brcm,bcm2835-vc4.yaml
 @@ -0,0 +1,34 @@
@@ -386431,7 +386446,7 @@ index 0000000000000..0dcf0c3973759
 +...
 diff --git a/Documentation/devicetree/bindings/display/brcm,bcm2835-vec.yaml b/Documentation/devicetree/bindings/display/brcm,bcm2835-vec.yaml
 new file mode 100644
-index 0000000000000..d900cc57b4ec9
+index 000000000000..d900cc57b4ec
 --- /dev/null
 +++ b/Documentation/devicetree/bindings/display/brcm,bcm2835-vec.yaml
 @@ -0,0 +1,44 @@
@@ -386480,7 +386495,7 @@ index 0000000000000..d900cc57b4ec9
 +
 +...
 diff --git a/MAINTAINERS b/MAINTAINERS
-index faa83d7e339fe..b1b23c6921865 100644
+index faa83d7e339f..b1b23c692186 100644
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
 @@ -5574,7 +5574,7 @@ T:	git git://github.com/anholt/linux
@@ -386513,7 +386528,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  1 file changed, 6 insertions(+)
 
 diff --git a/Documentation/devicetree/bindings/display/brcm,bcm2835-dpi.yaml b/Documentation/devicetree/bindings/display/brcm,bcm2835-dpi.yaml
-index 288494b70e821..58213c564e034 100644
+index 288494b70e82..58213c564e03 100644
 --- a/Documentation/devicetree/bindings/display/brcm,bcm2835-dpi.yaml
 +++ b/Documentation/devicetree/bindings/display/brcm,bcm2835-dpi.yaml
 @@ -21,6 +21,11 @@ properties:
@@ -386558,7 +386573,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  1 file changed, 11 insertions(+)
 
 diff --git a/Documentation/devicetree/bindings/display/brcm,bcm2835-dsi0.yaml b/Documentation/devicetree/bindings/display/brcm,bcm2835-dsi0.yaml
-index 3887675f844ec..3c643b227a70c 100644
+index 3887675f844e..3c643b227a70 100644
 --- a/Documentation/devicetree/bindings/display/brcm,bcm2835-dsi0.yaml
 +++ b/Documentation/devicetree/bindings/display/brcm,bcm2835-dsi0.yaml
 @@ -10,6 +10,9 @@ maintainers:
@@ -386618,7 +386633,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  1 file changed, 6 insertions(+), 1 deletion(-)
 
 diff --git a/Documentation/devicetree/bindings/display/brcm,bcm2835-hdmi.yaml b/Documentation/devicetree/bindings/display/brcm,bcm2835-hdmi.yaml
-index 834cc5f1c2546..52b3cdac0bdf0 100644
+index 834cc5f1c254..52b3cdac0bdf 100644
 --- a/Documentation/devicetree/bindings/display/brcm,bcm2835-hdmi.yaml
 +++ b/Documentation/devicetree/bindings/display/brcm,bcm2835-hdmi.yaml
 @@ -23,8 +23,13 @@ properties:
@@ -386655,7 +386670,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  1 file changed, 1 insertion(+)
 
 diff --git a/Documentation/devicetree/bindings/display/brcm,bcm2835-vc4.yaml b/Documentation/devicetree/bindings/display/brcm,bcm2835-vc4.yaml
-index 0dcf0c3973759..49a5e041aa493 100644
+index 0dcf0c397375..49a5e041aa49 100644
 --- a/Documentation/devicetree/bindings/display/brcm,bcm2835-vc4.yaml
 +++ b/Documentation/devicetree/bindings/display/brcm,bcm2835-vc4.yaml
 @@ -17,6 +17,7 @@ description: >
@@ -386684,7 +386699,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  1 file changed, 4 insertions(+)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_drv.h b/drivers/gpu/drm/vc4/vc4_drv.h
-index 308f0473592a6..95f7433c86309 100644
+index 308f0473592a..95f7433c8630 100644
 --- a/drivers/gpu/drm/vc4/vc4_drv.h
 +++ b/drivers/gpu/drm/vc4/vc4_drv.h
 @@ -2,6 +2,8 @@
@@ -386724,7 +386739,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  4 files changed, 30 insertions(+), 11 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_drv.c b/drivers/gpu/drm/vc4/vc4_drv.c
-index af8df6d328b9b..a726d262a0fac 100644
+index af8df6d328b9..a726d262a0fa 100644
 --- a/drivers/gpu/drm/vc4/vc4_drv.c
 +++ b/drivers/gpu/drm/vc4/vc4_drv.c
 @@ -369,6 +369,7 @@ static int vc4_platform_drm_remove(struct platform_device *pdev)
@@ -386736,7 +386751,7 @@ index af8df6d328b9b..a726d262a0fac 100644
  	{ .compatible = "brcm,cygnus-vc4", },
  	{},
 diff --git a/drivers/gpu/drm/vc4/vc4_drv.h b/drivers/gpu/drm/vc4/vc4_drv.h
-index 95f7433c86309..a6777e724f464 100644
+index 95f7433c8630..a6777e724f46 100644
 --- a/drivers/gpu/drm/vc4/vc4_drv.h
 +++ b/drivers/gpu/drm/vc4/vc4_drv.h
 @@ -205,6 +205,9 @@ struct vc4_dev {
@@ -386750,7 +386765,7 @@ index 95f7433c86309..a6777e724f464 100644
  	bool load_tracker_enabled;
  
 diff --git a/drivers/gpu/drm/vc4/vc4_kms.c b/drivers/gpu/drm/vc4/vc4_kms.c
-index 1b921e114c034..b821361383707 100644
+index 1b921e114c03..b82136138370 100644
 --- a/drivers/gpu/drm/vc4/vc4_kms.c
 +++ b/drivers/gpu/drm/vc4/vc4_kms.c
 @@ -421,6 +421,9 @@ static int vc4_load_tracker_atomic_check(struct drm_atomic_state *state)
@@ -386808,7 +386823,7 @@ index 1b921e114c034..b821361383707 100644
  	drm_mode_config_reset(dev);
  
 diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c
-index 5ea6c84d7f6d7..12080775a7700 100644
+index 5ea6c84d7f6d..12080775a770 100644
 --- a/drivers/gpu/drm/vc4/vc4_plane.c
 +++ b/drivers/gpu/drm/vc4/vc4_plane.c
 @@ -500,6 +500,11 @@ static void vc4_plane_calc_load(struct drm_plane_state *state)
@@ -386849,7 +386864,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  5 files changed, 247 insertions(+), 59 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c
-index d00756635257e..e7444e30073ab 100644
+index d00756635257..e7444e30073a 100644
 --- a/drivers/gpu/drm/vc4/vc4_crtc.c
 +++ b/drivers/gpu/drm/vc4/vc4_crtc.c
 @@ -550,6 +550,7 @@ static void vc4_crtc_atomic_enable(struct drm_crtc *crtc,
@@ -386891,7 +386906,7 @@ index d00756635257e..e7444e30073ab 100644
  	/* When feeding the transposer block the pixelvalve is unneeded and
  	 * should not be enabled.
 diff --git a/drivers/gpu/drm/vc4/vc4_drv.h b/drivers/gpu/drm/vc4/vc4_drv.h
-index a6777e724f464..db414d9f7630d 100644
+index a6777e724f46..db414d9f7630 100644
 --- a/drivers/gpu/drm/vc4/vc4_drv.h
 +++ b/drivers/gpu/drm/vc4/vc4_drv.h
 @@ -336,7 +336,11 @@ struct vc4_hvs {
@@ -386907,7 +386922,7 @@ index a6777e724f464..db414d9f7630d 100644
  
  struct vc4_plane {
 diff --git a/drivers/gpu/drm/vc4/vc4_hvs.c b/drivers/gpu/drm/vc4/vc4_hvs.c
-index 9936b15d0bf1f..650d4d9a5980c 100644
+index 9936b15d0bf1..650d4d9a5980 100644
 --- a/drivers/gpu/drm/vc4/vc4_hvs.c
 +++ b/drivers/gpu/drm/vc4/vc4_hvs.c
 @@ -223,6 +223,7 @@ static int vc4_hvs_bind(struct device *dev, struct device *master, void *data)
@@ -386949,7 +386964,7 @@ index 9936b15d0bf1f..650d4d9a5980c 100644
  	/* Upload filter kernels.  We only have the one for now, so we
  	 * keep it around for the lifetime of the driver.
 diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c
-index 12080775a7700..770f4112b3f9a 100644
+index 12080775a770..770f4112b3f9 100644
 --- a/drivers/gpu/drm/vc4/vc4_plane.c
 +++ b/drivers/gpu/drm/vc4/vc4_plane.c
 @@ -32,45 +32,60 @@ static const struct hvs_format {
@@ -387205,7 +387220,7 @@ index 12080775a7700..770f4112b3f9a 100644
  	case DRM_FORMAT_YVU422:
  	case DRM_FORMAT_YUV420:
 diff --git a/drivers/gpu/drm/vc4/vc4_regs.h b/drivers/gpu/drm/vc4/vc4_regs.h
-index 8416fdaf2ec47..22b8952585451 100644
+index 8416fdaf2ec4..22b895258545 100644
 --- a/drivers/gpu/drm/vc4/vc4_regs.h
 +++ b/drivers/gpu/drm/vc4/vc4_regs.h
 @@ -328,6 +328,20 @@
@@ -387358,7 +387373,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  1 file changed, 20 insertions(+), 11 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c
-index 770f4112b3f9a..694779cfafe08 100644
+index 770f4112b3f9..694779cfafe0 100644
 --- a/drivers/gpu/drm/vc4/vc4_plane.c
 +++ b/drivers/gpu/drm/vc4/vc4_plane.c
 @@ -142,9 +142,10 @@ static const struct hvs_format *vc4_get_hvs_format(u32 drm_format)
@@ -387464,7 +387479,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  3 files changed, 44 insertions(+), 29 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c
-index e7444e30073ab..9f473af60f02e 100644
+index e7444e30073a..9f473af60f02 100644
 --- a/drivers/gpu/drm/vc4/vc4_crtc.c
 +++ b/drivers/gpu/drm/vc4/vc4_crtc.c
 @@ -1142,7 +1142,7 @@ static int vc4_crtc_bind(struct device *dev, struct device *master, void *data)
@@ -387515,7 +387530,7 @@ index e7444e30073ab..9f473af60f02e 100644
  	vc4_crtc_get_cob_allocation(vc4_crtc);
  
 diff --git a/drivers/gpu/drm/vc4/vc4_drv.h b/drivers/gpu/drm/vc4/vc4_drv.h
-index db414d9f7630d..7364b266ba5b4 100644
+index db414d9f7630..7364b266ba5b 100644
 --- a/drivers/gpu/drm/vc4/vc4_drv.h
 +++ b/drivers/gpu/drm/vc4/vc4_drv.h
 @@ -855,6 +855,8 @@ int vc4_kms_load(struct drm_device *dev);
@@ -387528,7 +387543,7 @@ index db414d9f7630d..7364b266ba5b4 100644
  u32 vc4_plane_dlist_size(const struct drm_plane_state *state);
  void vc4_plane_async_set_fb(struct drm_plane *plane,
 diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c
-index 694779cfafe08..0fa3df7d6d599 100644
+index 694779cfafe0..0fa3df7d6d59 100644
 --- a/drivers/gpu/drm/vc4/vc4_plane.c
 +++ b/drivers/gpu/drm/vc4/vc4_plane.c
 @@ -1447,3 +1447,41 @@ struct drm_plane *vc4_plane_init(struct drm_device *dev,
@@ -387617,7 +387632,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  2 files changed, 7 insertions(+), 4 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c
-index 9f473af60f02e..c570dd09b180c 100644
+index 9f473af60f02..c570dd09b180 100644
 --- a/drivers/gpu/drm/vc4/vc4_crtc.c
 +++ b/drivers/gpu/drm/vc4/vc4_crtc.c
 @@ -1190,10 +1190,6 @@ static int vc4_crtc_bind(struct device *dev, struct device *master, void *data)
@@ -387632,7 +387647,7 @@ index 9f473af60f02e..c570dd09b180c 100644
  
  	CRTC_WRITE(PV_INTEN, 0);
 diff --git a/drivers/gpu/drm/vc4/vc4_drv.c b/drivers/gpu/drm/vc4/vc4_drv.c
-index a726d262a0fac..3f523e1bee7f1 100644
+index a726d262a0fa..3f523e1bee7f 100644
 --- a/drivers/gpu/drm/vc4/vc4_drv.c
 +++ b/drivers/gpu/drm/vc4/vc4_drv.c
 @@ -253,6 +253,7 @@ static int vc4_drm_bind(struct device *dev)
@@ -387679,7 +387694,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  3 files changed, 32 insertions(+), 34 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_drv.c b/drivers/gpu/drm/vc4/vc4_drv.c
-index 3f523e1bee7f1..67235aee35070 100644
+index 3f523e1bee7f..67235aee3507 100644
 --- a/drivers/gpu/drm/vc4/vc4_drv.c
 +++ b/drivers/gpu/drm/vc4/vc4_drv.c
 @@ -253,7 +253,6 @@ static int vc4_drm_bind(struct device *dev)
@@ -387706,7 +387721,7 @@ index 3f523e1bee7f1..67235aee35070 100644
  	drm_fb_helper_remove_conflicting_framebuffers(NULL, "vc4drmfb", false);
  
 diff --git a/drivers/gpu/drm/vc4/vc4_drv.h b/drivers/gpu/drm/vc4/vc4_drv.h
-index 7364b266ba5b4..d2d253a942880 100644
+index 7364b266ba5b..d2d253a94288 100644
 --- a/drivers/gpu/drm/vc4/vc4_drv.h
 +++ b/drivers/gpu/drm/vc4/vc4_drv.h
 @@ -855,8 +855,7 @@ int vc4_kms_load(struct drm_device *dev);
@@ -387720,7 +387735,7 @@ index 7364b266ba5b4..d2d253a942880 100644
  u32 vc4_plane_dlist_size(const struct drm_plane_state *state);
  void vc4_plane_async_set_fb(struct drm_plane *plane,
 diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c
-index 0fa3df7d6d599..9e4f663c7d2be 100644
+index 0fa3df7d6d59..9e4f663c7d2b 100644
 --- a/drivers/gpu/drm/vc4/vc4_plane.c
 +++ b/drivers/gpu/drm/vc4/vc4_plane.c
 @@ -1448,39 +1448,41 @@ struct drm_plane *vc4_plane_init(struct drm_device *dev,
@@ -387819,7 +387834,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  1 file changed, 18 insertions(+), 17 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c
-index 9e4f663c7d2be..1a972505c3695 100644
+index 9e4f663c7d2b..1a972505c369 100644
 --- a/drivers/gpu/drm/vc4/vc4_plane.c
 +++ b/drivers/gpu/drm/vc4/vc4_plane.c
 @@ -1454,26 +1454,27 @@ int vc4_plane_create_additional_planes(struct drm_device *drm)
@@ -387893,7 +387908,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c
-index 1a972505c3695..54bdbeb46390d 100644
+index 1a972505c369..54bdbeb46390 100644
 --- a/drivers/gpu/drm/vc4/vc4_plane.c
 +++ b/drivers/gpu/drm/vc4/vc4_plane.c
 @@ -1463,7 +1463,7 @@ int vc4_plane_create_additional_planes(struct drm_device *drm)
@@ -387924,7 +387939,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  1 file changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c
-index c570dd09b180c..8e6c6784f9a3f 100644
+index c570dd09b180..8e6c6784f9a3 100644
 --- a/drivers/gpu/drm/vc4/vc4_crtc.c
 +++ b/drivers/gpu/drm/vc4/vc4_crtc.c
 @@ -1056,7 +1056,7 @@ static const struct drm_crtc_helper_funcs vc4_crtc_helper_funcs = {
@@ -387986,7 +388001,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  2 files changed, 21 insertions(+), 21 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c
-index 8e6c6784f9a3f..16e694bfab0c8 100644
+index 8e6c6784f9a3..16e694bfab0c 100644
 --- a/drivers/gpu/drm/vc4/vc4_crtc.c
 +++ b/drivers/gpu/drm/vc4/vc4_crtc.c
 @@ -44,27 +44,6 @@
@@ -388018,7 +388033,7 @@ index 8e6c6784f9a3f..16e694bfab0c8 100644
  #define CRTC_READ(offset) readl(vc4_crtc->regs + (offset))
  
 diff --git a/drivers/gpu/drm/vc4/vc4_drv.h b/drivers/gpu/drm/vc4/vc4_drv.h
-index d2d253a942880..2703b9d8936bb 100644
+index d2d253a94288..2703b9d8936b 100644
 --- a/drivers/gpu/drm/vc4/vc4_drv.h
 +++ b/drivers/gpu/drm/vc4/vc4_drv.h
 @@ -488,6 +488,27 @@ to_vc4_crtc(struct drm_crtc *crtc)
@@ -388070,7 +388085,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  2 files changed, 13 insertions(+), 7 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c
-index 16e694bfab0c8..5e94adb4f70b4 100644
+index 16e694bfab0c..5e94adb4f70b 100644
 --- a/drivers/gpu/drm/vc4/vc4_crtc.c
 +++ b/drivers/gpu/drm/vc4/vc4_crtc.c
 @@ -281,6 +281,7 @@ static void vc4_crtc_config_pv(struct drm_crtc *crtc)
@@ -388130,7 +388145,7 @@ index 16e694bfab0c8..5e94adb4f70b4 100644
  		[PV_CONTROL_CLK_SELECT_DPI_SMI_HDMI] = VC4_ENCODER_TYPE_HDMI,
  		[PV_CONTROL_CLK_SELECT_VEC] = VC4_ENCODER_TYPE_VEC,
 diff --git a/drivers/gpu/drm/vc4/vc4_drv.h b/drivers/gpu/drm/vc4/vc4_drv.h
-index 2703b9d8936bb..dabf9951c3750 100644
+index 2703b9d8936b..dabf9951c375 100644
 --- a/drivers/gpu/drm/vc4/vc4_drv.h
 +++ b/drivers/gpu/drm/vc4/vc4_drv.h
 @@ -455,6 +455,9 @@ struct vc4_crtc_data {
@@ -388161,7 +388176,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c
-index 5e94adb4f70b4..4eedaddb8c922 100644
+index 5e94adb4f70b..4eedaddb8c92 100644
 --- a/drivers/gpu/drm/vc4/vc4_crtc.c
 +++ b/drivers/gpu/drm/vc4/vc4_crtc.c
 @@ -1177,7 +1177,9 @@ static int vc4_crtc_bind(struct device *dev, struct device *master, void *data)
@@ -388194,7 +388209,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  1 file changed, 5 insertions(+), 3 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c
-index 4eedaddb8c922..7b08e6fd1fb1e 100644
+index 4eedaddb8c92..7b08e6fd1fb1 100644
 --- a/drivers/gpu/drm/vc4/vc4_crtc.c
 +++ b/drivers/gpu/drm/vc4/vc4_crtc.c
 @@ -44,6 +44,8 @@
@@ -388258,7 +388273,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  2 files changed, 20 insertions(+), 21 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c
-index 7b08e6fd1fb1e..c800a31b52f88 100644
+index 7b08e6fd1fb1..c800a31b52f8 100644
 --- a/drivers/gpu/drm/vc4/vc4_crtc.c
 +++ b/drivers/gpu/drm/vc4/vc4_crtc.c
 @@ -65,6 +65,23 @@ static const struct debugfs_reg32 crtc_regs[] = {
@@ -388337,7 +388352,7 @@ index 7b08e6fd1fb1e..c800a31b52f88 100644
  	CRTC_WRITE(PV_INTSTAT, PV_INT_VFP_START);
  	ret = devm_request_irq(dev, platform_get_irq(pdev, 0),
 diff --git a/drivers/gpu/drm/vc4/vc4_drv.h b/drivers/gpu/drm/vc4/vc4_drv.h
-index dabf9951c3750..a7c9295aecc30 100644
+index dabf9951c375..a7c9295aecc3 100644
 --- a/drivers/gpu/drm/vc4/vc4_drv.h
 +++ b/drivers/gpu/drm/vc4/vc4_drv.h
 @@ -477,8 +477,6 @@ struct vc4_crtc {
@@ -388374,7 +388389,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  2 files changed, 7 insertions(+), 7 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c
-index c800a31b52f88..8267e38abd5ff 100644
+index c800a31b52f8..8267e38abd5f 100644
 --- a/drivers/gpu/drm/vc4/vc4_crtc.c
 +++ b/drivers/gpu/drm/vc4/vc4_crtc.c
 @@ -1057,7 +1057,7 @@ static const struct drm_crtc_helper_funcs vc4_crtc_helper_funcs = {
@@ -388423,7 +388438,7 @@ index c800a31b52f88..8267e38abd5ff 100644
  	drm_crtc_enable_color_mgmt(crtc, 0, false, crtc->gamma_size);
  
 diff --git a/drivers/gpu/drm/vc4/vc4_drv.h b/drivers/gpu/drm/vc4/vc4_drv.h
-index a7c9295aecc30..f6fc92663191a 100644
+index a7c9295aecc3..f6fc92663191 100644
 --- a/drivers/gpu/drm/vc4/vc4_drv.h
 +++ b/drivers/gpu/drm/vc4/vc4_drv.h
 @@ -452,8 +452,8 @@ to_vc4_encoder(struct drm_encoder *encoder)
@@ -388455,7 +388470,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c
-index 8267e38abd5ff..2e1aee1ba05be 100644
+index 8267e38abd5f..2e1aee1ba05b 100644
 --- a/drivers/gpu/drm/vc4/vc4_crtc.c
 +++ b/drivers/gpu/drm/vc4/vc4_crtc.c
 @@ -816,7 +816,7 @@ static void vc4_crtc_handle_page_flip(struct vc4_crtc *vc4_crtc)
@@ -388494,7 +388509,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  1 file changed, 7 insertions(+), 3 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c
-index 2e1aee1ba05be..b394f873b194f 100644
+index 2e1aee1ba05b..b394f873b194 100644
 --- a/drivers/gpu/drm/vc4/vc4_crtc.c
 +++ b/drivers/gpu/drm/vc4/vc4_crtc.c
 @@ -374,9 +374,7 @@ static void vc4_crtc_config_pv(struct drm_crtc *crtc)
@@ -388561,7 +388576,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  4 files changed, 175 insertions(+), 25 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c
-index b394f873b194f..f31aaee416c64 100644
+index b394f873b194..f31aaee416c6 100644
 --- a/drivers/gpu/drm/vc4/vc4_crtc.c
 +++ b/drivers/gpu/drm/vc4/vc4_crtc.c
 @@ -90,6 +90,7 @@ bool vc4_crtc_get_scanoutpos(struct drm_device *dev, unsigned int crtc_id,
@@ -388746,7 +388761,7 @@ index b394f873b194f..f31aaee416c64 100644
  	drm_crtc_enable_color_mgmt(crtc, 0, false, crtc->gamma_size);
  
 diff --git a/drivers/gpu/drm/vc4/vc4_drv.h b/drivers/gpu/drm/vc4/vc4_drv.h
-index f6fc92663191a..8208dfd0cb088 100644
+index f6fc92663191..8208dfd0cb08 100644
 --- a/drivers/gpu/drm/vc4/vc4_drv.h
 +++ b/drivers/gpu/drm/vc4/vc4_drv.h
 @@ -452,6 +452,9 @@ to_vc4_encoder(struct drm_encoder *encoder)
@@ -388778,7 +388793,7 @@ index f6fc92663191a..8208dfd0cb088 100644
  	struct {
  		unsigned int left;
 diff --git a/drivers/gpu/drm/vc4/vc4_kms.c b/drivers/gpu/drm/vc4/vc4_kms.c
-index b821361383707..fdd1ed7540879 100644
+index b82136138370..fdd1ed754087 100644
 --- a/drivers/gpu/drm/vc4/vc4_kms.c
 +++ b/drivers/gpu/drm/vc4/vc4_kms.c
 @@ -11,6 +11,9 @@
@@ -388977,7 +388992,7 @@ index b821361383707..fdd1ed7540879 100644
  	ret = vc4_ctm_atomic_check(dev, state);
  	if (ret < 0)
 diff --git a/drivers/gpu/drm/vc4/vc4_regs.h b/drivers/gpu/drm/vc4/vc4_regs.h
-index 22b8952585451..1300198716aa6 100644
+index 22b895258545..1300198716aa 100644
 --- a/drivers/gpu/drm/vc4/vc4_regs.h
 +++ b/drivers/gpu/drm/vc4/vc4_regs.h
 @@ -287,9 +287,19 @@
@@ -389020,7 +389035,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  2 files changed, 19 insertions(+), 4 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c
-index f31aaee416c64..961da7b2439d2 100644
+index f31aaee416c6..961da7b2439d 100644
 --- a/drivers/gpu/drm/vc4/vc4_crtc.c
 +++ b/drivers/gpu/drm/vc4/vc4_crtc.c
 @@ -250,11 +250,20 @@ vc4_crtc_update_gamma_lut(struct drm_crtc *crtc)
@@ -389081,7 +389096,7 @@ index f31aaee416c64..961da7b2439d2 100644
  	.encoder_types = {
  		[PV_CONTROL_CLK_SELECT_DPI_SMI_HDMI] = VC4_ENCODER_TYPE_HDMI,
 diff --git a/drivers/gpu/drm/vc4/vc4_drv.h b/drivers/gpu/drm/vc4/vc4_drv.h
-index 8208dfd0cb088..6eb030445419f 100644
+index 8208dfd0cb08..6eb030445419 100644
 --- a/drivers/gpu/drm/vc4/vc4_drv.h
 +++ b/drivers/gpu/drm/vc4/vc4_drv.h
 @@ -452,6 +452,9 @@ to_vc4_encoder(struct drm_encoder *encoder)
@@ -389115,7 +389130,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  1 file changed, 9 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c
-index 961da7b2439d2..81d144fd446d1 100644
+index 961da7b2439d..81d144fd446d 100644
 --- a/drivers/gpu/drm/vc4/vc4_crtc.c
 +++ b/drivers/gpu/drm/vc4/vc4_crtc.c
 @@ -277,6 +277,14 @@ static u32 vc4_get_fifo_full_level(struct vc4_crtc *vc4_crtc, u32 format)
@@ -389165,7 +389180,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  3 files changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c
-index 81d144fd446d1..fa68ddfc93607 100644
+index 81d144fd446d..fa68ddfc9360 100644
 --- a/drivers/gpu/drm/vc4/vc4_crtc.c
 +++ b/drivers/gpu/drm/vc4/vc4_crtc.c
 @@ -1110,7 +1110,7 @@ static const struct vc4_crtc_data bcm2835_pv2_data = {
@@ -389178,7 +389193,7 @@ index 81d144fd446d1..fa68ddfc93607 100644
  	},
  };
 diff --git a/drivers/gpu/drm/vc4/vc4_drv.h b/drivers/gpu/drm/vc4/vc4_drv.h
-index 6eb030445419f..4aed118c79252 100644
+index 6eb030445419..4aed118c7925 100644
 --- a/drivers/gpu/drm/vc4/vc4_drv.h
 +++ b/drivers/gpu/drm/vc4/vc4_drv.h
 @@ -431,7 +431,7 @@ to_vc4_plane_state(struct drm_plane_state *state)
@@ -389191,7 +389206,7 @@ index 6eb030445419f..4aed118c79252 100644
  	VC4_ENCODER_TYPE_DSI0,
  	VC4_ENCODER_TYPE_DSI1,
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
-index d59fd8714c5d8..821eb9c4dfbf0 100644
+index d59fd8714c5d..821eb9c4dfbf 100644
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
 @@ -1320,7 +1320,7 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data)
@@ -389221,7 +389236,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  1 file changed, 1 insertion(+)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_drv.h b/drivers/gpu/drm/vc4/vc4_drv.h
-index 4aed118c79252..4a83b8879f1ce 100644
+index 4aed118c7925..4a83b8879f1c 100644
 --- a/drivers/gpu/drm/vc4/vc4_drv.h
 +++ b/drivers/gpu/drm/vc4/vc4_drv.h
 @@ -432,6 +432,7 @@ to_vc4_plane_state(struct drm_plane_state *state)
@@ -389251,7 +389266,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  1 file changed, 1 deletion(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c
-index fa68ddfc93607..312077e84f630 100644
+index fa68ddfc9360..312077e84f63 100644
 --- a/drivers/gpu/drm/vc4/vc4_crtc.c
 +++ b/drivers/gpu/drm/vc4/vc4_crtc.c
 @@ -1198,7 +1198,6 @@ static int vc4_crtc_bind(struct device *dev, struct device *master, void *data)
@@ -389280,7 +389295,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  1 file changed, 11 insertions(+), 6 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c
-index 312077e84f630..daf882b7f95ee 100644
+index 312077e84f63..daf882b7f95e 100644
 --- a/drivers/gpu/drm/vc4/vc4_crtc.c
 +++ b/drivers/gpu/drm/vc4/vc4_crtc.c
 @@ -441,7 +441,7 @@ static void vc4_crtc_mode_set_nofb(struct drm_crtc *crtc)
@@ -389343,7 +389358,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  1 file changed, 5 insertions(+)
 
 diff --git a/Documentation/devicetree/bindings/display/brcm,bcm2835-pixelvalve0.yaml b/Documentation/devicetree/bindings/display/brcm,bcm2835-pixelvalve0.yaml
-index e60791db1fa12..4e1ba03f6477f 100644
+index e60791db1fa1..4e1ba03f6477 100644
 --- a/Documentation/devicetree/bindings/display/brcm,bcm2835-pixelvalve0.yaml
 +++ b/Documentation/devicetree/bindings/display/brcm,bcm2835-pixelvalve0.yaml
 @@ -15,6 +15,11 @@ properties:
@@ -389377,7 +389392,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  2 files changed, 86 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c
-index daf882b7f95ee..c230c0abd2c2d 100644
+index daf882b7f95e..c230c0abd2c2 100644
 --- a/drivers/gpu/drm/vc4/vc4_crtc.c
 +++ b/drivers/gpu/drm/vc4/vc4_crtc.c
 @@ -273,6 +273,13 @@ static u32 vc4_get_fifo_full_level(struct vc4_crtc *vc4_crtc, u32 format)
@@ -389495,7 +389510,7 @@ index daf882b7f95ee..c230c0abd2c2d 100644
  };
  
 diff --git a/drivers/gpu/drm/vc4/vc4_regs.h b/drivers/gpu/drm/vc4/vc4_regs.h
-index 1300198716aa6..ca563d373d9da 100644
+index 1300198716aa..ca563d373d9d 100644
 --- a/drivers/gpu/drm/vc4/vc4_regs.h
 +++ b/drivers/gpu/drm/vc4/vc4_regs.h
 @@ -130,6 +130,8 @@
@@ -389540,7 +389555,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  1 file changed, 1 insertion(+), 3 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
-index 821eb9c4dfbf0..3bcb6ff781ecf 100644
+index 821eb9c4dfbf..3bcb6ff781ec 100644
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
 @@ -182,9 +182,7 @@ static const struct debugfs_reg32 hd_regs[] = {
@@ -389574,7 +389589,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  create mode 100644 drivers/gpu/drm/vc4/vc4_hdmi.h
 
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
-index 3bcb6ff781ecf..dcbf695c9d46b 100644
+index 3bcb6ff781ec..dcbf695c9d46 100644
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
 @@ -48,87 +48,13 @@
@@ -389668,7 +389683,7 @@ index 3bcb6ff781ecf..dcbf695c9d46b 100644
  	VC4_REG32(VC4_HDMI_SW_RESET_CONTROL),
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.h b/drivers/gpu/drm/vc4/vc4_hdmi.h
 new file mode 100644
-index 0000000000000..5ec5d1f6b1e60
+index 000000000000..5ec5d1f6b1e6
 --- /dev/null
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.h
 @@ -0,0 +1,86 @@
@@ -389783,7 +389798,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  2 files changed, 71 insertions(+), 77 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
-index dcbf695c9d46b..e8de9fa499ae1 100644
+index dcbf695c9d46..e8de9fa499ae 100644
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
 @@ -190,19 +190,14 @@ static const struct drm_connector_helper_funcs vc4_hdmi_connector_helper_funcs =
@@ -390028,7 +390043,7 @@ index dcbf695c9d46b..e8de9fa499ae1 100644
  	clk_disable_unprepare(hdmi->hsm_clock);
  	pm_runtime_disable(dev);
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.h b/drivers/gpu/drm/vc4/vc4_hdmi.h
-index 5ec5d1f6b1e60..17079a39f1b10 100644
+index 5ec5d1f6b1e6..17079a39f1b1 100644
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.h
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.h
 @@ -8,6 +8,36 @@
@@ -390132,7 +390147,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  1 file changed, 136 insertions(+), 135 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
-index e8de9fa499ae1..45892e16eb04f 100644
+index e8de9fa499ae..45892e16eb04 100644
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
 @@ -108,11 +108,11 @@ static const struct debugfs_reg32 hd_regs[] = {
@@ -390825,7 +390840,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  2 files changed, 12 insertions(+), 18 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
-index 45892e16eb04f..87b66f528065c 100644
+index 45892e16eb04..87b66f528065 100644
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
 @@ -122,6 +122,7 @@ vc4_hdmi_connector_detect(struct drm_connector *connector, bool force)
@@ -390944,7 +390959,7 @@ index 45892e16eb04f..87b66f528065c 100644
  	unsigned int i;
  
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.h b/drivers/gpu/drm/vc4/vc4_hdmi.h
-index 17079a39f1b10..cdc9d90f62ac5 100644
+index 17079a39f1b1..cdc9d90f62ac 100644
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.h
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.h
 @@ -78,9 +78,9 @@ struct vc4_hdmi {
@@ -390982,7 +390997,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  1 file changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
-index 87b66f528065c..05a15407ea3a5 100644
+index 87b66f528065..05a15407ea3a 100644
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
 @@ -124,20 +124,20 @@ vc4_hdmi_connector_detect(struct drm_connector *connector, bool force)
@@ -391040,7 +391055,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  2 files changed, 28 insertions(+), 29 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
-index 05a15407ea3a5..3f0ed00c62df8 100644
+index 05a15407ea3a..3f0ed00c62df 100644
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
 @@ -120,9 +120,7 @@ static int vc4_hdmi_debugfs_regs(struct seq_file *m, void *unused)
@@ -391145,7 +391160,7 @@ index 05a15407ea3a5..3f0ed00c62df8 100644
  	bool hsync_pos = mode->flags & DRM_MODE_FLAG_PHSYNC;
  	bool vsync_pos = mode->flags & DRM_MODE_FLAG_PVSYNC;
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.h b/drivers/gpu/drm/vc4/vc4_hdmi.h
-index cdc9d90f62ac5..749a807cd1f3d 100644
+index cdc9d90f62ac..749a807cd1f3 100644
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.h
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.h
 @@ -78,6 +78,22 @@ struct vc4_hdmi {
@@ -391193,7 +391208,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  1 file changed, 9 insertions(+), 15 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
-index 3f0ed00c62df8..ed18826dfc2f4 100644
+index 3f0ed00c62df..ed18826dfc2f 100644
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
 @@ -1044,8 +1044,7 @@ static int vc4_hdmi_audio_init(struct vc4_hdmi *vc4_hdmi)
@@ -391302,7 +391317,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  2 files changed, 6 insertions(+), 9 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_drv.h b/drivers/gpu/drm/vc4/vc4_drv.h
-index 4a83b8879f1ce..48d96ae391e02 100644
+index 4a83b8879f1c..48d96ae391e0 100644
 --- a/drivers/gpu/drm/vc4/vc4_drv.h
 +++ b/drivers/gpu/drm/vc4/vc4_drv.h
 @@ -76,7 +76,6 @@ struct vc4_dev {
@@ -391314,7 +391329,7 @@ index 4a83b8879f1ce..48d96ae391e02 100644
  	struct vc4_v3d *v3d;
  	struct vc4_dpi *dpi;
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
-index ed18826dfc2f4..08933446b358f 100644
+index ed18826dfc2f..08933446b358 100644
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
 @@ -1200,7 +1200,6 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data)
@@ -391379,7 +391394,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  2 files changed, 10 insertions(+), 32 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
-index 08933446b358f..9fd13b50df2de 100644
+index 08933446b358..9fd13b50df2d 100644
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
 @@ -188,13 +188,10 @@ static const struct drm_connector_helper_funcs vc4_hdmi_connector_helper_funcs =
@@ -391461,7 +391476,7 @@ index 08933446b358f..9fd13b50df2de 100644
  
  	clk_disable_unprepare(vc4_hdmi->hsm_clock);
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.h b/drivers/gpu/drm/vc4/vc4_hdmi.h
-index 749a807cd1f3d..88794136d2e4a 100644
+index 749a807cd1f3..88794136d2e4 100644
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.h
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.h
 @@ -21,23 +21,6 @@ to_vc4_hdmi_encoder(struct drm_encoder *encoder)
@@ -391531,7 +391546,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  2 files changed, 54 insertions(+), 23 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
-index 9fd13b50df2de..31ea26e4eb7df 100644
+index 9fd13b50df2d..31ea26e4eb7d 100644
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
 @@ -1190,38 +1190,23 @@ static const struct cec_adap_ops vc4_hdmi_cec_adap_ops = {
@@ -391640,7 +391655,7 @@ index 9fd13b50df2de..31ea26e4eb7df 100644
  };
  
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.h b/drivers/gpu/drm/vc4/vc4_hdmi.h
-index 88794136d2e4a..4cd712779ad33 100644
+index 88794136d2e4..4cd712779ad3 100644
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.h
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.h
 @@ -21,6 +21,15 @@ to_vc4_hdmi_encoder(struct drm_encoder *encoder)
@@ -391698,7 +391713,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  create mode 100644 drivers/gpu/drm/vc4/vc4_hdmi_regs.h
 
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
-index 31ea26e4eb7df..7a97104b9625e 100644
+index 31ea26e4eb7d..7a97104b9625 100644
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
 @@ -49,62 +49,13 @@
@@ -392454,7 +392469,7 @@ index 31ea26e4eb7df..7a97104b9625e 100644
  };
  
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.h b/drivers/gpu/drm/vc4/vc4_hdmi.h
-index 4cd712779ad33..f7d0ca9447d21 100644
+index 4cd712779ad3..f7d0ca9447d2 100644
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.h
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.h
 @@ -22,8 +22,15 @@ to_vc4_hdmi_encoder(struct drm_encoder *encoder)
@@ -392485,7 +392500,7 @@ index 4cd712779ad33..f7d0ca9447d21 100644
  #endif /* _VC4_HDMI_H_ */
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi_regs.h b/drivers/gpu/drm/vc4/vc4_hdmi_regs.h
 new file mode 100644
-index 0000000000000..5f78da6e25c7b
+index 000000000000..5f78da6e25c7
 --- /dev/null
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi_regs.h
 @@ -0,0 +1,250 @@
@@ -392740,7 +392755,7 @@ index 0000000000000..5f78da6e25c7b
 +
 +#endif /* _VC4_HDMI_REGS_H_ */
 diff --git a/drivers/gpu/drm/vc4/vc4_regs.h b/drivers/gpu/drm/vc4/vc4_regs.h
-index ca563d373d9da..78809866097c8 100644
+index ca563d373d9d..78809866097c 100644
 --- a/drivers/gpu/drm/vc4/vc4_regs.h
 +++ b/drivers/gpu/drm/vc4/vc4_regs.h
 @@ -493,32 +493,16 @@
@@ -393009,7 +393024,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  2 files changed, 15 insertions(+), 5 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
-index 7a97104b9625e..da882735a620c 100644
+index 7a97104b9625..da882735a620 100644
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
 @@ -68,6 +68,15 @@ static int vc4_hdmi_debugfs_regs(struct seq_file *m, void *unused)
@@ -393051,7 +393066,7 @@ index 7a97104b9625e..da882735a620c 100644
  
  static const struct of_device_id vc4_hdmi_dt_match[] = {
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.h b/drivers/gpu/drm/vc4/vc4_hdmi.h
-index f7d0ca9447d21..93695674c2d3f 100644
+index f7d0ca9447d2..93695674c2d3 100644
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.h
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.h
 @@ -35,6 +35,9 @@ struct vc4_hdmi_variant {
@@ -393088,7 +393103,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  create mode 100644 drivers/gpu/drm/vc4/vc4_hdmi_phy.c
 
 diff --git a/drivers/gpu/drm/vc4/Makefile b/drivers/gpu/drm/vc4/Makefile
-index e90c6304775ab..8281a044834f0 100644
+index e90c6304775a..8281a044834f 100644
 --- a/drivers/gpu/drm/vc4/Makefile
 +++ b/drivers/gpu/drm/vc4/Makefile
 @@ -13,6 +13,7 @@ vc4-y := \
@@ -393100,7 +393115,7 @@ index e90c6304775ab..8281a044834f0 100644
  	vc4_hvs.o \
  	vc4_irq.o \
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
-index da882735a620c..90a522d8624b1 100644
+index da882735a620..90a522d8624b 100644
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
 @@ -324,7 +324,9 @@ static void vc4_hdmi_encoder_disable(struct drm_encoder *encoder)
@@ -393139,7 +393154,7 @@ index da882735a620c..90a522d8624b1 100644
  
  static const struct of_device_id vc4_hdmi_dt_match[] = {
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.h b/drivers/gpu/drm/vc4/vc4_hdmi.h
-index 93695674c2d3f..39ae5273f36b1 100644
+index 93695674c2d3..39ae5273f36b 100644
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.h
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.h
 @@ -21,6 +21,8 @@ to_vc4_hdmi_encoder(struct drm_encoder *encoder)
@@ -393176,7 +393191,7 @@ index 93695674c2d3f..39ae5273f36b1 100644
  #endif /* _VC4_HDMI_H_ */
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi_phy.c b/drivers/gpu/drm/vc4/vc4_hdmi_phy.c
 new file mode 100644
-index 0000000000000..26d6ee08edcff
+index 000000000000..26d6ee08edcf
 --- /dev/null
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi_phy.c
 @@ -0,0 +1,25 @@
@@ -393226,7 +393241,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  3 files changed, 32 insertions(+), 6 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
-index 90a522d8624b1..80d8cdddd39a8 100644
+index 90a522d8624b..80d8cdddd39a 100644
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
 @@ -765,9 +765,9 @@ static int vc4_hdmi_audio_trigger(struct snd_pcm_substream *substream, int cmd,
@@ -393266,7 +393281,7 @@ index 90a522d8624b1..80d8cdddd39a8 100644
  
  static const struct of_device_id vc4_hdmi_dt_match[] = {
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.h b/drivers/gpu/drm/vc4/vc4_hdmi.h
-index 39ae5273f36b1..9ae4d2c5a4f09 100644
+index 39ae5273f36b..9ae4d2c5a4f0 100644
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.h
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.h
 @@ -47,6 +47,12 @@ struct vc4_hdmi_variant {
@@ -393291,7 +393306,7 @@ index 39ae5273f36b1..9ae4d2c5a4f09 100644
  
  #endif /* _VC4_HDMI_H_ */
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi_phy.c b/drivers/gpu/drm/vc4/vc4_hdmi_phy.c
-index 26d6ee08edcff..8fdea621d8b13 100644
+index 26d6ee08edcf..8fdea621d8b1 100644
 --- a/drivers/gpu/drm/vc4/vc4_hdmi_phy.c
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi_phy.c
 @@ -7,6 +7,7 @@
@@ -393339,7 +393354,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  2 files changed, 45 insertions(+), 29 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
-index 80d8cdddd39a8..4871a161bac9d 100644
+index 80d8cdddd39a..4871a161bac9 100644
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
 @@ -337,6 +337,41 @@ static void vc4_hdmi_encoder_disable(struct drm_encoder *encoder)
@@ -393449,7 +393464,7 @@ index 80d8cdddd39a8..4871a161bac9d 100644
  	.phy_init		= vc4_hdmi_phy_init,
  	.phy_disable		= vc4_hdmi_phy_disable,
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.h b/drivers/gpu/drm/vc4/vc4_hdmi.h
-index 9ae4d2c5a4f09..22669e07b22ee 100644
+index 9ae4d2c5a4f0..22669e07b22e 100644
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.h
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.h
 @@ -41,6 +41,9 @@ struct vc4_hdmi_variant {
@@ -393485,7 +393500,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  2 files changed, 44 insertions(+), 31 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
-index 4871a161bac9d..c0dba5dd93b89 100644
+index 4871a161bac9..c0dba5dd93b8 100644
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
 @@ -372,12 +372,9 @@ static void vc4_hdmi_csc_setup(struct vc4_hdmi *vc4_hdmi, bool enable)
@@ -393589,7 +393604,7 @@ index 4871a161bac9d..c0dba5dd93b89 100644
  	.phy_disable		= vc4_hdmi_phy_disable,
  	.phy_rng_enable		= vc4_hdmi_phy_rng_enable,
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.h b/drivers/gpu/drm/vc4/vc4_hdmi.h
-index 22669e07b22ee..4a67d62aef538 100644
+index 22669e07b22e..4a67d62aef53 100644
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.h
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.h
 @@ -44,6 +44,10 @@ struct vc4_hdmi_variant {
@@ -393625,7 +393640,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  2 files changed, 6 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
-index c0dba5dd93b89..434240cbfaa60 100644
+index c0dba5dd93b8..434240cbfaa6 100644
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
 @@ -1268,11 +1268,10 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data)
@@ -393642,7 +393657,7 @@ index c0dba5dd93b89..434240cbfaa60 100644
  
  	ret = variant->init_resources(vc4_hdmi);
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.h b/drivers/gpu/drm/vc4/vc4_hdmi.h
-index 4a67d62aef538..4d3117de383a1 100644
+index 4a67d62aef53..4d3117de383a 100644
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.h
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.h
 @@ -27,6 +27,11 @@ struct vc4_hdmi;
@@ -393681,7 +393696,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
-index 434240cbfaa60..25672d88f8f33 100644
+index 434240cbfaa6..25672d88f8f3 100644
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
 @@ -1381,7 +1381,10 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data)
@@ -393716,7 +393731,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  2 files changed, 7 insertions(+)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
-index 25672d88f8f33..b51d3e997e0c3 100644
+index 25672d88f8f3..b51d3e997e0c 100644
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
 @@ -944,6 +944,9 @@ static int vc4_hdmi_audio_init(struct vc4_hdmi *vc4_hdmi)
@@ -393738,7 +393753,7 @@ index 25672d88f8f33..b51d3e997e0c3 100644
  	.num_registers		= ARRAY_SIZE(vc4_hdmi_fields),
  
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.h b/drivers/gpu/drm/vc4/vc4_hdmi.h
-index 4d3117de383a1..f41116507156a 100644
+index 4d3117de383a..f41116507156 100644
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.h
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.h
 @@ -32,6 +32,9 @@ struct vc4_hdmi_variant {
@@ -393770,7 +393785,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  1 file changed, 67 insertions(+), 41 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
-index b51d3e997e0c3..3fadc534f41ae 100644
+index b51d3e997e0c..3fadc534f41a 100644
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
 @@ -1179,6 +1179,67 @@ static const struct cec_adap_ops vc4_hdmi_cec_adap_ops = {
@@ -393942,7 +393957,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  2 files changed, 7 insertions(+)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
-index 3fadc534f41ae..8d5848990e4a2 100644
+index 3fadc534f41a..8d5848990e4a 100644
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
 @@ -1187,6 +1187,9 @@ static int vc4_hdmi_cec_init(struct vc4_hdmi *vc4_hdmi)
@@ -393964,7 +393979,7 @@ index 3fadc534f41ae..8d5848990e4a2 100644
  	.num_registers		= ARRAY_SIZE(vc4_hdmi_fields),
  
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.h b/drivers/gpu/drm/vc4/vc4_hdmi.h
-index f41116507156a..cbb1d3ab85d7d 100644
+index f41116507156..cbb1d3ab85d7 100644
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.h
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.h
 @@ -35,6 +35,9 @@ struct vc4_hdmi_variant {
@@ -393995,7 +394010,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  1 file changed, 1 deletion(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
-index 8d5848990e4a2..5a1a6e84b947f 100644
+index 8d5848990e4a..5a1a6e84b947 100644
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
 @@ -54,7 +54,6 @@
@@ -394026,7 +394041,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
-index 5a1a6e84b947f..f74200cc878d9 100644
+index 5a1a6e84b947..f74200cc878d 100644
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
 @@ -559,7 +559,7 @@ static void vc4_hdmi_encoder_enable(struct drm_encoder *encoder)
@@ -394070,7 +394085,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  2 files changed, 29 insertions(+), 25 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
-index f74200cc878d9..8e84f88347f39 100644
+index f74200cc878d..8e84f88347f3 100644
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
 @@ -52,7 +52,6 @@
@@ -394196,7 +394211,7 @@ index f74200cc878d9..8e84f88347f39 100644
  	.cec_available		= true,
  	.registers		= vc4_hdmi_fields,
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.h b/drivers/gpu/drm/vc4/vc4_hdmi.h
-index cbb1d3ab85d7d..ee9753255b68f 100644
+index cbb1d3ab85d7..ee9753255b68 100644
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.h
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.h
 @@ -38,6 +38,9 @@ struct vc4_hdmi_variant {
@@ -394230,7 +394245,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  4 files changed, 959 insertions(+)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
-index 8e84f88347f39..8bebdb45642ba 100644
+index 8e84f88347f3..8bebdb45642b 100644
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
 @@ -42,6 +42,7 @@
@@ -394539,7 +394554,7 @@ index 8e84f88347f39..8bebdb45642ba 100644
  };
  
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.h b/drivers/gpu/drm/vc4/vc4_hdmi.h
-index ee9753255b68f..7a43abbe0cfae 100644
+index ee9753255b68..7a43abbe0cfa 100644
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.h
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.h
 @@ -26,6 +26,13 @@ struct drm_display_mode;
@@ -394611,7 +394626,7 @@ index ee9753255b68f..7a43abbe0cfae 100644
 +
  #endif /* _VC4_HDMI_H_ */
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi_phy.c b/drivers/gpu/drm/vc4/vc4_hdmi_phy.c
-index 8fdea621d8b13..a436fabbc1289 100644
+index 8fdea621d8b1..a436fabbc128 100644
 --- a/drivers/gpu/drm/vc4/vc4_hdmi_phy.c
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi_phy.c
 @@ -10,6 +10,123 @@
@@ -395095,7 +395110,7 @@ index 8fdea621d8b13..a436fabbc1289 100644
 +		   VC4_HDMI_TX_PHY_POWERDOWN_CTL_RNDGEN_PWRDN);
 +}
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi_regs.h b/drivers/gpu/drm/vc4/vc4_hdmi_regs.h
-index 5f78da6e25c7b..ea948ffaa69bc 100644
+index 5f78da6e25c7..ea948ffaa69b 100644
 --- a/drivers/gpu/drm/vc4/vc4_hdmi_regs.h
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi_regs.h
 @@ -18,6 +18,12 @@ enum vc4_hdmi_regs {
@@ -395374,7 +395389,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  1 file changed, 109 insertions(+), 9 deletions(-)
 
 diff --git a/Documentation/devicetree/bindings/display/brcm,bcm2835-hdmi.yaml b/Documentation/devicetree/bindings/display/brcm,bcm2835-hdmi.yaml
-index 52b3cdac0bdf0..a9d24e1cf684d 100644
+index 52b3cdac0bdf..a9d24e1cf684 100644
 --- a/Documentation/devicetree/bindings/display/brcm,bcm2835-hdmi.yaml
 +++ b/Documentation/devicetree/bindings/display/brcm,bcm2835-hdmi.yaml
 @@ -11,24 +11,58 @@ maintainers:
@@ -395551,7 +395566,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  2 files changed, 150 insertions(+)
 
 diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
-index ec2a40447176c..f75167a77a8e3 100644
+index ec2a40447176..f75167a77a8e 100644
 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
 +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
 @@ -138,6 +138,46 @@
@@ -395602,7 +395617,7 @@ index ec2a40447176c..f75167a77a8e3 100644
  // Downstream rpi- changes
  
 diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi
-index 7cf1a9748f006..10f14e897eb16 100644
+index 7cf1a9748f00..10f14e897eb1 100644
 --- a/arch/arm/boot/dts/bcm2711.dtsi
 +++ b/arch/arm/boot/dts/bcm2711.dtsi
 @@ -31,6 +31,11 @@
@@ -395766,7 +395781,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  2 files changed, 48 insertions(+), 5 deletions(-)
 
 diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
-index f75167a77a8e3..83a8431d9e5fd 100644
+index f75167a77a8e..83a8431d9e5f 100644
 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
 +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
 @@ -182,6 +182,14 @@
@@ -395832,7 +395847,7 @@ index f75167a77a8e3..83a8431d9e5fd 100644
  	__overrides__ {
  		act_led_gpio = <&act_led>,"gpios:4";
 diff --git a/arch/arm/boot/dts/bcm2711-rpi.dtsi b/arch/arm/boot/dts/bcm2711-rpi.dtsi
-index 207c15f37a23b..e8b1e9279c671 100644
+index 207c15f37a23..e8b1e9279c67 100644
 --- a/arch/arm/boot/dts/bcm2711-rpi.dtsi
 +++ b/arch/arm/boot/dts/bcm2711-rpi.dtsi
 @@ -55,11 +55,6 @@
@@ -395874,7 +395889,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  create mode 100644 arch/arm/boot/dts/overlays/vc4-kms-v3d-pi4-overlay.dts
 
 diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile
-index 9e5e3ff0bf616..e19ec0b0b106a 100644
+index 9e5e3ff0bf61..e19ec0b0b106 100644
 --- a/arch/arm/boot/dts/overlays/Makefile
 +++ b/arch/arm/boot/dts/overlays/Makefile
 @@ -191,6 +191,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
@@ -395886,7 +395901,7 @@ index 9e5e3ff0bf616..e19ec0b0b106a 100644
  	w1-gpio.dtbo \
  	w1-gpio-pullup.dtbo \
 diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
-index 4f7790755fd82..03f6224d6f8d0 100644
+index 4f7790755fd8..03f6224d6f8d 100644
 --- a/arch/arm/boot/dts/overlays/README
 +++ b/arch/arm/boot/dts/overlays/README
 @@ -2684,6 +2684,20 @@ Params: cma-256                 CMA is 256MB (needs 1GB)
@@ -395912,7 +395927,7 @@ index 4f7790755fd82..03f6224d6f8d0 100644
          This uses GPIOs 2-21 (so no I2C), and activates the output 2-3 seconds
 diff --git a/arch/arm/boot/dts/overlays/vc4-kms-v3d-pi4-overlay.dts b/arch/arm/boot/dts/overlays/vc4-kms-v3d-pi4-overlay.dts
 new file mode 100644
-index 0000000000000..7d59a30a3662a
+index 000000000000..7d59a30a3662
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/vc4-kms-v3d-pi4-overlay.dts
 @@ -0,0 +1,183 @@
@@ -396119,7 +396134,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 10 insertions(+), 6 deletions(-)
 
 diff --git a/drivers/gpu/drm/drm_framebuffer.c b/drivers/gpu/drm/drm_framebuffer.c
-index 57564318ceeac..fa54768fe4d26 100644
+index 57564318ceea..fa54768fe4d2 100644
 --- a/drivers/gpu/drm/drm_framebuffer.c
 +++ b/drivers/gpu/drm/drm_framebuffer.c
 @@ -217,12 +217,16 @@ static int framebuffer_check(struct drm_device *dev,
@@ -396167,7 +396182,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 59 insertions(+), 24 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c
-index 54bdbeb46390d..f355ed9c3874c 100644
+index 54bdbeb46390..f355ed9c3874 100644
 --- a/drivers/gpu/drm/vc4/vc4_plane.c
 +++ b/drivers/gpu/drm/vc4/vc4_plane.c
 @@ -33,6 +33,7 @@ static const struct hvs_format {
@@ -396345,7 +396360,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c
-index f355ed9c3874c..3732b24a2a8a5 100644
+index f355ed9c3874..3732b24a2a8a 100644
 --- a/drivers/gpu/drm/vc4/vc4_plane.c
 +++ b/drivers/gpu/drm/vc4/vc4_plane.c
 @@ -1451,7 +1451,7 @@ struct drm_plane *vc4_plane_init(struct drm_device *dev,
@@ -396376,7 +396391,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_kms.c b/drivers/gpu/drm/vc4/vc4_kms.c
-index fdd1ed7540879..0dea148852d58 100644
+index fdd1ed754087..0dea148852d5 100644
 --- a/drivers/gpu/drm/vc4/vc4_kms.c
 +++ b/drivers/gpu/drm/vc4/vc4_kms.c
 @@ -579,6 +579,7 @@ static int
@@ -396414,7 +396429,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 1 insertion(+)
 
 diff --git a/arch/arm/boot/dts/bcm2711-rpi.dtsi b/arch/arm/boot/dts/bcm2711-rpi.dtsi
-index e8b1e9279c671..b113ca5bfbf6b 100644
+index e8b1e9279c67..b113ca5bfbf6 100644
 --- a/arch/arm/boot/dts/bcm2711-rpi.dtsi
 +++ b/arch/arm/boot/dts/bcm2711-rpi.dtsi
 @@ -34,6 +34,7 @@
@@ -396447,7 +396462,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  2 files changed, 14 insertions(+)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
-index 8bebdb45642ba..9c972433e894a 100644
+index 8bebdb45642b..9c972433e894 100644
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
 @@ -344,8 +344,16 @@ static void vc4_hdmi_set_audio_infoframe(struct drm_encoder *encoder)
@@ -396493,7 +396508,7 @@ index 8bebdb45642ba..9c972433e894a 100644
  	default:
  		break;
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.h b/drivers/gpu/drm/vc4/vc4_hdmi.h
-index 7a43abbe0cfae..6a775ec7616fc 100644
+index 7a43abbe0cfa..6a775ec7616f 100644
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.h
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.h
 @@ -101,6 +101,8 @@ struct vc4_hdmi_audio {
@@ -396526,7 +396541,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
-index 9c972433e894a..abf25910d8434 100644
+index 9c972433e894..abf25910d843 100644
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
 @@ -885,10 +885,11 @@ static int vc4_hdmi_audio_hw_params(struct snd_pcm_substream *substream,
@@ -396564,7 +396579,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 2 insertions(+)
 
 diff --git a/arch/arm/boot/dts/bcm2835-common.dtsi b/arch/arm/boot/dts/bcm2835-common.dtsi
-index fe1ab40c7f224..e269e75f0f57d 100644
+index fe1ab40c7f22..e269e75f0f57 100644
 --- a/arch/arm/boot/dts/bcm2835-common.dtsi
 +++ b/arch/arm/boot/dts/bcm2835-common.dtsi
 @@ -110,6 +110,8 @@
@@ -396593,7 +396608,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 4 insertions(+)
 
 diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi
-index 10f14e897eb16..141d9403fe275 100644
+index 10f14e897eb1..141d9403fe27 100644
 --- a/arch/arm/boot/dts/bcm2711.dtsi
 +++ b/arch/arm/boot/dts/bcm2711.dtsi
 @@ -348,6 +348,8 @@
@@ -396633,7 +396648,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
-index abf25910d8434..6a5e06314caea 100644
+index abf25910d843..6a5e06314cae 100644
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
 @@ -1097,6 +1097,7 @@ static int vc4_hdmi_audio_init(struct vc4_hdmi *vc4_hdmi)
@@ -396674,7 +396689,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  2 files changed, 49 insertions(+), 8 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
-index 6a5e06314caea..6757863e465d7 100644
+index 6a5e06314cae..6757863e465d 100644
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
 @@ -742,10 +742,44 @@ static const struct drm_encoder_helper_funcs vc4_hdmi_encoder_helper_funcs = {
@@ -396774,7 +396789,7 @@ index 6a5e06314caea..6757863e465d7 100644
  
  static const struct of_device_id vc4_hdmi_dt_match[] = {
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.h b/drivers/gpu/drm/vc4/vc4_hdmi.h
-index 6a775ec7616fc..9b80f9401d583 100644
+index 6a775ec7616f..9b80f9401d58 100644
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.h
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.h
 @@ -88,6 +88,12 @@ struct vc4_hdmi_variant {
@@ -396808,7 +396823,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 2 insertions(+)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
-index 6757863e465d7..a5f0ee70625c2 100644
+index 6757863e465d..a5f0ee70625c 100644
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
 @@ -1751,6 +1751,7 @@ static const struct vc4_hdmi_variant bcm2835_variant = {
@@ -396852,7 +396867,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 5 insertions(+), 4 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
-index a5f0ee70625c2..0e394d6b1200e 100644
+index a5f0ee70625c..0e394d6b1200 100644
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
 @@ -581,10 +581,11 @@ static void vc4_hdmi_encoder_enable(struct drm_encoder *encoder)
@@ -396899,7 +396914,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 1 insertion(+), 3 deletions(-)
 
 diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
-index 03f6224d6f8d0..88aa213e693f7 100644
+index 03f6224d6f8d..88aa213e693f 100644
 --- a/arch/arm/boot/dts/overlays/README
 +++ b/arch/arm/boot/dts/overlays/README
 @@ -2672,9 +2672,7 @@ Params: <None>
@@ -396936,7 +396951,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  4 files changed, 16 insertions(+)
 
 diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi
-index 141d9403fe275..5f3c9313d9a73 100644
+index 141d9403fe27..5f3c9313d9a7 100644
 --- a/arch/arm/boot/dts/bcm2711.dtsi
 +++ b/arch/arm/boot/dts/bcm2711.dtsi
 @@ -306,6 +306,7 @@
@@ -396948,7 +396963,7 @@ index 141d9403fe275..5f3c9313d9a73 100644
  		};
  
 diff --git a/drivers/gpu/drm/vc4/vc4_drv.h b/drivers/gpu/drm/vc4/vc4_drv.h
-index 48d96ae391e02..9e825c81ad0cd 100644
+index 48d96ae391e0..9e825c81ad0c 100644
 --- a/drivers/gpu/drm/vc4/vc4_drv.h
 +++ b/drivers/gpu/drm/vc4/vc4_drv.h
 @@ -326,6 +326,8 @@ struct vc4_hvs {
@@ -396961,7 +396976,7 @@ index 48d96ae391e02..9e825c81ad0cd 100644
  	 * list.  Units are dwords.
  	 */
 diff --git a/drivers/gpu/drm/vc4/vc4_hvs.c b/drivers/gpu/drm/vc4/vc4_hvs.c
-index 650d4d9a5980c..59198019aa1d9 100644
+index 650d4d9a5980..59198019aa1d 100644
 --- a/drivers/gpu/drm/vc4/vc4_hvs.c
 +++ b/drivers/gpu/drm/vc4/vc4_hvs.c
 @@ -19,6 +19,7 @@
@@ -396986,7 +397001,7 @@ index 650d4d9a5980c..59198019aa1d9 100644
  	if (hvs_version >= 0x40)
  		hvs->hvs5 = true;
 diff --git a/drivers/gpu/drm/vc4/vc4_kms.c b/drivers/gpu/drm/vc4/vc4_kms.c
-index 0dea148852d58..20b328d7e43ba 100644
+index 0dea148852d5..20b328d7e43b 100644
 --- a/drivers/gpu/drm/vc4/vc4_kms.c
 +++ b/drivers/gpu/drm/vc4/vc4_kms.c
 @@ -13,6 +13,7 @@
@@ -397042,7 +397057,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_kms.c b/drivers/gpu/drm/vc4/vc4_kms.c
-index 20b328d7e43ba..7f857af77898e 100644
+index 20b328d7e43b..7f857af77898 100644
 --- a/drivers/gpu/drm/vc4/vc4_kms.c
 +++ b/drivers/gpu/drm/vc4/vc4_kms.c
 @@ -239,7 +239,8 @@ vc4_atomic_complete_commit(struct drm_atomic_state *state)
@@ -397084,7 +397099,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 5 insertions(+), 3 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_drv.c b/drivers/gpu/drm/vc4/vc4_drv.c
-index 67235aee35070..68f9db6c4c878 100644
+index 67235aee3507..68f9db6c4c87 100644
 --- a/drivers/gpu/drm/vc4/vc4_drv.c
 +++ b/drivers/gpu/drm/vc4/vc4_drv.c
 @@ -291,9 +291,11 @@ static int vc4_drm_bind(struct device *dev)
@@ -397122,7 +397137,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
-index 0e394d6b1200e..6621eb3e01c6e 100644
+index 0e394d6b1200..6621eb3e01c6 100644
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
 @@ -1198,7 +1198,7 @@ static int vc4_hdmi_audio_init(struct vc4_hdmi *vc4_hdmi)
@@ -397155,7 +397170,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 11 insertions(+), 9 deletions(-)
 
 diff --git a/drivers/i2c/busses/i2c-brcmstb.c b/drivers/i2c/busses/i2c-brcmstb.c
-index d2cde8e2a3703..ba766d24219ef 100644
+index d2cde8e2a370..ba766d24219e 100644
 --- a/drivers/i2c/busses/i2c-brcmstb.c
 +++ b/drivers/i2c/busses/i2c-brcmstb.c
 @@ -647,20 +647,22 @@ static int brcmstb_i2c_probe(struct platform_device *pdev)
@@ -397210,7 +397225,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi
-index 5f3c9313d9a73..3ecff12736adc 100644
+index 5f3c9313d9a7..3ecff12736ad 100644
 --- a/arch/arm/boot/dts/bcm2711.dtsi
 +++ b/arch/arm/boot/dts/bcm2711.dtsi
 @@ -358,7 +358,7 @@
@@ -397249,7 +397264,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  1 file changed, 11 insertions(+), 3 deletions(-)
 
 diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
-index 88aa213e693f7..5832c5f00230f 100644
+index 88aa213e693f..5832c5f00230 100644
 --- a/arch/arm/boot/dts/overlays/README
 +++ b/arch/arm/boot/dts/overlays/README
 @@ -2037,12 +2037,20 @@ Name:   rpi-poe
@@ -397299,7 +397314,7 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi_phy.c b/drivers/gpu/drm/vc4/vc4_hdmi_phy.c
-index a436fabbc1289..732d8a0e5a1cd 100644
+index a436fabbc128..732d8a0e5a1c 100644
 --- a/drivers/gpu/drm/vc4/vc4_hdmi_phy.c
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi_phy.c
 @@ -192,8 +192,8 @@ static u32 phy_get_rm_offset(unsigned long long vco_freq)
@@ -397334,7 +397349,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  create mode 100644 arch/arm/boot/dts/overlays/overlay_map.dts
 
 diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile
-index e19ec0b0b106a..e351ac0ab12c2 100644
+index e19ec0b0b106..e351ac0ab12c 100644
 --- a/arch/arm/boot/dts/overlays/Makefile
 +++ b/arch/arm/boot/dts/overlays/Makefile
 @@ -1,5 +1,7 @@
@@ -397347,7 +397362,7 @@ index e19ec0b0b106a..e351ac0ab12c2 100644
  	adau1977-adc.dtbo \
 diff --git a/arch/arm/boot/dts/overlays/overlay_map.dts b/arch/arm/boot/dts/overlays/overlay_map.dts
 new file mode 100644
-index 0000000000000..e9b04b954d55c
+index 000000000000..e9b04b954d55
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/overlay_map.dts
 @@ -0,0 +1,71 @@
@@ -397456,7 +397471,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  delete mode 100644 arch/arm/boot/dts/overlays/pi3-miniuart-bt-overlay.dts
 
 diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile
-index e351ac0ab12c2..dbc525d69fe3a 100644
+index e351ac0ab12c..dbc525d69fe3 100644
 --- a/arch/arm/boot/dts/overlays/Makefile
 +++ b/arch/arm/boot/dts/overlays/Makefile
 @@ -27,7 +27,6 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
@@ -397489,7 +397504,7 @@ index e351ac0ab12c2..dbc525d69fe3a 100644
  	piglow.dtbo \
  	piscreen.dtbo \
 diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
-index 5832c5f00230f..7ff74b1558279 100644
+index 5832c5f00230..7ff74b155827 100644
 --- a/arch/arm/boot/dts/overlays/README
 +++ b/arch/arm/boot/dts/overlays/README
 @@ -1288,11 +1288,8 @@ Params: pins_0_1                Use pins 0 and 1 (default)
@@ -397522,7 +397537,7 @@ index 5832c5f00230f..7ff74b1558279 100644
  Name:   i2c3
 diff --git a/arch/arm/boot/dts/overlays/bmp085_i2c-sensor-overlay.dts b/arch/arm/boot/dts/overlays/bmp085_i2c-sensor-overlay.dts
 deleted file mode 100644
-index 26dbbdd03ce5a..0000000000000
+index 26dbbdd03ce5..000000000000
 --- a/arch/arm/boot/dts/overlays/bmp085_i2c-sensor-overlay.dts
 +++ /dev/null
 @@ -1,23 +0,0 @@
@@ -397551,7 +397566,7 @@ index 26dbbdd03ce5a..0000000000000
 -};
 diff --git a/arch/arm/boot/dts/overlays/i2c0-bcm2708-overlay.dts b/arch/arm/boot/dts/overlays/i2c0-bcm2708-overlay.dts
 deleted file mode 100644
-index 02f7dca9b71e6..0000000000000
+index 02f7dca9b71e..000000000000
 --- a/arch/arm/boot/dts/overlays/i2c0-bcm2708-overlay.dts
 +++ /dev/null
 @@ -1,14 +0,0 @@
@@ -397571,7 +397586,7 @@ index 02f7dca9b71e6..0000000000000
 -};
 diff --git a/arch/arm/boot/dts/overlays/i2c1-bcm2708-overlay.dts b/arch/arm/boot/dts/overlays/i2c1-bcm2708-overlay.dts
 deleted file mode 100644
-index 09d8b16a6256d..0000000000000
+index 09d8b16a6256..000000000000
 --- a/arch/arm/boot/dts/overlays/i2c1-bcm2708-overlay.dts
 +++ /dev/null
 @@ -1,9 +0,0 @@
@@ -397585,7 +397600,7 @@ index 09d8b16a6256d..0000000000000
 -	};
 -};
 diff --git a/arch/arm/boot/dts/overlays/overlay_map.dts b/arch/arm/boot/dts/overlays/overlay_map.dts
-index e9b04b954d55c..113098ea69083 100644
+index e9b04b954d55..113098ea6908 100644
 --- a/arch/arm/boot/dts/overlays/overlay_map.dts
 +++ b/arch/arm/boot/dts/overlays/overlay_map.dts
 @@ -1,6 +1,18 @@
@@ -397653,28 +397668,28 @@ index e9b04b954d55c..113098ea69083 100644
  };
 diff --git a/arch/arm/boot/dts/overlays/pi3-act-led-overlay.dts b/arch/arm/boot/dts/overlays/pi3-act-led-overlay.dts
 deleted file mode 100644
-index aedfc90e8a31d..0000000000000
+index aedfc90e8a31..000000000000
 --- a/arch/arm/boot/dts/overlays/pi3-act-led-overlay.dts
 +++ /dev/null
 @@ -1 +0,0 @@
 -#include "act-led-overlay.dts"
 diff --git a/arch/arm/boot/dts/overlays/pi3-disable-bt-overlay.dts b/arch/arm/boot/dts/overlays/pi3-disable-bt-overlay.dts
 deleted file mode 100644
-index e09a49295236b..0000000000000
+index e09a49295236..000000000000
 --- a/arch/arm/boot/dts/overlays/pi3-disable-bt-overlay.dts
 +++ /dev/null
 @@ -1 +0,0 @@
 -#include "disable-bt-overlay.dts"
 diff --git a/arch/arm/boot/dts/overlays/pi3-disable-wifi-overlay.dts b/arch/arm/boot/dts/overlays/pi3-disable-wifi-overlay.dts
 deleted file mode 100644
-index b61b69c14f37c..0000000000000
+index b61b69c14f37..000000000000
 --- a/arch/arm/boot/dts/overlays/pi3-disable-wifi-overlay.dts
 +++ /dev/null
 @@ -1 +0,0 @@
 -#include "disable-wifi-overlay.dts"
 diff --git a/arch/arm/boot/dts/overlays/pi3-miniuart-bt-overlay.dts b/arch/arm/boot/dts/overlays/pi3-miniuart-bt-overlay.dts
 deleted file mode 100644
-index 94c14267716eb..0000000000000
+index 94c14267716e..000000000000
 --- a/arch/arm/boot/dts/overlays/pi3-miniuart-bt-overlay.dts
 +++ /dev/null
 @@ -1 +0,0 @@
@@ -397694,7 +397709,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  1 file changed, 9 insertions(+)
 
 diff --git a/arch/arm/boot/dts/overlays/overlay_map.dts b/arch/arm/boot/dts/overlays/overlay_map.dts
-index 113098ea69083..c4f7f33fb5da5 100644
+index 113098ea6908..c4f7f33fb5da 100644
 --- a/arch/arm/boot/dts/overlays/overlay_map.dts
 +++ b/arch/arm/boot/dts/overlays/overlay_map.dts
 @@ -108,4 +108,13 @@
@@ -397733,7 +397748,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  create mode 100644 arch/arm/boot/dts/overlays/upstream-pi4-overlay.dts
 
 diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile
-index dbc525d69fe3a..658fca1dc68e2 100644
+index dbc525d69fe3..658fca1dc68e 100644
 --- a/arch/arm/boot/dts/overlays/Makefile
 +++ b/arch/arm/boot/dts/overlays/Makefile
 @@ -183,6 +183,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
@@ -397745,7 +397760,7 @@ index dbc525d69fe3a..658fca1dc68e2 100644
  	vc4-kms-kippah-7inch.dtbo \
  	vc4-kms-v3d.dtbo \
 diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
-index 7ff74b1558279..0db75e63f6e16 100644
+index 7ff74b155827..0db75e63f6e1 100644
 --- a/arch/arm/boot/dts/overlays/README
 +++ b/arch/arm/boot/dts/overlays/README
 @@ -2653,6 +2653,13 @@ Info:   This overlay has been deprecated and removed because it is no longer
@@ -397763,7 +397778,7 @@ index 7ff74b1558279..0db75e63f6e16 100644
  Info:   Enable Eric Anholt's DRM VC4 V3D driver on top of the dispmanx
          display stack.
 diff --git a/arch/arm/boot/dts/overlays/overlay_map.dts b/arch/arm/boot/dts/overlays/overlay_map.dts
-index c4f7f33fb5da5..a20c0e079cc86 100644
+index c4f7f33fb5da..a20c0e079cc8 100644
 --- a/arch/arm/boot/dts/overlays/overlay_map.dts
 +++ b/arch/arm/boot/dts/overlays/overlay_map.dts
 @@ -105,10 +105,19 @@
@@ -397788,7 +397803,7 @@ index c4f7f33fb5da5..a20c0e079cc86 100644
  		bcm2711 = "vc4-kms-v3d-pi4";
 diff --git a/arch/arm/boot/dts/overlays/upstream-pi4-overlay.dts b/arch/arm/boot/dts/overlays/upstream-pi4-overlay.dts
 new file mode 100644
-index 0000000000000..2db343ef2237f
+index 000000000000..2db343ef2237
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/upstream-pi4-overlay.dts
 @@ -0,0 +1,161 @@
@@ -397972,7 +397987,7 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/clk/bcm/clk-raspberrypi.c b/drivers/clk/bcm/clk-raspberrypi.c
-index 86b18f8cc98d8..eb1844148af96 100644
+index 86b18f8cc98d..eb1844148af9 100644
 --- a/drivers/clk/bcm/clk-raspberrypi.c
 +++ b/drivers/clk/bcm/clk-raspberrypi.c
 @@ -76,7 +76,7 @@ static int raspberrypi_clock_property(struct rpi_firmware *firmware,
@@ -398005,7 +398020,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  4 files changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig
-index 9131effbfa0c8..0dbec1e55c900 100644
+index 9131effbfa0c..0dbec1e55c90 100644
 --- a/arch/arm/configs/bcm2709_defconfig
 +++ b/arch/arm/configs/bcm2709_defconfig
 @@ -1303,7 +1303,6 @@ CONFIG_RPI_AXIPERF=m
@@ -398025,7 +398040,7 @@ index 9131effbfa0c8..0dbec1e55c900 100644
  CONFIG_QFMT_V1=m
  CONFIG_QFMT_V2=m
 diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig
-index e4ea63553dc06..ffe4065ba6943 100644
+index e4ea63553dc0..ffe4065ba694 100644
 --- a/arch/arm/configs/bcm2711_defconfig
 +++ b/arch/arm/configs/bcm2711_defconfig
 @@ -1304,7 +1304,6 @@ CONFIG_RPI_AXIPERF=m
@@ -398045,7 +398060,7 @@ index e4ea63553dc06..ffe4065ba6943 100644
  CONFIG_QFMT_V1=m
  CONFIG_QFMT_V2=m
 diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig
-index bf0551437fd7f..bd631b897a386 100644
+index bf0551437fd7..bd631b897a38 100644
 --- a/arch/arm64/configs/bcm2711_defconfig
 +++ b/arch/arm64/configs/bcm2711_defconfig
 @@ -1333,7 +1333,6 @@ CONFIG_RPI_AXIPERF=m
@@ -398065,7 +398080,7 @@ index bf0551437fd7f..bd631b897a386 100644
  CONFIG_QFMT_V1=m
  CONFIG_QFMT_V2=m
 diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig
-index b40477e1553be..544c16a75b344 100644
+index b40477e1553b..544c16a75b34 100644
 --- a/arch/arm64/configs/bcmrpi3_defconfig
 +++ b/arch/arm64/configs/bcmrpi3_defconfig
 @@ -1135,7 +1135,6 @@ CONFIG_PWM_PCA9685=m
@@ -398114,7 +398129,7 @@ Signed-off-by: Matt Flax <flatmax@flatmax.org>
  create mode 100644 sound/soc/bcm/audioinjector-isolated-soundcard.c
 
 diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile
-index 658fca1dc68e2..3f60596cdbeb2 100644
+index 658fca1dc68e..3f60596cdbeb 100644
 --- a/arch/arm/boot/dts/overlays/Makefile
 +++ b/arch/arm/boot/dts/overlays/Makefile
 @@ -22,6 +22,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
@@ -398126,7 +398141,7 @@ index 658fca1dc68e2..3f60596cdbeb2 100644
  	audioinjector-wm8731-audio.dtbo \
  	audiosense-pi.dtbo \
 diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
-index 0db75e63f6e16..38459f67ddcf7 100644
+index 0db75e63f6e1..38459f67ddcf 100644
 --- a/arch/arm/boot/dts/overlays/README
 +++ b/arch/arm/boot/dts/overlays/README
 @@ -505,6 +505,12 @@ Params: non-stop-clocks         Keeps the clocks running even when the stream
@@ -398144,7 +398159,7 @@ index 0db75e63f6e16..38459f67ddcf7 100644
  Load:   dtoverlay=audioinjector-ultra
 diff --git a/arch/arm/boot/dts/overlays/audioinjector-isolated-soundcard-overlay.dts b/arch/arm/boot/dts/overlays/audioinjector-isolated-soundcard-overlay.dts
 new file mode 100644
-index 0000000000000..63e05cf9665d6
+index 000000000000..63e05cf9665d
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/audioinjector-isolated-soundcard-overlay.dts
 @@ -0,0 +1,55 @@
@@ -398204,7 +398219,7 @@ index 0000000000000..63e05cf9665d6
 +	};
 +};
 diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig
-index 0dbec1e55c900..12ea7ed480878 100644
+index 0dbec1e55c90..12ea7ed48087 100644
 --- a/arch/arm/configs/bcm2709_defconfig
 +++ b/arch/arm/configs/bcm2709_defconfig
 @@ -970,6 +970,7 @@ CONFIG_SND_BCM2708_SOC_I_SABRE_Q2M=m
@@ -398224,7 +398239,7 @@ index 0dbec1e55c900..12ea7ed480878 100644
  CONFIG_SND_SOC_SPDIF=m
  CONFIG_SND_SOC_WM8804_I2C=m
 diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig
-index ffe4065ba6943..13d386f7f5127 100644
+index ffe4065ba694..13d386f7f512 100644
 --- a/arch/arm/configs/bcm2711_defconfig
 +++ b/arch/arm/configs/bcm2711_defconfig
 @@ -947,6 +947,7 @@ CONFIG_SND_BCM2708_SOC_I_SABRE_Q2M=m
@@ -398244,7 +398259,7 @@ index ffe4065ba6943..13d386f7f5127 100644
  CONFIG_SND_SOC_SPDIF=m
  CONFIG_SND_SOC_WM8804_I2C=m
 diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig
-index 7cf9f2f9e1cc6..414daa6205a3f 100644
+index 7cf9f2f9e1cc..414daa6205a3 100644
 --- a/arch/arm/configs/bcmrpi_defconfig
 +++ b/arch/arm/configs/bcmrpi_defconfig
 @@ -962,6 +962,7 @@ CONFIG_SND_BCM2708_SOC_I_SABRE_Q2M=m
@@ -398264,7 +398279,7 @@ index 7cf9f2f9e1cc6..414daa6205a3f 100644
  CONFIG_SND_SOC_SPDIF=m
  CONFIG_SND_SOC_WM8804_I2C=m
 diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig
-index bd631b897a386..24260d0d445a0 100644
+index bd631b897a38..24260d0d445a 100644
 --- a/arch/arm64/configs/bcm2711_defconfig
 +++ b/arch/arm64/configs/bcm2711_defconfig
 @@ -977,6 +977,7 @@ CONFIG_SND_BCM2708_SOC_I_SABRE_Q2M=m
@@ -398284,7 +398299,7 @@ index bd631b897a386..24260d0d445a0 100644
  CONFIG_SND_SOC_SPDIF=m
  CONFIG_SND_SOC_WM8804_I2C=m
 diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig
-index 544c16a75b344..a24cbb4837b8f 100644
+index 544c16a75b34..a24cbb4837b8 100644
 --- a/arch/arm64/configs/bcmrpi3_defconfig
 +++ b/arch/arm64/configs/bcmrpi3_defconfig
 @@ -839,6 +839,7 @@ CONFIG_SND_BCM2708_SOC_IQAUDIO_DIGI=m
@@ -398304,7 +398319,7 @@ index 544c16a75b344..a24cbb4837b8f 100644
  CONFIG_SND_SOC_WM8804_I2C=m
  CONFIG_SND_SIMPLE_CARD=m
 diff --git a/sound/soc/bcm/Kconfig b/sound/soc/bcm/Kconfig
-index 0067bae41e48f..fdaccbfd79ce5 100644
+index 0067bae41e48..fdaccbfd79ce 100644
 --- a/sound/soc/bcm/Kconfig
 +++ b/sound/soc/bcm/Kconfig
 @@ -192,6 +192,13 @@ config SND_AUDIOINJECTOR_OCTO_SOUNDCARD
@@ -398322,7 +398337,7 @@ index 0067bae41e48f..fdaccbfd79ce5 100644
  	tristate "Support for AudioSense Add-On Soundcard"
  	depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
 diff --git a/sound/soc/bcm/Makefile b/sound/soc/bcm/Makefile
-index 6ab480dc25661..cab3926909740 100644
+index 6ab480dc2566..cab392690974 100644
 --- a/sound/soc/bcm/Makefile
 +++ b/sound/soc/bcm/Makefile
 @@ -27,6 +27,7 @@ snd-soc-iqaudio-dac-objs := iqaudio-dac.o
@@ -398343,7 +398358,7 @@ index 6ab480dc25661..cab3926909740 100644
  obj-$(CONFIG_SND_BCM2708_SOC_DIONAUDIO_LOCO) += snd-soc-dionaudio-loco.o
 diff --git a/sound/soc/bcm/audioinjector-isolated-soundcard.c b/sound/soc/bcm/audioinjector-isolated-soundcard.c
 new file mode 100644
-index 0000000000000..652464658fef9
+index 000000000000..652464658fef
 --- /dev/null
 +++ b/sound/soc/bcm/audioinjector-isolated-soundcard.c
 @@ -0,0 +1,183 @@
@@ -398547,7 +398562,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  1 file changed, 3 insertions(+)
 
 diff --git a/arch/arm/boot/dts/overlays/i2c-gpio-overlay.dts b/arch/arm/boot/dts/overlays/i2c-gpio-overlay.dts
-index 39e7bc5fa9d88..e94053b55610a 100644
+index 39e7bc5fa9d8..e94053b55610 100644
 --- a/arch/arm/boot/dts/overlays/i2c-gpio-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/i2c-gpio-overlay.dts
 @@ -9,6 +9,9 @@
@@ -398584,7 +398599,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  1 file changed, 1 insertion(+)
 
 diff --git a/scripts/gcc-plugin.sh b/scripts/gcc-plugin.sh
-index d3caefe53eab9..6ee109e5d266d 100755
+index d3caefe53eab..6ee109e5d266 100755
 --- a/scripts/gcc-plugin.sh
 +++ b/scripts/gcc-plugin.sh
 @@ -1,5 +1,6 @@
@@ -398613,7 +398628,7 @@ Signed-off-by: AMuszkat <ariel.muszkat@gmail.com>
  5 files changed, 5 insertions(+)
 
 diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig
-index 12ea7ed480878..030e57d27fbe6 100644
+index 12ea7ed48087..030e57d27fbe 100644
 --- a/arch/arm/configs/bcm2709_defconfig
 +++ b/arch/arm/configs/bcm2709_defconfig
 @@ -989,6 +989,7 @@ CONFIG_SND_SOC_ADAU7002=m
@@ -398625,7 +398640,7 @@ index 12ea7ed480878..030e57d27fbe6 100644
  CONFIG_SND_SOC_WM8804_I2C=m
  CONFIG_SND_SIMPLE_CARD=m
 diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig
-index 13d386f7f5127..ca5ca09173906 100644
+index 13d386f7f512..ca5ca0917390 100644
 --- a/arch/arm/configs/bcm2711_defconfig
 +++ b/arch/arm/configs/bcm2711_defconfig
 @@ -966,6 +966,7 @@ CONFIG_SND_SOC_ADAU7002=m
@@ -398637,7 +398652,7 @@ index 13d386f7f5127..ca5ca09173906 100644
  CONFIG_SND_SOC_WM8804_I2C=m
  CONFIG_SND_SIMPLE_CARD=m
 diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig
-index 414daa6205a3f..d610d48707a34 100644
+index 414daa6205a3..d610d48707a3 100644
 --- a/arch/arm/configs/bcmrpi_defconfig
 +++ b/arch/arm/configs/bcmrpi_defconfig
 @@ -981,6 +981,7 @@ CONFIG_SND_SOC_ADAU7002=m
@@ -398649,7 +398664,7 @@ index 414daa6205a3f..d610d48707a34 100644
  CONFIG_SND_SOC_WM8804_I2C=m
  CONFIG_SND_SIMPLE_CARD=m
 diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig
-index 24260d0d445a0..818e84acbf539 100644
+index 24260d0d445a..818e84acbf53 100644
 --- a/arch/arm64/configs/bcm2711_defconfig
 +++ b/arch/arm64/configs/bcm2711_defconfig
 @@ -996,6 +996,7 @@ CONFIG_SND_SOC_ADAU7002=m
@@ -398661,7 +398676,7 @@ index 24260d0d445a0..818e84acbf539 100644
  CONFIG_SND_SOC_WM8804_I2C=m
  CONFIG_SND_SIMPLE_CARD=m
 diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig
-index a24cbb4837b8f..34aa78d5d814d 100644
+index a24cbb4837b8..34aa78d5d814 100644
 --- a/arch/arm64/configs/bcmrpi3_defconfig
 +++ b/arch/arm64/configs/bcmrpi3_defconfig
 @@ -851,6 +851,7 @@ CONFIG_SND_SOC_ADAU1701=m
@@ -398690,7 +398705,7 @@ Signed-off-by: AMuszkat <ariel.muszkat@gmail.com>
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/sound/soc/codecs/ma120x0p.c b/sound/soc/codecs/ma120x0p.c
-index 39c74b17e0077..e1591b6aff431 100644
+index 39c74b17e007..e1591b6aff43 100644
 --- a/sound/soc/codecs/ma120x0p.c
 +++ b/sound/soc/codecs/ma120x0p.c
 @@ -1002,7 +1002,7 @@ static struct snd_soc_dai_driver ma120x0p_dai = {
@@ -398750,7 +398765,7 @@ Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c
-index 66d46b39af02a..57d2abbfefd4a 100644
+index 66d46b39af02..57d2abbfefd4 100644
 --- a/arch/arm64/mm/init.c
 +++ b/arch/arm64/mm/init.c
 @@ -85,7 +85,7 @@ static void __init reserve_crashkernel(void)
@@ -398826,7 +398841,7 @@ Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
  1 file changed, 11 insertions(+), 14 deletions(-)
 
 diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c
-index 57d2abbfefd4a..91e4012b6481d 100644
+index 57d2abbfefd4..91e4012b6481 100644
 --- a/arch/arm64/mm/init.c
 +++ b/arch/arm64/mm/init.c
 @@ -208,15 +208,14 @@ static void __init zone_sizes_init(unsigned long min, unsigned long max)
@@ -398912,7 +398927,7 @@ Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
  2 files changed, 26 insertions(+), 19 deletions(-)
 
 diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi
-index 3ecff12736adc..72cbd23c9796d 100644
+index 3ecff12736ad..72cbd23c9796 100644
 --- a/arch/arm/boot/dts/bcm2711.dtsi
 +++ b/arch/arm/boot/dts/bcm2711.dtsi
 @@ -12,25 +12,6 @@
@@ -398962,7 +398977,7 @@ index 3ecff12736adc..72cbd23c9796d 100644
  	compatible = "brcm,bcm2711-i2c", "brcm,bcm2835-i2c";
  	interrupts = <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>;
 diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi
-index 202a61f574c73..adb59ca3df6c6 100644
+index 202a61f574c7..adb59ca3df6c 100644
 --- a/arch/arm/boot/dts/bcm283x.dtsi
 +++ b/arch/arm/boot/dts/bcm283x.dtsi
 @@ -30,6 +30,19 @@
@@ -399011,7 +399026,7 @@ Signed-off-by: Christoph Hellwig <hch@lst.de>
  1 file changed, 8 insertions(+), 1 deletion(-)
 
 diff --git a/kernel/dma/contiguous.c b/kernel/dma/contiguous.c
-index 69cfb4345388c..8477bf549dc91 100644
+index 69cfb4345388..8477bf549dc9 100644
 --- a/kernel/dma/contiguous.c
 +++ b/kernel/dma/contiguous.c
 @@ -301,9 +301,16 @@ static int __init rmem_cma_setup(struct reserved_mem *rmem)
@@ -399059,7 +399074,7 @@ Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
  1 file changed, 1 insertion(+), 5 deletions(-)
 
 diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
-index 83a8431d9e5fd..996112381eefb 100644
+index 83a8431d9e5f..996112381eef 100644
 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
 +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
 @@ -195,7 +195,7 @@
@@ -399113,7 +399128,7 @@ Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
  create mode 100644 arch/arm/boot/dts/overlays/cma-overlay.dts
 
 diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile
-index 3f60596cdbeb2..96f96c98561e5 100644
+index 3f60596cdbeb..96f96c98561e 100644
 --- a/arch/arm/boot/dts/overlays/Makefile
 +++ b/arch/arm/boot/dts/overlays/Makefile
 @@ -28,6 +28,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
@@ -399125,7 +399140,7 @@ index 3f60596cdbeb2..96f96c98561e5 100644
  	dionaudio-loco.dtbo \
  	dionaudio-loco-v2.dtbo \
 diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
-index 38459f67ddcf7..1df13b1fbc513 100644
+index 38459f67ddcf..1df13b1fbc51 100644
 --- a/arch/arm/boot/dts/overlays/README
 +++ b/arch/arm/boot/dts/overlays/README
 @@ -554,6 +554,19 @@ Info:   This overlay is now deprecated - see i2c-sensor
@@ -399177,7 +399192,7 @@ index 38459f67ddcf7..1df13b1fbc513 100644
          audio1                  Enable or disable audio over HDMI1 (default
 diff --git a/arch/arm/boot/dts/overlays/cma-overlay.dts b/arch/arm/boot/dts/overlays/cma-overlay.dts
 new file mode 100644
-index 0000000000000..4fbdf161672e3
+index 000000000000..4fbdf161672e
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/cma-overlay.dts
 @@ -0,0 +1,32 @@
@@ -399214,7 +399229,7 @@ index 0000000000000..4fbdf161672e3
 +	};
 +};
 diff --git a/arch/arm/boot/dts/overlays/upstream-overlay.dts b/arch/arm/boot/dts/overlays/upstream-overlay.dts
-index 96837d962188c..4d46790d81c9c 100644
+index 96837d962188..4d46790d81c9 100644
 --- a/arch/arm/boot/dts/overlays/upstream-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/upstream-overlay.dts
 @@ -1,4 +1,4 @@
@@ -399354,7 +399369,7 @@ index 96837d962188c..4d46790d81c9c 100644
  		#address-cells = <1>;
  		#size-cells = <1>;
 diff --git a/arch/arm/boot/dts/overlays/upstream-pi4-overlay.dts b/arch/arm/boot/dts/overlays/upstream-pi4-overlay.dts
-index 2db343ef2237f..428aa5dcc38f0 100644
+index 2db343ef2237..428aa5dcc38f 100644
 --- a/arch/arm/boot/dts/overlays/upstream-pi4-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/upstream-pi4-overlay.dts
 @@ -8,144 +8,120 @@
@@ -399524,7 +399539,7 @@ index 2db343ef2237f..428aa5dcc38f0 100644
  		#address-cells = <1>;
  		#size-cells = <1>;
 diff --git a/arch/arm/boot/dts/overlays/vc4-fkms-v3d-overlay.dts b/arch/arm/boot/dts/overlays/vc4-fkms-v3d-overlay.dts
-index d9af97c8414f0..ca344492bed86 100644
+index d9af97c8414f..ca344492bed8 100644
 --- a/arch/arm/boot/dts/overlays/vc4-fkms-v3d-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/vc4-fkms-v3d-overlay.dts
 @@ -5,77 +5,36 @@
@@ -399611,7 +399626,7 @@ index d9af97c8414f0..ca344492bed86 100644
 -	};
  };
 diff --git a/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts b/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts
-index c5f687e8bcb9a..b40aa1d8f432b 100644
+index c5f687e8bcb9..b40aa1d8f432 100644
 --- a/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts
 @@ -7,108 +7,75 @@
@@ -399772,7 +399787,7 @@ index c5f687e8bcb9a..b40aa1d8f432b 100644
  	};
  };
 diff --git a/arch/arm/boot/dts/overlays/vc4-kms-v3d-pi4-overlay.dts b/arch/arm/boot/dts/overlays/vc4-kms-v3d-pi4-overlay.dts
-index 7d59a30a3662a..134ad9ecbd4ab 100644
+index 7d59a30a3662..134ad9ecbd4a 100644
 --- a/arch/arm/boot/dts/overlays/vc4-kms-v3d-pi4-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/vc4-kms-v3d-pi4-overlay.dts
 @@ -7,164 +7,131 @@
@@ -399997,7 +400012,7 @@ Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
  1 file changed, 1 insertion(+)
 
 diff --git a/arch/arm/boot/dts/bcm2835-rpi.dtsi b/arch/arm/boot/dts/bcm2835-rpi.dtsi
-index 394c8a71b13be..fd2c766e0f710 100644
+index 394c8a71b13b..fd2c766e0f71 100644
 --- a/arch/arm/boot/dts/bcm2835-rpi.dtsi
 +++ b/arch/arm/boot/dts/bcm2835-rpi.dtsi
 @@ -15,6 +15,7 @@
@@ -400032,7 +400047,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  1 file changed, 5 insertions(+)
 
 diff --git a/arch/arm/boot/dts/bcm2711-rpi.dtsi b/arch/arm/boot/dts/bcm2711-rpi.dtsi
-index b113ca5bfbf6b..f27cb47448b11 100644
+index b113ca5bfbf6..f27cb47448b1 100644
 --- a/arch/arm/boot/dts/bcm2711-rpi.dtsi
 +++ b/arch/arm/boot/dts/bcm2711-rpi.dtsi
 @@ -45,6 +45,11 @@
@@ -400065,7 +400080,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  4 files changed, 4 insertions(+)
 
 diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig
-index 030e57d27fbe6..1542ea5af327e 100644
+index 030e57d27fbe..1542ea5af327 100644
 --- a/arch/arm/configs/bcm2709_defconfig
 +++ b/arch/arm/configs/bcm2709_defconfig
 @@ -670,6 +670,7 @@ CONFIG_PPS=m
@@ -400077,7 +400092,7 @@ index 030e57d27fbe6..1542ea5af327e 100644
  CONFIG_GPIO_PCA953X=m
  CONFIG_GPIO_PCF857X=m
 diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig
-index ca5ca09173906..393bf162e73bb 100644
+index ca5ca0917390..393bf162e73b 100644
 --- a/arch/arm/configs/bcm2711_defconfig
 +++ b/arch/arm/configs/bcm2711_defconfig
 @@ -643,6 +643,7 @@ CONFIG_PPS=m
@@ -400089,7 +400104,7 @@ index ca5ca09173906..393bf162e73bb 100644
  CONFIG_GPIO_PCA953X=m
  CONFIG_GPIO_PCF857X=m
 diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig
-index d610d48707a34..8eddf1eec9b7a 100644
+index d610d48707a3..8eddf1eec9b7 100644
 --- a/arch/arm/configs/bcmrpi_defconfig
 +++ b/arch/arm/configs/bcmrpi_defconfig
 @@ -663,6 +663,7 @@ CONFIG_PPS=m
@@ -400101,7 +400116,7 @@ index d610d48707a34..8eddf1eec9b7a 100644
  CONFIG_GPIO_PCF857X=m
  CONFIG_GPIO_ARIZONA=m
 diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig
-index 818e84acbf539..dac95c7348288 100644
+index 818e84acbf53..dac95c734828 100644
 --- a/arch/arm64/configs/bcm2711_defconfig
 +++ b/arch/arm64/configs/bcm2711_defconfig
 @@ -675,6 +675,7 @@ CONFIG_SPI_GPIO=m
@@ -400127,7 +400142,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/arch/arm/boot/dts/bcm2711-rpi.dtsi b/arch/arm/boot/dts/bcm2711-rpi.dtsi
-index f27cb47448b11..4bc44b2ad211f 100644
+index f27cb47448b1..4bc44b2ad211 100644
 --- a/arch/arm/boot/dts/bcm2711-rpi.dtsi
 +++ b/arch/arm/boot/dts/bcm2711-rpi.dtsi
 @@ -69,7 +69,9 @@
@@ -400160,7 +400175,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  1 file changed, 22 insertions(+)
 
 diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
-index 996112381eefb..34251ec1b531d 100644
+index 996112381eef..34251ec1b531 100644
 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
 +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
 @@ -193,6 +193,8 @@
@@ -400218,7 +400233,7 @@ Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
-index 6621eb3e01c6e..2ebaea7e2a7bf 100644
+index 6621eb3e01c6..2ebaea7e2a7b 100644
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
 @@ -1494,8 +1494,10 @@ static int vc4_hdmi_init_resources(struct vc4_hdmi *vc4_hdmi)
@@ -400254,7 +400269,7 @@ Signed-off-by: Joerg Schambacher <joerg@i2audio.com>
  1 file changed, 8 insertions(+), 1 deletion(-)
 
 diff --git a/sound/soc/bcm/hifiberry_dacplusadcpro.c b/sound/soc/bcm/hifiberry_dacplusadcpro.c
-index 2883c3ce9488b..ffa76014e7df6 100644
+index 2883c3ce9488..ffa76014e7df 100644
 --- a/sound/soc/bcm/hifiberry_dacplusadcpro.c
 +++ b/sound/soc/bcm/hifiberry_dacplusadcpro.c
 @@ -390,9 +390,11 @@ static int snd_rpi_hifiberry_dacplusadcpro_hw_params(
@@ -400303,7 +400318,7 @@ Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
  1 file changed, 7 insertions(+), 2 deletions(-)
 
 diff --git a/Documentation/media/kapi/v4l2-subdev.rst b/Documentation/media/kapi/v4l2-subdev.rst
-index 29e07e23f8885..41ccb3e5c7075 100644
+index 29e07e23f888..41ccb3e5c707 100644
 --- a/Documentation/media/kapi/v4l2-subdev.rst
 +++ b/Documentation/media/kapi/v4l2-subdev.rst
 @@ -275,8 +275,13 @@ system the .unbind() method is called. All three callbacks are optional.
@@ -400348,7 +400363,7 @@ Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
  8 files changed, 94 insertions(+)
 
 diff --git a/Documentation/media/kapi/v4l2-subdev.rst b/Documentation/media/kapi/v4l2-subdev.rst
-index 41ccb3e5c7075..6ced2381952ab 100644
+index 41ccb3e5c707..6ced2381952a 100644
 --- a/Documentation/media/kapi/v4l2-subdev.rst
 +++ b/Documentation/media/kapi/v4l2-subdev.rst
 @@ -332,6 +332,50 @@ Private ioctls
@@ -400403,7 +400418,7 @@ index 41ccb3e5c7075..6ced2381952ab 100644
  I2C sub-device drivers
  ----------------------
 diff --git a/Documentation/media/uapi/v4l/dev-subdev.rst b/Documentation/media/uapi/v4l/dev-subdev.rst
-index 029bb2d9928aa..d665366056a90 100644
+index 029bb2d9928a..d665366056a9 100644
 --- a/Documentation/media/uapi/v4l/dev-subdev.rst
 +++ b/Documentation/media/uapi/v4l/dev-subdev.rst
 @@ -39,6 +39,11 @@ will feature a character device node on which ioctls can be called to
@@ -400419,7 +400434,7 @@ index 029bb2d9928aa..d665366056a90 100644
  Controls
  ========
 diff --git a/Documentation/media/uapi/v4l/vidioc-g-dv-timings.rst b/Documentation/media/uapi/v4l/vidioc-g-dv-timings.rst
-index 5712bd48e6870..435d955aaf859 100644
+index 5712bd48e687..435d955aaf85 100644
 --- a/Documentation/media/uapi/v4l/vidioc-g-dv-timings.rst
 +++ b/Documentation/media/uapi/v4l/vidioc-g-dv-timings.rst
 @@ -57,6 +57,10 @@ pointer to the struct :c:type:`v4l2_dv_timings`
@@ -400443,7 +400458,7 @@ index 5712bd48e6870..435d955aaf859 100644
  .. tabularcolumns:: |p{4.4cm}|p{4.4cm}|p{8.7cm}|
  
 diff --git a/Documentation/media/uapi/v4l/vidioc-g-std.rst b/Documentation/media/uapi/v4l/vidioc-g-std.rst
-index e633e42e39104..e220b38b859f9 100644
+index e633e42e3910..e220b38b859f 100644
 --- a/Documentation/media/uapi/v4l/vidioc-g-std.rst
 +++ b/Documentation/media/uapi/v4l/vidioc-g-std.rst
 @@ -66,6 +66,9 @@ video timings (e.g. if :ref:`VIDIOC_ENUMINPUT`
@@ -400464,7 +400479,7 @@ index e633e42e39104..e220b38b859f9 100644
 +EPERM
 +    ``VIDIOC_SUBDEV_S_STD`` has been called on a read-only subdevice.
 diff --git a/Documentation/media/uapi/v4l/vidioc-subdev-g-crop.rst b/Documentation/media/uapi/v4l/vidioc-subdev-g-crop.rst
-index 632ee053accc4..307b80c4b5435 100644
+index 632ee053accc..307b80c4b543 100644
 --- a/Documentation/media/uapi/v4l/vidioc-subdev-g-crop.rst
 +++ b/Documentation/media/uapi/v4l/vidioc-subdev-g-crop.rst
 @@ -73,6 +73,11 @@ crop rectangles and stored in the sub-device file handle. Two
@@ -400488,7 +400503,7 @@ index 632ee053accc4..307b80c4b5435 100644
 +    The ``VIDIOC_SUBDEV_S_CROP`` ioctl has been called on a read-only subdevice
 +    and the ``which`` field is set to ``V4L2_SUBDEV_FORMAT_ACTIVE``.
 diff --git a/Documentation/media/uapi/v4l/vidioc-subdev-g-fmt.rst b/Documentation/media/uapi/v4l/vidioc-subdev-g-fmt.rst
-index 472577bd17454..b811c68d2d3da 100644
+index 472577bd1745..b811c68d2d3d 100644
 --- a/Documentation/media/uapi/v4l/vidioc-subdev-g-fmt.rst
 +++ b/Documentation/media/uapi/v4l/vidioc-subdev-g-fmt.rst
 @@ -78,6 +78,11 @@ current links configuration or sub-device controls value. For instance,
@@ -400514,7 +400529,7 @@ index 472577bd17454..b811c68d2d3da 100644
  ============
  
 diff --git a/Documentation/media/uapi/v4l/vidioc-subdev-g-frame-interval.rst b/Documentation/media/uapi/v4l/vidioc-subdev-g-frame-interval.rst
-index 4b1b4bc78bfea..34aa39096e3d3 100644
+index 4b1b4bc78bfe..34aa39096e3d 100644
 --- a/Documentation/media/uapi/v4l/vidioc-subdev-g-frame-interval.rst
 +++ b/Documentation/media/uapi/v4l/vidioc-subdev-g-frame-interval.rst
 @@ -65,6 +65,10 @@ struct
@@ -400537,7 +400552,7 @@ index 4b1b4bc78bfea..34aa39096e3d3 100644
 +    The ``VIDIOC_SUBDEV_S_FRAME_INTERVAL`` ioctl has been called on a read-only
 +    subdevice.
 diff --git a/Documentation/media/uapi/v4l/vidioc-subdev-g-selection.rst b/Documentation/media/uapi/v4l/vidioc-subdev-g-selection.rst
-index fc73d27e6d747..feba9f807135e 100644
+index fc73d27e6d74..feba9f807135 100644
 --- a/Documentation/media/uapi/v4l/vidioc-subdev-g-selection.rst
 +++ b/Documentation/media/uapi/v4l/vidioc-subdev-g-selection.rst
 @@ -53,6 +53,10 @@ function of the crop API, and more, are supported by the selections API.
@@ -400586,7 +400601,7 @@ Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
  4 files changed, 77 insertions(+), 6 deletions(-)
 
 diff --git a/drivers/media/v4l2-core/v4l2-device.c b/drivers/media/v4l2-core/v4l2-device.c
-index 41da73ce2e98f..76d2d46dcc5c8 100644
+index 41da73ce2e98..76d2d46dcc5c 100644
 --- a/drivers/media/v4l2-core/v4l2-device.c
 +++ b/drivers/media/v4l2-core/v4l2-device.c
 @@ -189,7 +189,8 @@ static void v4l2_device_release_subdev_node(struct video_device *vdev)
@@ -400618,7 +400633,7 @@ index 41da73ce2e98f..76d2d46dcc5c8 100644
  void v4l2_device_unregister_subdev(struct v4l2_subdev *sd)
  {
 diff --git a/drivers/media/v4l2-core/v4l2-subdev.c b/drivers/media/v4l2-core/v4l2-subdev.c
-index f725cd9b66b96..83a3667e6d309 100644
+index f725cd9b66b9..83a3667e6d30 100644
 --- a/drivers/media/v4l2-core/v4l2-subdev.c
 +++ b/drivers/media/v4l2-core/v4l2-subdev.c
 @@ -331,6 +331,7 @@ static long subdev_do_ioctl(struct file *file, unsigned int cmd, void *arg)
@@ -400690,7 +400705,7 @@ index f725cd9b66b96..83a3667e6d309 100644
  	}
  
 diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
-index 48531e57cc5a8..8f2befe9c905e 100644
+index 48531e57cc5a..8f2befe9c905 100644
 --- a/include/media/v4l2-dev.h
 +++ b/include/media/v4l2-dev.h
 @@ -82,11 +82,18 @@ struct v4l2_ctrl_handler;
@@ -400713,7 +400728,7 @@ index 48531e57cc5a8..8f2befe9c905e 100644
  
  /* Priority helper functions */
 diff --git a/include/media/v4l2-device.h b/include/media/v4l2-device.h
-index a0e93f0ef62a1..841d23e3bbcf0 100644
+index a0e93f0ef62a..841d23e3bbcf 100644
 --- a/include/media/v4l2-device.h
 +++ b/include/media/v4l2-device.h
 @@ -174,14 +174,56 @@ int __must_check v4l2_device_register_subdev(struct v4l2_device *v4l2_dev,
@@ -400810,7 +400825,7 @@ Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
  create mode 100644 drivers/media/platform/bcm2835/vc4-regs-unicam.h
 
 diff --git a/MAINTAINERS b/MAINTAINERS
-index b1b23c6921865..ac0d4c2eeedfe 100644
+index b1b23c692186..ac0d4c2eeedf 100644
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
 @@ -3206,7 +3206,7 @@ F:	Documentation/devicetree/bindings/media/rpivid_hevc.jaml
@@ -400823,7 +400838,7 @@ index b1b23c6921865..ac0d4c2eeedfe 100644
  S:	Maintained
  F:	drivers/media/platform/bcm2835/
 diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
-index f1f61419fd292..c06699ab787d9 100644
+index f1f61419fd29..c06699ab787d 100644
 --- a/drivers/media/platform/Kconfig
 +++ b/drivers/media/platform/Kconfig
 @@ -146,6 +146,7 @@ source "drivers/media/platform/am437x/Kconfig"
@@ -400835,7 +400850,7 @@ index f1f61419fd292..c06699ab787d9 100644
  
  config VIDEO_TI_CAL
 diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile
-index 6ee7eb0d36f43..2718dc5383126 100644
+index 6ee7eb0d36f4..2718dc538312 100644
 --- a/drivers/media/platform/Makefile
 +++ b/drivers/media/platform/Makefile
 @@ -100,4 +100,6 @@ obj-y					+= meson/
@@ -400847,7 +400862,7 @@ index 6ee7eb0d36f43..2718dc5383126 100644
  obj-y					+= sunxi/
 diff --git a/drivers/media/platform/bcm2835/Kconfig b/drivers/media/platform/bcm2835/Kconfig
 new file mode 100644
-index 0000000000000..20e15147ee02f
+index 000000000000..20e15147ee02
 --- /dev/null
 +++ b/drivers/media/platform/bcm2835/Kconfig
 @@ -0,0 +1,14 @@
@@ -400867,7 +400882,7 @@ index 0000000000000..20e15147ee02f
 +	   will be called bcm2835-unicam.
 diff --git a/drivers/media/platform/bcm2835/Makefile b/drivers/media/platform/bcm2835/Makefile
 new file mode 100644
-index 0000000000000..a98aba03598ab
+index 000000000000..a98aba03598a
 --- /dev/null
 +++ b/drivers/media/platform/bcm2835/Makefile
 @@ -0,0 +1,3 @@
@@ -400876,7 +400891,7 @@ index 0000000000000..a98aba03598ab
 +obj-$(CONFIG_VIDEO_BCM2835_UNICAM) += bcm2835-unicam.o
 diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c
 new file mode 100644
-index 0000000000000..8c1b220e6d8c9
+index 000000000000..8c1b220e6d8c
 --- /dev/null
 +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
 @@ -0,0 +1,2369 @@
@@ -403251,7 +403266,7 @@ index 0000000000000..8c1b220e6d8c9
 +MODULE_VERSION(UNICAM_VERSION);
 diff --git a/drivers/media/platform/bcm2835/vc4-regs-unicam.h b/drivers/media/platform/bcm2835/vc4-regs-unicam.h
 new file mode 100644
-index 0000000000000..ae059a171d0fe
+index 000000000000..ae059a171d0f
 --- /dev/null
 +++ b/drivers/media/platform/bcm2835/vc4-regs-unicam.h
 @@ -0,0 +1,253 @@
@@ -403533,7 +403548,7 @@ Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
  3 files changed, 3 insertions(+)
 
 diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig
-index 1542ea5af327e..e5168c0359b23 100644
+index 1542ea5af327..e5168c0359b2 100644
 --- a/arch/arm/configs/bcm2709_defconfig
 +++ b/arch/arm/configs/bcm2709_defconfig
 @@ -875,6 +875,7 @@ CONFIG_VIDEO_EM28XX_V4L2=m
@@ -403545,7 +403560,7 @@ index 1542ea5af327e..e5168c0359b23 100644
  CONFIG_USB_SI470X=m
  CONFIG_I2C_SI470X=m
 diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig
-index 393bf162e73bb..19a8ec28f8a45 100644
+index 393bf162e73b..19a8ec28f8a4 100644
 --- a/arch/arm/configs/bcm2711_defconfig
 +++ b/arch/arm/configs/bcm2711_defconfig
 @@ -851,6 +851,7 @@ CONFIG_VIDEO_EM28XX_V4L2=m
@@ -403557,7 +403572,7 @@ index 393bf162e73bb..19a8ec28f8a45 100644
  CONFIG_USB_SI470X=m
  CONFIG_I2C_SI470X=m
 diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig
-index 8eddf1eec9b7a..543948a9499d7 100644
+index 8eddf1eec9b7..543948a9499d 100644
 --- a/arch/arm/configs/bcmrpi_defconfig
 +++ b/arch/arm/configs/bcmrpi_defconfig
 @@ -867,6 +867,7 @@ CONFIG_VIDEO_EM28XX_V4L2=m
@@ -403593,7 +403608,7 @@ Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
  create mode 100644 Documentation/media/uapi/v4l/pixfmt-meta-sensor-data.rst
 
 diff --git a/Documentation/media/uapi/v4l/meta-formats.rst b/Documentation/media/uapi/v4l/meta-formats.rst
-index b10ca9ee39686..3d937720f0b9f 100644
+index b10ca9ee3968..3d937720f0b9 100644
 --- a/Documentation/media/uapi/v4l/meta-formats.rst
 +++ b/Documentation/media/uapi/v4l/meta-formats.rst
 @@ -21,6 +21,7 @@ These formats are used for the :ref:`metadata` interface only.
@@ -403606,7 +403621,7 @@ index b10ca9ee39686..3d937720f0b9f 100644
      pixfmt-meta-vsp1-hgt
 diff --git a/Documentation/media/uapi/v4l/pixfmt-meta-sensor-data.rst b/Documentation/media/uapi/v4l/pixfmt-meta-sensor-data.rst
 new file mode 100644
-index 0000000000000..4a67e204d08a3
+index 000000000000..4a67e204d08a
 --- /dev/null
 +++ b/Documentation/media/uapi/v4l/pixfmt-meta-sensor-data.rst
 @@ -0,0 +1,32 @@
@@ -403643,7 +403658,7 @@ index 0000000000000..4a67e204d08a3
 +and cannot be modified with a call to :c:type:`VIDIOC_SUBDEV_S_FMT`.
 +
 diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
-index 1e37b3591b898..fb279eeced455 100644
+index 1e37b3591b89..fb279eeced45 100644
 --- a/drivers/media/v4l2-core/v4l2-ioctl.c
 +++ b/drivers/media/v4l2-core/v4l2-ioctl.c
 @@ -1332,6 +1332,7 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt)
@@ -403655,7 +403670,7 @@ index 1e37b3591b898..fb279eeced455 100644
  	default:
  		/* Compressed formats */
 diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
-index 5d28d8ef6c0cc..d8320844d188c 100644
+index 5d28d8ef6c0c..d8320844d188 100644
 --- a/include/uapi/linux/videodev2.h
 +++ b/include/uapi/linux/videodev2.h
 @@ -768,6 +768,7 @@ struct v4l2_pix_format {
@@ -403686,7 +403701,7 @@ Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
  2 files changed, 36 insertions(+)
 
 diff --git a/Documentation/media/uapi/v4l/subdev-formats.rst b/Documentation/media/uapi/v4l/subdev-formats.rst
-index 15e11f27b4c8f..42870bd65de17 100644
+index 15e11f27b4c8..42870bd65de1 100644
 --- a/Documentation/media/uapi/v4l/subdev-formats.rst
 +++ b/Documentation/media/uapi/v4l/subdev-formats.rst
 @@ -7794,3 +7794,36 @@ formats.
@@ -403727,7 +403742,7 @@ index 15e11f27b4c8f..42870bd65de17 100644
 +	<https://mipi.org/specifications/csi-2>`_
 +
 diff --git a/include/uapi/linux/media-bus-format.h b/include/uapi/linux/media-bus-format.h
-index 16c1fa2d89a42..4b5e2a71dfec3 100644
+index 16c1fa2d89a4..4b5e2a71dfec 100644
 --- a/include/uapi/linux/media-bus-format.h
 +++ b/include/uapi/linux/media-bus-format.h
 @@ -155,4 +155,7 @@
@@ -403762,7 +403777,7 @@ Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
  1 file changed, 283 insertions(+), 201 deletions(-)
 
 diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-index 8c1b220e6d8c9..c19f96ce9d29d 100644
+index 8c1b220e6d8c..c19f96ce9d29 100644
 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
 +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
 @@ -109,7 +109,8 @@ MODULE_PARM_DESC(debug, "Debug level 0-3");
@@ -404846,7 +404861,7 @@ Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
  1 file changed, 474 insertions(+), 193 deletions(-)
 
 diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-index c19f96ce9d29d..27752969c2755 100644
+index c19f96ce9d29..27752969c275 100644
 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
 +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
 @@ -109,8 +109,15 @@ MODULE_PARM_DESC(debug, "Debug level 0-3");
@@ -406022,7 +406037,7 @@ Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
  1 file changed, 110 insertions(+), 50 deletions(-)
 
 diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-index 27752969c2755..62248db04bfaf 100644
+index 27752969c275..62248db04bfa 100644
 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
 +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
 @@ -47,6 +47,7 @@
@@ -406343,10 +406358,10 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  1 file changed, 9 insertions(+)
 
 diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
-index e1205d72be523..5f6a95c4da6cb 100644
+index f8f3434d5ab1..265e302b83e6 100644
 --- a/drivers/spi/spi.c
 +++ b/drivers/spi/spi.c
-@@ -3115,6 +3115,7 @@ static int __spi_validate_bits_per_word(struct spi_controller *ctlr,
+@@ -3116,6 +3116,7 @@ static int __spi_validate_bits_per_word(struct spi_controller *ctlr,
   */
  int spi_setup(struct spi_device *spi)
  {
@@ -406354,7 +406369,7 @@ index e1205d72be523..5f6a95c4da6cb 100644
  	unsigned	bad_bits, ugly_bits;
  	int		status;
  
-@@ -3132,6 +3133,14 @@ int spi_setup(struct spi_device *spi)
+@@ -3133,6 +3134,14 @@ int spi_setup(struct spi_device *spi)
  		(SPI_TX_DUAL | SPI_TX_QUAD | SPI_TX_OCTAL |
  		 SPI_RX_DUAL | SPI_RX_QUAD | SPI_RX_OCTAL)))
  		return -EINVAL;
@@ -406403,7 +406418,7 @@ Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
  1 file changed, 17 insertions(+)
 
 diff --git a/drivers/media/i2c/imx219.c b/drivers/media/i2c/imx219.c
-index f1effb5a5f66a..16010ca1781aa 100644
+index f1effb5a5f66..16010ca1781a 100644
 --- a/drivers/media/i2c/imx219.c
 +++ b/drivers/media/i2c/imx219.c
 @@ -1224,6 +1224,23 @@ static int imx219_probe(struct i2c_client *client)
@@ -406454,7 +406469,7 @@ Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
  1 file changed, 116 insertions(+), 32 deletions(-)
 
 diff --git a/drivers/media/i2c/imx219.c b/drivers/media/i2c/imx219.c
-index 16010ca1781aa..3207487b4c103 100644
+index 16010ca1781a..3207487b4c10 100644
 --- a/drivers/media/i2c/imx219.c
 +++ b/drivers/media/i2c/imx219.c
 @@ -168,15 +168,12 @@ static const struct imx219_reg mode_3280x2464_regs[] = {
@@ -406778,7 +406793,7 @@ Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
  1 file changed, 69 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/media/i2c/imx219.c b/drivers/media/i2c/imx219.c
-index 3207487b4c103..cb03bdec1f9c8 100644
+index 3207487b4c10..cb03bdec1f9c 100644
 --- a/drivers/media/i2c/imx219.c
 +++ b/drivers/media/i2c/imx219.c
 @@ -54,6 +54,7 @@
@@ -406907,7 +406922,7 @@ Reviewed-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/media/i2c/imx219.c b/drivers/media/i2c/imx219.c
-index cb03bdec1f9c8..86e0564bfb4fd 100644
+index cb03bdec1f9c..86e0564bfb4f 100644
 --- a/drivers/media/i2c/imx219.c
 +++ b/drivers/media/i2c/imx219.c
 @@ -781,7 +781,7 @@ static int imx219_enum_frame_size(struct v4l2_subdev *sd,
@@ -406941,7 +406956,7 @@ Reviewed-by: Naushir Patuck <naush@raspberrypi.com>
  1 file changed, 5 insertions(+)
 
 diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-index 62248db04bfaf..4840aa6c96c4c 100644
+index 62248db04bfa..4840aa6c96c4 100644
 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
 +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
 @@ -2374,6 +2374,11 @@ static int register_node(struct unicam_device *unicam, struct unicam_node *node,
@@ -406979,7 +406994,7 @@ Reviewed-by: Naushir Patuck <naush@raspberrypi.com>
  1 file changed, 14 insertions(+)
 
 diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-index 4840aa6c96c4c..2ddac7382fb9e 100644
+index 4840aa6c96c4..2ddac7382fb9 100644
 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
 +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
 @@ -772,6 +772,16 @@ static int unicam_all_nodes_disabled(struct unicam_device *dev)
@@ -407036,7 +407051,7 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
  1 file changed, 1 deletion(-)
 
 diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig
-index dac95c7348288..14398af7f5589 100644
+index dac95c734828..14398af7f558 100644
 --- a/arch/arm64/configs/bcm2711_defconfig
 +++ b/arch/arm64/configs/bcm2711_defconfig
 @@ -55,7 +55,6 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
@@ -407070,7 +407085,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  1 file changed, 10 deletions(-)
 
 diff --git a/drivers/firmware/raspberrypi.c b/drivers/firmware/raspberrypi.c
-index 4f3ab14d275a2..dc11a1968e99c 100644
+index 4f3ab14d275a..dc11a1968e99 100644
 --- a/drivers/firmware/raspberrypi.c
 +++ b/drivers/firmware/raspberrypi.c
 @@ -21,7 +21,6 @@
@@ -407136,7 +407151,7 @@ Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
  1 file changed, 155 insertions(+), 71 deletions(-)
 
 diff --git a/drivers/media/i2c/imx219.c b/drivers/media/i2c/imx219.c
-index 86e0564bfb4fd..017ae503cc09e 100644
+index 86e0564bfb4f..017ae503cc09 100644
 --- a/drivers/media/i2c/imx219.c
 +++ b/drivers/media/i2c/imx219.c
 @@ -112,6 +112,16 @@
@@ -407477,7 +407492,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
-index 34251ec1b531d..b3a00baba9628 100644
+index 34251ec1b531..b3a00baba962 100644
 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
 +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
 @@ -223,7 +223,7 @@
@@ -407504,7 +407519,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  1 file changed, 22 deletions(-)
 
 diff --git a/drivers/char/broadcom/rpivid-mem.c b/drivers/char/broadcom/rpivid-mem.c
-index fbf3d4f3fe0cb..5f4c91924ec16 100644
+index fbf3d4f3fe0c..5f4c91924ec1 100644
 --- a/drivers/char/broadcom/rpivid-mem.c
 +++ b/drivers/char/broadcom/rpivid-mem.c
 @@ -193,32 +193,11 @@ static int rpivid_mem_probe(struct platform_device *pdev)
@@ -407566,7 +407581,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  1 file changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/drivers/char/broadcom/rpivid-mem.c b/drivers/char/broadcom/rpivid-mem.c
-index 5f4c91924ec16..9f38083f4cb65 100644
+index 5f4c91924ec1..9f38083f4cb6 100644
 --- a/drivers/char/broadcom/rpivid-mem.c
 +++ b/drivers/char/broadcom/rpivid-mem.c
 @@ -100,6 +100,7 @@ static int rpivid_mem_mmap(struct file *file, struct vm_area_struct *vma)
@@ -407629,7 +407644,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  5 files changed, 8 insertions(+)
 
 diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig
-index e5168c0359b23..35ee59842466c 100644
+index e5168c0359b2..35ee59842466 100644
 --- a/arch/arm/configs/bcm2709_defconfig
 +++ b/arch/arm/configs/bcm2709_defconfig
 @@ -655,6 +655,7 @@ CONFIG_I2C_CHARDEV=m
@@ -407641,7 +407656,7 @@ index e5168c0359b23..35ee59842466c 100644
  CONFIG_I2C_BCM2835=m
  CONFIG_I2C_GPIO=m
 diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig
-index 19a8ec28f8a45..27b906723ba66 100644
+index 19a8ec28f8a4..27b906723ba6 100644
 --- a/arch/arm/configs/bcm2711_defconfig
 +++ b/arch/arm/configs/bcm2711_defconfig
 @@ -628,6 +628,7 @@ CONFIG_I2C_CHARDEV=m
@@ -407653,7 +407668,7 @@ index 19a8ec28f8a45..27b906723ba66 100644
  CONFIG_I2C_BCM2835=m
  CONFIG_I2C_GPIO=m
 diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig
-index 543948a9499d7..892840ab9370e 100644
+index 543948a9499d..892840ab9370 100644
 --- a/arch/arm/configs/bcmrpi_defconfig
 +++ b/arch/arm/configs/bcmrpi_defconfig
 @@ -648,6 +648,7 @@ CONFIG_I2C_CHARDEV=m
@@ -407665,7 +407680,7 @@ index 543948a9499d7..892840ab9370e 100644
  CONFIG_I2C_BCM2835=m
  CONFIG_I2C_GPIO=m
 diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig
-index 14398af7f5589..1389bdc588084 100644
+index 14398af7f558..1389bdc58808 100644
 --- a/arch/arm64/configs/bcm2711_defconfig
 +++ b/arch/arm64/configs/bcm2711_defconfig
 @@ -662,6 +662,7 @@ CONFIG_I2C_CHARDEV=m
@@ -407677,7 +407692,7 @@ index 14398af7f5589..1389bdc588084 100644
  CONFIG_I2C_BCM2835=m
  CONFIG_I2C_GPIO=m
 diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig
-index 34aa78d5d814d..3a39acd6d0abe 100644
+index 34aa78d5d814..3a39acd6d0ab 100644
 --- a/arch/arm64/configs/bcmrpi3_defconfig
 +++ b/arch/arm64/configs/bcmrpi3_defconfig
 @@ -592,6 +592,10 @@ CONFIG_TCG_TPM=m
@@ -407730,7 +407745,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  create mode 100644 arch/arm/boot/dts/bcm283x-rpi-i2c0mux_0_44.dtsi
 
 diff --git a/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts b/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts
-index b800699a03fbd..0e137d85897b6 100644
+index b800699a03fb..0e137d85897b 100644
 --- a/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts
 +++ b/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts
 @@ -4,6 +4,7 @@
@@ -407760,7 +407775,7 @@ index b800699a03fbd..0e137d85897b6 100644
  	pinctrl-names = "default";
  	pinctrl-0 = <&i2c1_pins>;
 diff --git a/arch/arm/boot/dts/bcm2708-rpi-b.dts b/arch/arm/boot/dts/bcm2708-rpi-b.dts
-index ef47775692cea..47c093364683b 100644
+index ef47775692ce..47c093364683 100644
 --- a/arch/arm/boot/dts/bcm2708-rpi-b.dts
 +++ b/arch/arm/boot/dts/bcm2708-rpi-b.dts
 @@ -4,6 +4,7 @@
@@ -407790,7 +407805,7 @@ index ef47775692cea..47c093364683b 100644
  	pinctrl-names = "default";
  	pinctrl-0 = <&i2c1_pins>;
 diff --git a/arch/arm/boot/dts/bcm2708-rpi-cm.dts b/arch/arm/boot/dts/bcm2708-rpi-cm.dts
-index 64809aee5c0ca..5dcdf8888ec12 100644
+index 64809aee5c0c..5dcdf8888ec1 100644
 --- a/arch/arm/boot/dts/bcm2708-rpi-cm.dts
 +++ b/arch/arm/boot/dts/bcm2708-rpi-cm.dts
 @@ -3,6 +3,7 @@
@@ -407820,7 +407835,7 @@ index 64809aee5c0ca..5dcdf8888ec12 100644
  	pinctrl-names = "default";
  	pinctrl-0 = <&i2c1_pins>;
 diff --git a/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts b/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts
-index 92f780a3e5577..af883bf02ec5a 100644
+index 92f780a3e557..af883bf02ec5 100644
 --- a/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts
 +++ b/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts
 @@ -3,6 +3,7 @@
@@ -407850,7 +407865,7 @@ index 92f780a3e5577..af883bf02ec5a 100644
  	pinctrl-names = "default";
  	pinctrl-0 = <&i2c1_pins>;
 diff --git a/arch/arm/boot/dts/bcm2708-rpi-zero.dts b/arch/arm/boot/dts/bcm2708-rpi-zero.dts
-index 2909ddeafc833..0e61e8269efc8 100644
+index 2909ddeafc83..0e61e8269efc 100644
 --- a/arch/arm/boot/dts/bcm2708-rpi-zero.dts
 +++ b/arch/arm/boot/dts/bcm2708-rpi-zero.dts
 @@ -3,6 +3,7 @@
@@ -407880,7 +407895,7 @@ index 2909ddeafc833..0e61e8269efc8 100644
  	pinctrl-names = "default";
  	pinctrl-0 = <&i2c1_pins>;
 diff --git a/arch/arm/boot/dts/bcm2709-rpi-2-b.dts b/arch/arm/boot/dts/bcm2709-rpi-2-b.dts
-index 4d2262f8d376b..77678a3d7ef91 100644
+index 4d2262f8d376..77678a3d7ef9 100644
 --- a/arch/arm/boot/dts/bcm2709-rpi-2-b.dts
 +++ b/arch/arm/boot/dts/bcm2709-rpi-2-b.dts
 @@ -4,6 +4,7 @@
@@ -407910,7 +407925,7 @@ index 4d2262f8d376b..77678a3d7ef91 100644
  	pinctrl-names = "default";
  	pinctrl-0 = <&i2c1_pins>;
 diff --git a/arch/arm/boot/dts/bcm270x-rpi.dtsi b/arch/arm/boot/dts/bcm270x-rpi.dtsi
-index be11a44362799..2af64cd43729b 100644
+index be11a4436279..2af64cd43729 100644
 --- a/arch/arm/boot/dts/bcm270x-rpi.dtsi
 +++ b/arch/arm/boot/dts/bcm270x-rpi.dtsi
 @@ -21,6 +21,7 @@
@@ -407943,7 +407958,7 @@ index be11a44362799..2af64cd43729b 100644
  };
  
 diff --git a/arch/arm/boot/dts/bcm2710-rpi-2-b.dts b/arch/arm/boot/dts/bcm2710-rpi-2-b.dts
-index 65a6f4d06866f..dd7e1897ea456 100644
+index 65a6f4d06866..dd7e1897ea45 100644
 --- a/arch/arm/boot/dts/bcm2710-rpi-2-b.dts
 +++ b/arch/arm/boot/dts/bcm2710-rpi-2-b.dts
 @@ -4,6 +4,7 @@
@@ -407973,7 +407988,7 @@ index 65a6f4d06866f..dd7e1897ea456 100644
  	pinctrl-names = "default";
  	pinctrl-0 = <&i2c1_pins>;
 diff --git a/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts b/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts
-index 0c36c64aaeeff..f497386881870 100644
+index 0c36c64aaeef..f49738688187 100644
 --- a/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts
 +++ b/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts
 @@ -4,6 +4,7 @@
@@ -408003,7 +408018,7 @@ index 0c36c64aaeeff..f497386881870 100644
  	pinctrl-names = "default";
  	pinctrl-0 = <&i2c1_pins>;
 diff --git a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
-index 261827cdb957c..112eb73f2cc1f 100644
+index 261827cdb957..112eb73f2cc1 100644
 --- a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
 +++ b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
 @@ -4,6 +4,7 @@
@@ -408033,7 +408048,7 @@ index 261827cdb957c..112eb73f2cc1f 100644
  	pinctrl-names = "default";
  	pinctrl-0 = <&i2c1_pins>;
 diff --git a/arch/arm/boot/dts/bcm2710-rpi-cm3.dts b/arch/arm/boot/dts/bcm2710-rpi-cm3.dts
-index addebe448e32c..88f7fe53b97f2 100644
+index addebe448e32..88f7fe53b97f 100644
 --- a/arch/arm/boot/dts/bcm2710-rpi-cm3.dts
 +++ b/arch/arm/boot/dts/bcm2710-rpi-cm3.dts
 @@ -4,7 +4,7 @@
@@ -408064,7 +408079,7 @@ index addebe448e32c..88f7fe53b97f2 100644
  	pinctrl-names = "default";
  	pinctrl-0 = <&i2c1_pins>;
 diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
-index b3a00baba9628..7467817bfe7d1 100644
+index b3a00baba962..7467817bfe7d 100644
 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
 +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
 @@ -192,6 +192,7 @@
@@ -408087,7 +408102,7 @@ index b3a00baba9628..7467817bfe7d1 100644
  };
  
 diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi
-index 72cbd23c9796d..b34a65ff63163 100644
+index 72cbd23c9796..b34a65ff6316 100644
 --- a/arch/arm/boot/dts/bcm2711.dtsi
 +++ b/arch/arm/boot/dts/bcm2711.dtsi
 @@ -986,7 +986,7 @@
@@ -408101,7 +408116,7 @@ index 72cbd23c9796d..b34a65ff63163 100644
  };
 diff --git a/arch/arm/boot/dts/bcm283x-rpi-i2c0mux_0_28.dtsi b/arch/arm/boot/dts/bcm283x-rpi-i2c0mux_0_28.dtsi
 new file mode 100644
-index 0000000000000..38f0074bce3ff
+index 000000000000..38f0074bce3f
 --- /dev/null
 +++ b/arch/arm/boot/dts/bcm283x-rpi-i2c0mux_0_28.dtsi
 @@ -0,0 +1,4 @@
@@ -408111,7 +408126,7 @@ index 0000000000000..38f0074bce3ff
 +};
 diff --git a/arch/arm/boot/dts/bcm283x-rpi-i2c0mux_0_44.dtsi b/arch/arm/boot/dts/bcm283x-rpi-i2c0mux_0_44.dtsi
 new file mode 100644
-index 0000000000000..119946d878dbf
+index 000000000000..119946d878db
 --- /dev/null
 +++ b/arch/arm/boot/dts/bcm283x-rpi-i2c0mux_0_44.dtsi
 @@ -0,0 +1,4 @@
@@ -408120,7 +408135,7 @@ index 0000000000000..119946d878dbf
 +	pinctrl-1 = <&i2c0_gpio44>;
 +};
 diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi
-index adb59ca3df6c6..4426f9e6ba92c 100644
+index adb59ca3df6c..4426f9e6ba92 100644
 --- a/arch/arm/boot/dts/bcm283x.dtsi
 +++ b/arch/arm/boot/dts/bcm283x.dtsi
 @@ -340,7 +340,7 @@
@@ -408187,7 +408202,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  6 files changed, 47 insertions(+), 163 deletions(-)
 
 diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
-index 1df13b1fbc513..eaf26f19392e5 100644
+index 1df13b1fbc51..eaf26f19392e 100644
 --- a/arch/arm/boot/dts/overlays/README
 +++ b/arch/arm/boot/dts/overlays/README
 @@ -331,22 +331,14 @@ Info:   Analog Devices ADV7282M analogue video to CSI2 bridge.
@@ -408274,7 +408289,7 @@ index 1df13b1fbc513..eaf26f19392e5 100644
  Name:   tc358743-audio
  Info:   Used in combination with the tc358743-fast overlay to route the audio
 diff --git a/arch/arm/boot/dts/overlays/adv7282m-overlay.dts b/arch/arm/boot/dts/overlays/adv7282m-overlay.dts
-index 197c8f41a2658..238acd2bee723 100644
+index 197c8f41a265..238acd2bee72 100644
 --- a/arch/arm/boot/dts/overlays/adv7282m-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/adv7282m-overlay.dts
 @@ -7,7 +7,7 @@
@@ -408330,7 +408345,7 @@ index 197c8f41a2658..238acd2bee723 100644
  	};
  };
 diff --git a/arch/arm/boot/dts/overlays/imx219-overlay.dts b/arch/arm/boot/dts/overlays/imx219-overlay.dts
-index b9e3d9e5730d4..5fd39060ee87c 100644
+index b9e3d9e5730d..5fd39060ee87 100644
 --- a/arch/arm/boot/dts/overlays/imx219-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/imx219-overlay.dts
 @@ -9,7 +9,7 @@
@@ -408405,7 +408420,7 @@ index b9e3d9e5730d4..5fd39060ee87c 100644
 -	};
  };
 diff --git a/arch/arm/boot/dts/overlays/irs1125-overlay.dts b/arch/arm/boot/dts/overlays/irs1125-overlay.dts
-index b9006715a5397..3fc7a9e23019a 100644
+index b9006715a539..3fc7a9e23019 100644
 --- a/arch/arm/boot/dts/overlays/irs1125-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/irs1125-overlay.dts
 @@ -7,7 +7,7 @@
@@ -408468,7 +408483,7 @@ index b9006715a5397..3fc7a9e23019a 100644
 -	};
  };
 diff --git a/arch/arm/boot/dts/overlays/ov5647-overlay.dts b/arch/arm/boot/dts/overlays/ov5647-overlay.dts
-index 5266d4b8758d3..34aa9f3861782 100644
+index 5266d4b8758d..34aa9f386178 100644
 --- a/arch/arm/boot/dts/overlays/ov5647-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/ov5647-overlay.dts
 @@ -7,7 +7,7 @@
@@ -408532,7 +408547,7 @@ index 5266d4b8758d3..34aa9f3861782 100644
 -	};
  };
 diff --git a/arch/arm/boot/dts/overlays/tc358743-overlay.dts b/arch/arm/boot/dts/overlays/tc358743-overlay.dts
-index 2a1a3a80de493..f8c059827234d 100644
+index 2a1a3a80de49..f8c059827234 100644
 --- a/arch/arm/boot/dts/overlays/tc358743-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/tc358743-overlay.dts
 @@ -7,7 +7,7 @@
@@ -408638,7 +408653,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  14 files changed, 78 insertions(+), 3 deletions(-)
 
 diff --git a/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts b/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
-index 6c8ce39833bf6..e82e75ec342a3 100644
+index 6c8ce39833bf..e82e75ec342a 100644
 --- a/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
 +++ b/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
 @@ -126,3 +126,8 @@
@@ -408651,7 +408666,7 @@ index 6c8ce39833bf6..e82e75ec342a3 100644
 +	pinctrl-1 = <&i2c0_gpio28>;
 +};
 diff --git a/arch/arm/boot/dts/bcm2835-rpi-a.dts b/arch/arm/boot/dts/bcm2835-rpi-a.dts
-index 17fdd48346ffb..d400f88127db0 100644
+index 17fdd48346ff..d400f88127db 100644
 --- a/arch/arm/boot/dts/bcm2835-rpi-a.dts
 +++ b/arch/arm/boot/dts/bcm2835-rpi-a.dts
 @@ -121,3 +121,10 @@
@@ -408666,7 +408681,7 @@ index 17fdd48346ffb..d400f88127db0 100644
 +	pinctrl-1 = <&i2c0_gpio0>;
 +};
 diff --git a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
-index b0355c229cdc2..57ab4d4434939 100644
+index b0355c229cdc..57ab4d443493 100644
 --- a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
 +++ b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
 @@ -128,3 +128,8 @@
@@ -408679,7 +408694,7 @@ index b0355c229cdc2..57ab4d4434939 100644
 +	pinctrl-1 = <&i2c0_gpio28>;
 +};
 diff --git a/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts b/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts
-index 33b3b5c025219..cb08d5ac0412c 100644
+index 33b3b5c02521..cb08d5ac0412 100644
 --- a/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts
 +++ b/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts
 @@ -121,3 +121,10 @@
@@ -408694,7 +408709,7 @@ index 33b3b5c025219..cb08d5ac0412c 100644
 +	pinctrl-1 = <&i2c0_gpio0>;
 +};
 diff --git a/arch/arm/boot/dts/bcm2835-rpi-b.dts b/arch/arm/boot/dts/bcm2835-rpi-b.dts
-index 2b69957e0113e..d5b4d9d204248 100644
+index 2b69957e0113..d5b4d9d20424 100644
 --- a/arch/arm/boot/dts/bcm2835-rpi-b.dts
 +++ b/arch/arm/boot/dts/bcm2835-rpi-b.dts
 @@ -116,3 +116,10 @@
@@ -408709,7 +408724,7 @@ index 2b69957e0113e..d5b4d9d204248 100644
 +	pinctrl-1 = <&i2c0_gpio0>;
 +};
 diff --git a/arch/arm/boot/dts/bcm2835-rpi-cm1-io1.dts b/arch/arm/boot/dts/bcm2835-rpi-cm1-io1.dts
-index a75c882e65751..95564c93a6452 100644
+index a75c882e6575..95564c93a645 100644
 --- a/arch/arm/boot/dts/bcm2835-rpi-cm1-io1.dts
 +++ b/arch/arm/boot/dts/bcm2835-rpi-cm1-io1.dts
 @@ -95,3 +95,8 @@
@@ -408722,7 +408737,7 @@ index a75c882e65751..95564c93a6452 100644
 +	pinctrl-1 = <&i2c0_gpio28>;
 +};
 diff --git a/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts b/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts
-index f65448c01e317..7de8af65c142b 100644
+index f65448c01e31..7de8af65c142 100644
 --- a/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts
 +++ b/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts
 @@ -149,3 +149,8 @@
@@ -408735,7 +408750,7 @@ index f65448c01e317..7de8af65c142b 100644
 +	pinctrl-1 = <&i2c0_gpio28>;
 +};
 diff --git a/arch/arm/boot/dts/bcm2835-rpi-zero.dts b/arch/arm/boot/dts/bcm2835-rpi-zero.dts
-index 6dd93c6f49666..cad16a2df2455 100644
+index 6dd93c6f4966..cad16a2df245 100644
 --- a/arch/arm/boot/dts/bcm2835-rpi-zero.dts
 +++ b/arch/arm/boot/dts/bcm2835-rpi-zero.dts
 @@ -117,3 +117,8 @@
@@ -408748,7 +408763,7 @@ index 6dd93c6f49666..cad16a2df2455 100644
 +	pinctrl-1 = <&i2c0_gpio28>;
 +};
 diff --git a/arch/arm/boot/dts/bcm2835-rpi.dtsi b/arch/arm/boot/dts/bcm2835-rpi.dtsi
-index fd2c766e0f710..c011b7914688b 100644
+index fd2c766e0f71..c011b7914688 100644
 --- a/arch/arm/boot/dts/bcm2835-rpi.dtsi
 +++ b/arch/arm/boot/dts/bcm2835-rpi.dtsi
 @@ -46,13 +46,17 @@
@@ -408773,7 +408788,7 @@ index fd2c766e0f710..c011b7914688b 100644
  	pinctrl-names = "default";
  	pinctrl-0 = <&i2c1_gpio2>;
 diff --git a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
-index 0455a680394a2..f62eff03dae10 100644
+index 0455a680394a..f62eff03dae1 100644
 --- a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
 +++ b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
 @@ -128,3 +128,8 @@
@@ -408786,7 +408801,7 @@ index 0455a680394a2..f62eff03dae10 100644
 +	pinctrl-1 = <&i2c0_gpio28>;
 +};
 diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts b/arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts
-index 66ab35eccba7b..66ba24e9ff375 100644
+index 66ab35eccba7..66ba24e9ff37 100644
 --- a/arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts
 +++ b/arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts
 @@ -176,3 +176,8 @@
@@ -408799,7 +408814,7 @@ index 66ab35eccba7b..66ba24e9ff375 100644
 +	pinctrl-1 = <&i2c0_gpio44>;
 +};
 diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts
-index 74ed6d0478070..63f4592ba7dd6 100644
+index 74ed6d047807..63f4592ba7dd 100644
 --- a/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts
 +++ b/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts
 @@ -179,3 +179,8 @@
@@ -408812,7 +408827,7 @@ index 74ed6d0478070..63f4592ba7dd6 100644
 +	pinctrl-1 = <&i2c0_gpio44>;
 +};
 diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
-index 054ecaa355c9a..5474f8ab894fa 100644
+index 054ecaa355c9..5474f8ab894f 100644
 --- a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
 +++ b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
 @@ -174,3 +174,8 @@
@@ -408825,7 +408840,7 @@ index 054ecaa355c9a..5474f8ab894fa 100644
 +	pinctrl-1 = <&i2c0_gpio44>;
 +};
 diff --git a/arch/arm/boot/dts/bcm2837-rpi-cm3-io3.dts b/arch/arm/boot/dts/bcm2837-rpi-cm3-io3.dts
-index 588d9411ceb61..dde209ade51b9 100644
+index 588d9411ceb6..dde209ade51b 100644
 --- a/arch/arm/boot/dts/bcm2837-rpi-cm3-io3.dts
 +++ b/arch/arm/boot/dts/bcm2837-rpi-cm3-io3.dts
 @@ -94,3 +94,8 @@
@@ -408871,7 +408886,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  create mode 100644 arch/arm/boot/dts/bcm2708-rpi-b-rev1.dts
 
 diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
-index 54f3c1d1e9f58..990457a51843b 100644
+index 54f3c1d1e9f5..990457a51843 100644
 --- a/arch/arm/boot/dts/Makefile
 +++ b/arch/arm/boot/dts/Makefile
 @@ -2,6 +2,7 @@
@@ -408884,7 +408899,7 @@ index 54f3c1d1e9f58..990457a51843b 100644
  	bcm2708-rpi-zero.dtb \
 diff --git a/arch/arm/boot/dts/bcm2708-rpi-b-rev1.dts b/arch/arm/boot/dts/bcm2708-rpi-b-rev1.dts
 new file mode 100644
-index 0000000000000..7b554b465b277
+index 000000000000..7b554b465b27
 --- /dev/null
 +++ b/arch/arm/boot/dts/bcm2708-rpi-b-rev1.dts
 @@ -0,0 +1,127 @@
@@ -409016,7 +409031,7 @@ index 0000000000000..7b554b465b277
 +	};
 +};
 diff --git a/arch/arm/boot/dts/bcm270x-rpi.dtsi b/arch/arm/boot/dts/bcm270x-rpi.dtsi
-index 2af64cd43729b..e3d90b4262f1f 100644
+index 2af64cd43729..e3d90b4262f1 100644
 --- a/arch/arm/boot/dts/bcm270x-rpi.dtsi
 +++ b/arch/arm/boot/dts/bcm270x-rpi.dtsi
 @@ -110,6 +110,10 @@
@@ -409049,7 +409064,7 @@ Signed-off-by: Hristo Venev <hristo@venev.name>
  2 files changed, 18 insertions(+), 19 deletions(-)
 
 diff --git a/arch/arm/boot/dts/bcm2711-rpi.dtsi b/arch/arm/boot/dts/bcm2711-rpi.dtsi
-index 4bc44b2ad211f..84bf0cfc1c566 100644
+index 4bc44b2ad211..84bf0cfc1c56 100644
 --- a/arch/arm/boot/dts/bcm2711-rpi.dtsi
 +++ b/arch/arm/boot/dts/bcm2711-rpi.dtsi
 @@ -65,17 +65,16 @@
@@ -409124,7 +409139,7 @@ index 4bc44b2ad211f..84bf0cfc1c566 100644
  	};
  };
 diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi
-index b34a65ff63163..41698e7f5e243 100644
+index b34a65ff6316..41698e7f5e24 100644
 --- a/arch/arm/boot/dts/bcm2711.dtsi
 +++ b/arch/arm/boot/dts/bcm2711.dtsi
 @@ -445,14 +445,14 @@
@@ -409184,7 +409199,7 @@ Signed-off-by: Hristo Venev <hristo@venev.name>
  create mode 100644 arch/arm/boot/dts/overlays/highperi-overlay.dts
 
 diff --git a/arch/arm/boot/dts/bcm2711-rpi.dtsi b/arch/arm/boot/dts/bcm2711-rpi.dtsi
-index 84bf0cfc1c566..2c55c78bd7cb3 100644
+index 84bf0cfc1c56..2c55c78bd7cb 100644
 --- a/arch/arm/boot/dts/bcm2711-rpi.dtsi
 +++ b/arch/arm/boot/dts/bcm2711-rpi.dtsi
 @@ -16,7 +16,7 @@
@@ -409197,7 +409212,7 @@ index 84bf0cfc1c566..2c55c78bd7cb3 100644
  		#address-cells = <1>;
  		#size-cells = <2>;
 diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile
-index 96f96c98561e5..c41abba3c3fb2 100644
+index 96f96c98561e..c41abba3c3fb 100644
 --- a/arch/arm/boot/dts/overlays/Makefile
 +++ b/arch/arm/boot/dts/overlays/Makefile
 @@ -64,6 +64,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
@@ -409209,7 +409224,7 @@ index 96f96c98561e5..c41abba3c3fb2 100644
  	hy28b.dtbo \
  	hy28b-2017.dtbo \
 diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
-index eaf26f19392e5..ece3d3143643b 100644
+index eaf26f19392e..ece3d3143643 100644
 --- a/arch/arm/boot/dts/overlays/README
 +++ b/arch/arm/boot/dts/overlays/README
 @@ -1019,6 +1019,12 @@ Load:   dtoverlay=hifiberry-digi-pro
@@ -409227,7 +409242,7 @@ index eaf26f19392e5..ece3d3143643b 100644
          Default values match Texy's display shield
 diff --git a/arch/arm/boot/dts/overlays/highperi-overlay.dts b/arch/arm/boot/dts/overlays/highperi-overlay.dts
 new file mode 100644
-index 0000000000000..4dbd5b108d57d
+index 000000000000..4dbd5b108d57
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/highperi-overlay.dts
 @@ -0,0 +1,64 @@
@@ -409296,7 +409311,7 @@ index 0000000000000..4dbd5b108d57d
 +	};
 +};
 diff --git a/arch/arm/boot/dts/overlays/overlay_map.dts b/arch/arm/boot/dts/overlays/overlay_map.dts
-index a20c0e079cc86..1287964c15bf1 100644
+index a20c0e079cc8..1287964c15bf 100644
 --- a/arch/arm/boot/dts/overlays/overlay_map.dts
 +++ b/arch/arm/boot/dts/overlays/overlay_map.dts
 @@ -5,6 +5,10 @@
@@ -409326,7 +409341,7 @@ This reverts commit 83b2a8fe43bda0c11981ad6afa5dd0104d78be28.
  1 file changed, 5 deletions(-)
 
 diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c
-index 736af270d7a10..d41630b23968e 100644
+index 736af270d7a1..d41630b23968 100644
 --- a/drivers/spi/spidev.c
 +++ b/drivers/spi/spidev.c
 @@ -399,7 +399,6 @@ spidev_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
@@ -409390,10 +409405,10 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  1 file changed, 9 deletions(-)
 
 diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
-index 5f6a95c4da6cb..b067ba232e39c 100644
+index 265e302b83e6..f48fb29c56e0 100644
 --- a/drivers/spi/spi.c
 +++ b/drivers/spi/spi.c
-@@ -1793,15 +1793,6 @@ static int of_spi_parse_dt(struct spi_controller *ctlr, struct spi_device *spi,
+@@ -1799,15 +1799,6 @@ static int of_spi_parse_dt(struct spi_controller *ctlr, struct spi_device *spi,
  	}
  	spi->chip_select = value;
  
@@ -409426,7 +409441,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  1 file changed, 4 insertions(+), 3 deletions(-)
 
 diff --git a/arch/arm/boot/dts/overlays/rpivid-v4l2-overlay.dts b/arch/arm/boot/dts/overlays/rpivid-v4l2-overlay.dts
-index e6ece0570e90d..cd8d96bb57153 100644
+index e6ece0570e90..cd8d96bb5715 100644
 --- a/arch/arm/boot/dts/overlays/rpivid-v4l2-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/rpivid-v4l2-overlay.dts
 @@ -13,11 +13,12 @@
@@ -409465,7 +409480,7 @@ Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
  1 file changed, 20 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-index 2ddac7382fb9e..2e022c5e1cfd1 100644
+index 2ddac7382fb9..2e022c5e1cfd 100644
 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
 +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
 @@ -967,11 +967,30 @@ static int unicam_enum_fmt_vid_cap(struct file *file, void  *priv,
@@ -409520,7 +409535,7 @@ Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
 
 diff --git a/include/uapi/linux/bcm2835-isp.h b/include/uapi/linux/bcm2835-isp.h
 new file mode 100644
-index 0000000000000..e7afc367fd76c
+index 000000000000..e7afc367fd76
 --- /dev/null
 +++ b/include/uapi/linux/bcm2835-isp.h
 @@ -0,0 +1,320 @@
@@ -409869,7 +409884,7 @@ Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
  create mode 100644 Documentation/media/uapi/v4l/pixfmt-meta-bcm2835-isp-stats.rst
 
 diff --git a/Documentation/media/uapi/v4l/meta-formats.rst b/Documentation/media/uapi/v4l/meta-formats.rst
-index 3d937720f0b9f..66245b369c36a 100644
+index 3d937720f0b9..66245b369c36 100644
 --- a/Documentation/media/uapi/v4l/meta-formats.rst
 +++ b/Documentation/media/uapi/v4l/meta-formats.rst
 @@ -19,6 +19,7 @@ These formats are used for the :ref:`metadata` interface only.
@@ -409882,7 +409897,7 @@ index 3d937720f0b9f..66245b369c36a 100644
      pixfmt-meta-sensor-data
 diff --git a/Documentation/media/uapi/v4l/pixfmt-meta-bcm2835-isp-stats.rst b/Documentation/media/uapi/v4l/pixfmt-meta-bcm2835-isp-stats.rst
 new file mode 100644
-index 0000000000000..f974774c82527
+index 000000000000..f974774c8252
 --- /dev/null
 +++ b/Documentation/media/uapi/v4l/pixfmt-meta-bcm2835-isp-stats.rst
 @@ -0,0 +1,41 @@
@@ -409928,7 +409943,7 @@ index 0000000000000..f974774c82527
 +	             bcm2835_isp_stats_focus bcm2835_isp_stats
 +
 diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
-index fb279eeced455..27370a6cd75f2 100644
+index fb279eeced45..27370a6cd75f 100644
 --- a/drivers/media/v4l2-core/v4l2-ioctl.c
 +++ b/drivers/media/v4l2-core/v4l2-ioctl.c
 @@ -1333,6 +1333,7 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt)
@@ -409940,7 +409955,7 @@ index fb279eeced455..27370a6cd75f2 100644
  	default:
  		/* Compressed formats */
 diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
-index d8320844d188c..10e146cd092aa 100644
+index d8320844d188..10e146cd092a 100644
 --- a/include/uapi/linux/videodev2.h
 +++ b/include/uapi/linux/videodev2.h
 @@ -769,6 +769,7 @@ struct v4l2_pix_format {
@@ -409973,7 +409988,7 @@ Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
 
 diff --git a/Documentation/media/v4l-drivers/bcm2835-isp.rst b/Documentation/media/v4l-drivers/bcm2835-isp.rst
 new file mode 100644
-index 0000000000000..e1c19f78435e6
+index 000000000000..e1c19f78435e
 --- /dev/null
 +++ b/Documentation/media/v4l-drivers/bcm2835-isp.rst
 @@ -0,0 +1,127 @@
@@ -410105,7 +410120,7 @@ index 0000000000000..e1c19f78435e6
 +                bcm2835_isp_denoise bcm2835_isp_sharpen
 +                bcm2835_isp_dpc_mode bcm2835_isp_dpc
 diff --git a/Documentation/media/v4l-drivers/index.rst b/Documentation/media/v4l-drivers/index.rst
-index c4c78a28654c0..bb05f4cf86238 100644
+index c4c78a28654c..bb05f4cf8623 100644
 --- a/Documentation/media/v4l-drivers/index.rst
 +++ b/Documentation/media/v4l-drivers/index.rst
 @@ -35,6 +35,7 @@ For more details see the file COPYING in the source distribution of Linux.
@@ -410117,7 +410132,7 @@ index c4c78a28654c0..bb05f4cf86238 100644
  	cafe_ccic
  	cpia2
 diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-controls.h
-index d21ac75456263..660574b1b4e7a 100644
+index d21ac7545626..660574b1b4e7 100644
 --- a/include/uapi/linux/v4l2-controls.h
 +++ b/include/uapi/linux/v4l2-controls.h
 @@ -192,6 +192,10 @@ enum v4l2_colorfx {
@@ -410153,7 +410168,7 @@ Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
  2 files changed, 24 insertions(+), 24 deletions(-)
 
 diff --git a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
-index 4317bf5954774..e69ec072c2c77 100644
+index 4317bf595477..e69ec072c2c7 100644
 --- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
 +++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
 @@ -1523,7 +1523,7 @@ static int get_num_cameras(struct vchiq_mmal_instance *instance,
@@ -410166,7 +410181,7 @@ index 4317bf5954774..e69ec072c2c77 100644
  	int i;
  
 diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h b/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h
-index d3d7828d1e56c..27bafc5f01d2b 100644
+index d3d7828d1e56..27bafc5f01d2 100644
 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h
 +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h
 @@ -23,21 +23,21 @@
@@ -410292,7 +410307,7 @@ Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
  create mode 100644 drivers/staging/vc04_services/bcm2835-isp/bcm2835_isp_fmts.h
 
 diff --git a/MAINTAINERS b/MAINTAINERS
-index ac0d4c2eeedfe..4745f22521277 100644
+index ac0d4c2eeedf..4745f2252127 100644
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
 @@ -3212,6 +3212,15 @@ S:	Maintained
@@ -410312,7 +410327,7 @@ index ac0d4c2eeedfe..4745f22521277 100644
  M:	Hauke Mehrtens <hauke@hauke-m.de>
  M:	Rafał Miłecki <zajec5@gmail.com>
 diff --git a/drivers/staging/vc04_services/Kconfig b/drivers/staging/vc04_services/Kconfig
-index 0db67350a1f17..33146fabc59ec 100644
+index 0db67350a1f1..33146fabc59e 100644
 --- a/drivers/staging/vc04_services/Kconfig
 +++ b/drivers/staging/vc04_services/Kconfig
 @@ -25,6 +25,7 @@ source "drivers/staging/vc04_services/bcm2835-camera/Kconfig"
@@ -410324,7 +410339,7 @@ index 0db67350a1f17..33146fabc59ec 100644
  endif
  
 diff --git a/drivers/staging/vc04_services/Makefile b/drivers/staging/vc04_services/Makefile
-index 709185d002e11..a1d111ba3901d 100644
+index 709185d002e1..a1d111ba3901 100644
 --- a/drivers/staging/vc04_services/Makefile
 +++ b/drivers/staging/vc04_services/Makefile
 @@ -15,6 +15,7 @@ obj-$(CONFIG_VIDEO_BCM2835)		+= bcm2835-camera/
@@ -410337,7 +410352,7 @@ index 709185d002e11..a1d111ba3901d 100644
  
 diff --git a/drivers/staging/vc04_services/bcm2835-isp/Kconfig b/drivers/staging/vc04_services/bcm2835-isp/Kconfig
 new file mode 100644
-index 0000000000000..71b14acc297e0
+index 000000000000..71b14acc297e
 --- /dev/null
 +++ b/drivers/staging/vc04_services/bcm2835-isp/Kconfig
 @@ -0,0 +1,14 @@
@@ -410357,7 +410372,7 @@ index 0000000000000..71b14acc297e0
 +	  will be called bcm2835-isp.
 diff --git a/drivers/staging/vc04_services/bcm2835-isp/Makefile b/drivers/staging/vc04_services/bcm2835-isp/Makefile
 new file mode 100644
-index 0000000000000..42d3081d342f4
+index 000000000000..42d3081d342f
 --- /dev/null
 +++ b/drivers/staging/vc04_services/bcm2835-isp/Makefile
 @@ -0,0 +1,8 @@
@@ -410371,7 +410386,7 @@ index 0000000000000..42d3081d342f4
 +	-D__VCCOREVER__=0x04000000
 diff --git a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
 new file mode 100644
-index 0000000000000..6056218af679f
+index 000000000000..6056218af679
 --- /dev/null
 +++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
 @@ -0,0 +1,1627 @@
@@ -412004,7 +412019,7 @@ index 0000000000000..6056218af679f
 +MODULE_ALIAS("platform:bcm2835-isp");
 diff --git a/drivers/staging/vc04_services/bcm2835-isp/bcm2835_isp_ctrls.h b/drivers/staging/vc04_services/bcm2835-isp/bcm2835_isp_ctrls.h
 new file mode 100644
-index 0000000000000..cfbb1063aad1c
+index 000000000000..cfbb1063aad1
 --- /dev/null
 +++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835_isp_ctrls.h
 @@ -0,0 +1,67 @@
@@ -412077,7 +412092,7 @@ index 0000000000000..cfbb1063aad1c
 +#endif
 diff --git a/drivers/staging/vc04_services/bcm2835-isp/bcm2835_isp_fmts.h b/drivers/staging/vc04_services/bcm2835-isp/bcm2835_isp_fmts.h
 new file mode 100644
-index 0000000000000..ded2be584f95f
+index 000000000000..ded2be584f95
 --- /dev/null
 +++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835_isp_fmts.h
 @@ -0,0 +1,272 @@
@@ -412354,7 +412369,7 @@ index 0000000000000..ded2be584f95f
 +
 +#endif
 diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-encodings.h b/drivers/staging/vc04_services/vchiq-mmal/mmal-encodings.h
-index 44ba91aa6d479..8d904fcce3889 100644
+index 44ba91aa6d47..8d904fcce388 100644
 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-encodings.h
 +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-encodings.h
 @@ -100,6 +100,10 @@
@@ -412369,7 +412384,7 @@ index 44ba91aa6d479..8d904fcce3889 100644
  
  /** \name Pre-defined audio encodings */
 diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h b/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h
-index 27bafc5f01d2b..9c752db455658 100644
+index 27bafc5f01d2..9c752db45565 100644
 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h
 +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h
 @@ -221,6 +221,62 @@ enum mmal_parameter_camera_type {
@@ -412557,7 +412572,7 @@ Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
  1 file changed, 3 insertions(+)
 
 diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
-index a3fcb1830995c..d01c2d4243104 100644
+index a3fcb1830995..d01c2d424310 100644
 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
 +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
 @@ -142,6 +142,7 @@ static struct platform_device *bcm2835_camera;
@@ -412611,7 +412626,7 @@ Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
  5 files changed, 5 insertions(+)
 
 diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig
-index 35ee59842466c..135c2c2ae292f 100644
+index 35ee59842466..135c2c2ae292 100644
 --- a/arch/arm/configs/bcm2709_defconfig
 +++ b/arch/arm/configs/bcm2709_defconfig
 @@ -1281,6 +1281,7 @@ CONFIG_BCM2835_VCHIQ=y
@@ -412623,7 +412638,7 @@ index 35ee59842466c..135c2c2ae292f 100644
  CONFIG_BCM2835_MBOX=y
  # CONFIG_IOMMU_SUPPORT is not set
 diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig
-index 27b906723ba66..5e75a34d9257d 100644
+index 27b906723ba6..5e75a34d9257 100644
 --- a/arch/arm/configs/bcm2711_defconfig
 +++ b/arch/arm/configs/bcm2711_defconfig
 @@ -1280,6 +1280,7 @@ CONFIG_BCM2835_VCHIQ=y
@@ -412635,7 +412650,7 @@ index 27b906723ba66..5e75a34d9257d 100644
  CONFIG_MAILBOX=y
  CONFIG_BCM2835_MBOX=y
 diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig
-index 892840ab9370e..560f2e5a9a974 100644
+index 892840ab9370..560f2e5a9a97 100644
 --- a/arch/arm/configs/bcmrpi_defconfig
 +++ b/arch/arm/configs/bcmrpi_defconfig
 @@ -1291,6 +1291,7 @@ CONFIG_BCM2835_VCHIQ=y
@@ -412647,7 +412662,7 @@ index 892840ab9370e..560f2e5a9a974 100644
  CONFIG_BCM2835_MBOX=y
  # CONFIG_IOMMU_SUPPORT is not set
 diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig
-index 1389bdc588084..fcb3c1e19ac4d 100644
+index 1389bdc58808..fcb3c1e19ac4 100644
 --- a/arch/arm64/configs/bcm2711_defconfig
 +++ b/arch/arm64/configs/bcm2711_defconfig
 @@ -1307,6 +1307,7 @@ CONFIG_BCM2835_VCHIQ=y
@@ -412659,7 +412674,7 @@ index 1389bdc588084..fcb3c1e19ac4d 100644
  CONFIG_MAILBOX=y
  CONFIG_BCM2835_MBOX=y
 diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig
-index 3a39acd6d0abe..bb3b687406ab0 100644
+index 3a39acd6d0ab..bb3b687406ab 100644
 --- a/arch/arm64/configs/bcmrpi3_defconfig
 +++ b/arch/arm64/configs/bcmrpi3_defconfig
 @@ -1121,6 +1121,7 @@ CONFIG_FB_TFT_WATTEROTT=m
@@ -412687,7 +412702,7 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_hvs.c b/drivers/gpu/drm/vc4/vc4_hvs.c
-index 59198019aa1d9..d76521be2c0d0 100644
+index 59198019aa1d..d76521be2c0d 100644
 --- a/drivers/gpu/drm/vc4/vc4_hvs.c
 +++ b/drivers/gpu/drm/vc4/vc4_hvs.c
 @@ -240,7 +240,7 @@ static int vc4_hvs_bind(struct device *dev, struct device *master, void *data)
@@ -412716,7 +412731,7 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
  2 files changed, 29 insertions(+), 6 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
-index 2ebaea7e2a7bf..2919549b227f6 100644
+index 2ebaea7e2a7b..2919549b227f 100644
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
 @@ -580,12 +580,7 @@ static void vc4_hdmi_encoder_enable(struct drm_encoder *encoder)
@@ -412787,7 +412802,7 @@ index 2ebaea7e2a7bf..2919549b227f6 100644
  };
  
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.h b/drivers/gpu/drm/vc4/vc4_hdmi.h
-index 9b80f9401d583..95bed29531b9d 100644
+index 9b80f9401d58..95bed29531b9 100644
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.h
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.h
 @@ -92,6 +92,9 @@ struct vc4_hdmi_variant {
@@ -412816,7 +412831,7 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
  2 files changed, 2 insertions(+)
 
 diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig
-index 135c2c2ae292f..e56f5bb9a54eb 100644
+index 135c2c2ae292..e56f5bb9a54e 100644
 --- a/arch/arm/configs/bcm2709_defconfig
 +++ b/arch/arm/configs/bcm2709_defconfig
 @@ -912,6 +912,7 @@ CONFIG_DRM_UDL=m
@@ -412828,7 +412843,7 @@ index 135c2c2ae292f..e56f5bb9a54eb 100644
  CONFIG_TINYDRM_ILI9341=m
  CONFIG_TINYDRM_MI0283QT=m
 diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig
-index bb3b687406ab0..f6c12a7a04bee 100644
+index bb3b687406ab..f6c12a7a04be 100644
 --- a/arch/arm64/configs/bcmrpi3_defconfig
 +++ b/arch/arm64/configs/bcmrpi3_defconfig
 @@ -794,6 +794,7 @@ CONFIG_DRM_UDL=m
@@ -412859,7 +412874,7 @@ Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
  1 file changed, 94 insertions(+)
 
 diff --git a/drivers/media/i2c/imx219.c b/drivers/media/i2c/imx219.c
-index 017ae503cc09e..988ebf6dd8950 100644
+index 017ae503cc09..988ebf6dd895 100644
 --- a/drivers/media/i2c/imx219.c
 +++ b/drivers/media/i2c/imx219.c
 @@ -122,6 +122,14 @@ enum pad_types {
@@ -413046,7 +413061,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 96 insertions(+), 23 deletions(-)
 
 diff --git a/drivers/media/i2c/ov5647.c b/drivers/media/i2c/ov5647.c
-index 66b3ee5cc1909..e7c7e3ab4b383 100644
+index 66b3ee5cc190..e7c7e3ab4b38 100644
 --- a/drivers/media/i2c/ov5647.c
 +++ b/drivers/media/i2c/ov5647.c
 @@ -70,25 +70,14 @@
@@ -413259,7 +413274,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/media/i2c/ov5647.c b/drivers/media/i2c/ov5647.c
-index e7c7e3ab4b383..09d68b0b4a13e 100644
+index e7c7e3ab4b38..09d68b0b4a13 100644
 --- a/drivers/media/i2c/ov5647.c
 +++ b/drivers/media/i2c/ov5647.c
 @@ -1146,8 +1146,10 @@ static int ov5647_set_fmt(struct v4l2_subdev *sd,
@@ -413293,7 +413308,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 27 insertions(+), 4 deletions(-)
 
 diff --git a/drivers/media/i2c/ov5647.c b/drivers/media/i2c/ov5647.c
-index 09d68b0b4a13e..02d72feb837ef 100644
+index 09d68b0b4a13..02d72feb837e 100644
 --- a/drivers/media/i2c/ov5647.c
 +++ b/drivers/media/i2c/ov5647.c
 @@ -89,6 +89,8 @@ struct ov5647_mode {
@@ -413430,7 +413445,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 27 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/media/i2c/ov5647.c b/drivers/media/i2c/ov5647.c
-index 02d72feb837ef..c012e0b3d68bd 100644
+index 02d72feb837e..c012e0b3d68b 100644
 --- a/drivers/media/i2c/ov5647.c
 +++ b/drivers/media/i2c/ov5647.c
 @@ -90,6 +90,8 @@ struct ov5647_mode {
@@ -413577,7 +413592,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 55 insertions(+), 10 deletions(-)
 
 diff --git a/drivers/media/i2c/ov5647.c b/drivers/media/i2c/ov5647.c
-index c012e0b3d68bd..445a0ce186ece 100644
+index c012e0b3d68b..445a0ce186ec 100644
 --- a/drivers/media/i2c/ov5647.c
 +++ b/drivers/media/i2c/ov5647.c
 @@ -61,6 +61,8 @@
@@ -413791,7 +413806,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 12 insertions(+), 15 deletions(-)
 
 diff --git a/drivers/media/i2c/ov5647.c b/drivers/media/i2c/ov5647.c
-index 445a0ce186ece..49247711221c9 100644
+index 445a0ce186ec..49247711221c 100644
 --- a/drivers/media/i2c/ov5647.c
 +++ b/drivers/media/i2c/ov5647.c
 @@ -1472,7 +1472,6 @@ static int ov5647_probe(struct i2c_client *client)
@@ -413853,7 +413868,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 15 insertions(+), 15 deletions(-)
 
 diff --git a/drivers/media/i2c/ov5647.c b/drivers/media/i2c/ov5647.c
-index 49247711221c9..da4ef30d8f328 100644
+index 49247711221c..da4ef30d8f32 100644
 --- a/drivers/media/i2c/ov5647.c
 +++ b/drivers/media/i2c/ov5647.c
 @@ -592,7 +592,7 @@ static struct ov5647_mode supported_modes_8bit[] = {
@@ -413971,7 +413986,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 39 insertions(+), 8 deletions(-)
 
 diff --git a/drivers/media/i2c/ov5647.c b/drivers/media/i2c/ov5647.c
-index da4ef30d8f328..6d84d2785f740 100644
+index da4ef30d8f32..6d84d2785f74 100644
 --- a/drivers/media/i2c/ov5647.c
 +++ b/drivers/media/i2c/ov5647.c
 @@ -84,6 +84,11 @@
@@ -414097,7 +414112,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/media/i2c/imx219.c b/drivers/media/i2c/imx219.c
-index 988ebf6dd8950..b84fc19e9ff75 100644
+index 988ebf6dd895..b84fc19e9ff7 100644
 --- a/drivers/media/i2c/imx219.c
 +++ b/drivers/media/i2c/imx219.c
 @@ -1573,7 +1573,8 @@ static int imx219_probe(struct i2c_client *client)
@@ -414130,7 +414145,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 44 insertions(+)
 
 diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-index 2e022c5e1cfd1..f94a790ca3153 100644
+index 2e022c5e1cfd..f94a790ca315 100644
 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
 +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
 @@ -1898,6 +1898,39 @@ static int unicam_g_edid(struct file *file, void *priv, struct v4l2_edid *edid)
@@ -414219,7 +414234,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 3 deletions(-)
 
 diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-index f94a790ca3153..e7c0e91cb841c 100644
+index f94a790ca315..e7c0e91cb841 100644
 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
 +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
 @@ -2204,9 +2204,6 @@ static int unicam_release(struct file *file)
@@ -414253,7 +414268,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-index e7c0e91cb841c..5b5585f6770c9 100644
+index e7c0e91cb841..5b5585f6770c 100644
 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
 +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
 @@ -2170,16 +2170,18 @@ static int unicam_open(struct file *file)
@@ -414296,7 +414311,7 @@ Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
  2 files changed, 72 insertions(+), 5 deletions(-)
 
 diff --git a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
-index 6056218af679f..6c4405ab4dc58 100644
+index 6056218af679..6c4405ab4dc5 100644
 --- a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
 +++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
 @@ -227,8 +227,9 @@ static const struct bcm2835_isp_fmt *get_fmt(u32 mmal_fmt)
@@ -414382,7 +414397,7 @@ index 6056218af679f..6c4405ab4dc58 100644
  	.vidioc_reqbufs			= vb2_ioctl_reqbufs,
  	.vidioc_querybuf		= vb2_ioctl_querybuf,
 diff --git a/drivers/staging/vc04_services/bcm2835-isp/bcm2835_isp_fmts.h b/drivers/staging/vc04_services/bcm2835-isp/bcm2835_isp_fmts.h
-index ded2be584f95f..9d8ccb403480e 100644
+index ded2be584f95..9d8ccb403480 100644
 --- a/drivers/staging/vc04_services/bcm2835-isp/bcm2835_isp_fmts.h
 +++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835_isp_fmts.h
 @@ -22,6 +22,7 @@ struct bcm2835_isp_fmt {
@@ -414638,10 +414653,10 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
-index b067ba232e39c..464d28ebc9572 100644
+index f48fb29c56e0..798005db47d8 100644
 --- a/drivers/spi/spi.c
 +++ b/drivers/spi/spi.c
-@@ -3127,8 +3127,8 @@ int spi_setup(struct spi_device *spi)
+@@ -3128,8 +3128,8 @@ int spi_setup(struct spi_device *spi)
  
  	if (ctlr->use_gpio_descriptors && ctlr->cs_gpiods &&
  	    ctlr->cs_gpiods[spi->chip_select] && !(spi->mode & SPI_CS_HIGH)) {
@@ -414670,7 +414685,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  1 file changed, 412 insertions(+), 73 deletions(-)
 
 diff --git a/drivers/dma/bcm2835-dma.c b/drivers/dma/bcm2835-dma.c
-index 1e5d6f1bed4ec..53346d7eb66c4 100644
+index 1e5d6f1bed4e..53346d7eb66c 100644
 --- a/drivers/dma/bcm2835-dma.c
 +++ b/drivers/dma/bcm2835-dma.c
 @@ -38,6 +38,11 @@
@@ -415480,7 +415495,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  2 files changed, 6 insertions(+)
 
 diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
-index 7467817bfe7d1..86dd3093e7098 100644
+index 7467817bfe7d..86dd3093e709 100644
 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
 +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
 @@ -554,5 +554,7 @@
@@ -415492,7 +415507,7 @@ index 7467817bfe7d1..86dd3093e7098 100644
  	};
  };
 diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
-index ece3d3143643b..505f37235473c 100644
+index ece3d3143643..505f37235473 100644
 --- a/arch/arm/boot/dts/overlays/README
 +++ b/arch/arm/boot/dts/overlays/README
 @@ -159,6 +159,10 @@ Params:
@@ -415531,7 +415546,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  1 file changed, 3 deletions(-)
 
 diff --git a/arch/arm/boot/dts/overlays/i2c-gpio-overlay.dts b/arch/arm/boot/dts/overlays/i2c-gpio-overlay.dts
-index e94053b55610a..39e7bc5fa9d88 100644
+index e94053b55610..39e7bc5fa9d8 100644
 --- a/arch/arm/boot/dts/overlays/i2c-gpio-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/i2c-gpio-overlay.dts
 @@ -9,9 +9,6 @@
@@ -415567,7 +415582,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 35 deletions(-)
 
 diff --git a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
-index 6c4405ab4dc58..edb1a27328de3 100644
+index 6c4405ab4dc5..edb1a27328de 100644
 --- a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
 +++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
 @@ -1160,41 +1160,6 @@ static int bcm2835_isp_get_supported_fmts(struct bcm2835_isp_node *node)
@@ -415636,7 +415651,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  2 files changed, 19 insertions(+), 17 deletions(-)
 
 diff --git a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
-index edb1a27328de3..bd1bb760419cc 100644
+index edb1a27328de..bd1bb760419c 100644
 --- a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
 +++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
 @@ -67,7 +67,7 @@ struct bcm2835_isp_q_data {
@@ -415756,7 +415771,7 @@ index edb1a27328de3..bd1bb760419cc 100644
  		}
  	}
 diff --git a/drivers/staging/vc04_services/bcm2835-isp/bcm2835_isp_fmts.h b/drivers/staging/vc04_services/bcm2835-isp/bcm2835_isp_fmts.h
-index 9d8ccb403480e..af3bde152bb24 100644
+index 9d8ccb403480..af3bde152bb2 100644
 --- a/drivers/staging/vc04_services/bcm2835-isp/bcm2835_isp_fmts.h
 +++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835_isp_fmts.h
 @@ -26,7 +26,7 @@ struct bcm2835_isp_fmt {
@@ -415791,7 +415806,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  1 file changed, 2 insertions(+)
 
 diff --git a/arch/arm/boot/dts/overlays/i2c-gpio-overlay.dts b/arch/arm/boot/dts/overlays/i2c-gpio-overlay.dts
-index 39e7bc5fa9d88..def139db8bcb5 100644
+index 39e7bc5fa9d8..def139db8bcb 100644
 --- a/arch/arm/boot/dts/overlays/i2c-gpio-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/i2c-gpio-overlay.dts
 @@ -16,6 +16,8 @@
@@ -415825,7 +415840,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  2 files changed, 4 insertions(+)
 
 diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig
-index fcb3c1e19ac4d..d626405a9199b 100644
+index fcb3c1e19ac4..d626405a9199 100644
 --- a/arch/arm64/configs/bcm2711_defconfig
 +++ b/arch/arm64/configs/bcm2711_defconfig
 @@ -674,6 +674,9 @@ CONFIG_SPI_BCM2835AUX=m
@@ -415839,7 +415854,7 @@ index fcb3c1e19ac4d..d626405a9199b 100644
  CONFIG_GPIO_SYSFS=y
  CONFIG_GPIO_BCM_VIRT=y
 diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig
-index f6c12a7a04bee..751f6efda9f19 100644
+index f6c12a7a04be..751f6efda9f1 100644
 --- a/arch/arm64/configs/bcmrpi3_defconfig
 +++ b/arch/arm64/configs/bcmrpi3_defconfig
 @@ -611,6 +611,7 @@ CONFIG_GPIO_BCM_VIRT=y
@@ -415873,7 +415888,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  2 files changed, 2 insertions(+)
 
 diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig
-index 5e75a34d9257d..134c235b0fc2d 100644
+index 5e75a34d9257..134c235b0fc2 100644
 --- a/arch/arm/configs/bcm2711_defconfig
 +++ b/arch/arm/configs/bcm2711_defconfig
 @@ -579,6 +579,7 @@ CONFIG_TOUCHSCREEN_EXC3000=m
@@ -415885,7 +415900,7 @@ index 5e75a34d9257d..134c235b0fc2d 100644
  CONFIG_TOUCHSCREEN_STMPE=m
  CONFIG_INPUT_MISC=y
 diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig
-index d626405a9199b..7c362f4355c55 100644
+index d626405a9199..7c362f4355c5 100644
 --- a/arch/arm64/configs/bcm2711_defconfig
 +++ b/arch/arm64/configs/bcm2711_defconfig
 @@ -614,6 +614,7 @@ CONFIG_TOUCHSCREEN_EXC3000=m
@@ -415913,7 +415928,7 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi_phy.c b/drivers/gpu/drm/vc4/vc4_hdmi_phy.c
-index 732d8a0e5a1cd..0e242f87db9e5 100644
+index 732d8a0e5a1c..0e242f87db9e 100644
 --- a/drivers/gpu/drm/vc4/vc4_hdmi_phy.c
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi_phy.c
 @@ -182,7 +182,7 @@ static u8 phy_get_cp_current(unsigned long vco_freq)
@@ -415946,7 +415961,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  2 files changed, 8 insertions(+), 8 deletions(-)
 
 diff --git a/arch/arm/boot/dts/overlays/ads1015-overlay.dts b/arch/arm/boot/dts/overlays/ads1015-overlay.dts
-index 26d68fccc6a85..deeee12283956 100644
+index 26d68fccc6a8..deeee1228395 100644
 --- a/arch/arm/boot/dts/overlays/ads1015-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/ads1015-overlay.dts
 @@ -24,7 +24,7 @@
@@ -415986,7 +416001,7 @@ index 26d68fccc6a85..deeee12283956 100644
              #address-cells = <1>;
              #size-cells = <0>;
 diff --git a/arch/arm/boot/dts/overlays/ads1115-overlay.dts b/arch/arm/boot/dts/overlays/ads1115-overlay.dts
-index b380d925f0a51..4fc571c2db334 100644
+index b380d925f0a5..4fc571c2db33 100644
 --- a/arch/arm/boot/dts/overlays/ads1115-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/ads1115-overlay.dts
 @@ -26,7 +26,7 @@
@@ -416040,7 +416055,7 @@ Signed-off-by: Jacko Dirks <jdirks.linuxdev@gmail.com>
  1 file changed, 1 insertion(+)
 
 diff --git a/drivers/media/i2c/tc358743.c b/drivers/media/i2c/tc358743.c
-index 01e255aede504..73caf8609a7e1 100644
+index 3dbf60faccaa..427ae6c009d4 100644
 --- a/drivers/media/i2c/tc358743.c
 +++ b/drivers/media/i2c/tc358743.c
 @@ -2004,6 +2004,7 @@ static int tc358743_probe_of(struct tc358743_state *state)
@@ -416066,7 +416081,7 @@ Signed-off-by: Jacko Dirks <jdirks.linuxdev@gmail.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-index 5b5585f6770c9..6fd1b0939a07a 100644
+index 5b5585f6770c..6fd1b0939a07 100644
 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
 +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
 @@ -1001,7 +1001,7 @@ const struct unicam_fmt *get_first_supported_format(struct unicam_device *dev)
@@ -416102,7 +416117,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  1 file changed, 2 insertions(+), 3 deletions(-)
 
 diff --git a/drivers/video/fbdev/bcm2708_fb.c b/drivers/video/fbdev/bcm2708_fb.c
-index 8234207b1914b..d035fa59c269d 100644
+index 8234207b1914..d035fa59c269 100644
 --- a/drivers/video/fbdev/bcm2708_fb.c
 +++ b/drivers/video/fbdev/bcm2708_fb.c
 @@ -1104,10 +1104,9 @@ static int bcm2708_fb_probe(struct platform_device *dev)
@@ -416140,7 +416155,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  2 files changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
-index 505f37235473c..116863ba85b6c 100644
+index 505f37235473..116863ba85b6 100644
 --- a/arch/arm/boot/dts/overlays/README
 +++ b/arch/arm/boot/dts/overlays/README
 @@ -2114,6 +2114,7 @@ Info:   Overlay for the NXP SC16IS752 Dual UART with SPI Interface
@@ -416152,7 +416167,7 @@ index 505f37235473c..116863ba85b6c 100644
  
  Name:   sdhost
 diff --git a/arch/arm/boot/dts/overlays/sc16is752-spi1-overlay.dts b/arch/arm/boot/dts/overlays/sc16is752-spi1-overlay.dts
-index 4e33b14afc784..131d3ab43d3a5 100644
+index 4e33b14afc78..131d3ab43d3a 100644
 --- a/arch/arm/boot/dts/overlays/sc16is752-spi1-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/sc16is752-spi1-overlay.dts
 @@ -56,6 +56,7 @@
@@ -416180,7 +416195,7 @@ Signed-off-by: Dom Cobley <popcornmix@gmail.com>
  1 file changed, 11 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
-index 2919549b227f6..7b5421d248710 100644
+index 2919549b227f..7b5421d24871 100644
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
 @@ -1265,8 +1265,13 @@ static void vc4_cec_read_msg(struct vc4_hdmi *vc4_hdmi, u32 cntrl1)
@@ -416230,7 +416245,7 @@ Signed-off-by: Dom Cobley <popcornmix@gmail.com>
  1 file changed, 6 insertions(+), 4 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi_regs.h b/drivers/gpu/drm/vc4/vc4_hdmi_regs.h
-index ea948ffaa69bc..a0fa082a017c8 100644
+index ea948ffaa69b..a0fa082a017c 100644
 --- a/drivers/gpu/drm/vc4/vc4_hdmi_regs.h
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi_regs.h
 @@ -33,11 +33,12 @@ enum vc4_hdmi_field {
@@ -416279,7 +416294,7 @@ Signed-off-by: Dom Cobley <popcornmix@gmail.com>
  4 files changed, 37 insertions(+), 4 deletions(-)
 
 diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi
-index 41698e7f5e243..96ef133391d1c 100644
+index 41698e7f5e24..96ef133391d1 100644
 --- a/arch/arm/boot/dts/bcm2711.dtsi
 +++ b/arch/arm/boot/dts/bcm2711.dtsi
 @@ -316,7 +316,8 @@
@@ -416337,7 +416352,7 @@ index 41698e7f5e243..96ef133391d1c 100644
  		};
  
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
-index 7b5421d248710..8d8ba07b3c9b8 100644
+index 7b5421d24871..8d8ba07b3c9b 100644
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
 @@ -1582,6 +1582,14 @@ static int vc5_hdmi_init_resources(struct vc4_hdmi *vc4_hdmi)
@@ -416356,7 +416371,7 @@ index 7b5421d248710..8d8ba07b3c9b8 100644
  	if (!res)
  		return -ENODEV;
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.h b/drivers/gpu/drm/vc4/vc4_hdmi.h
-index 95bed29531b9d..72024547e7fa2 100644
+index 95bed29531b9..72024547e7fa 100644
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.h
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.h
 @@ -140,6 +140,8 @@ struct vc4_hdmi {
@@ -416369,7 +416384,7 @@ index 95bed29531b9d..72024547e7fa2 100644
  	int hpd_gpio;
  	bool hpd_active_low;
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi_regs.h b/drivers/gpu/drm/vc4/vc4_hdmi_regs.h
-index a0fa082a017c8..7311a8c0f1e50 100644
+index a0fa082a017c..7311a8c0f1e5 100644
 --- a/drivers/gpu/drm/vc4/vc4_hdmi_regs.h
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi_regs.h
 @@ -24,6 +24,7 @@ enum vc4_hdmi_regs {
@@ -416441,7 +416456,7 @@ Signed-off-by: Dom Cobley <popcornmix@gmail.com>
  3 files changed, 22 insertions(+), 4 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
-index 8d8ba07b3c9b8..9f6b260a72386 100644
+index 8d8ba07b3c9b..9f6b260a7238 100644
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
 @@ -1286,7 +1286,7 @@ static irqreturn_t vc4_cec_irq_handler(int irq, void *priv)
@@ -416502,7 +416517,7 @@ index 8d8ba07b3c9b8..9f6b260a72386 100644
  
  static const struct of_device_id vc4_hdmi_dt_match[] = {
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.h b/drivers/gpu/drm/vc4/vc4_hdmi.h
-index 72024547e7fa2..7765b9cf885b3 100644
+index 72024547e7fa..7765b9cf885b 100644
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.h
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.h
 @@ -97,6 +97,9 @@ struct vc4_hdmi_variant {
@@ -416516,7 +416531,7 @@ index 72024547e7fa2..7765b9cf885b3 100644
  
  /* HDMI audio information */
 diff --git a/drivers/gpu/drm/vc4/vc4_regs.h b/drivers/gpu/drm/vc4/vc4_regs.h
-index 78809866097c8..4d017572a5c28 100644
+index 78809866097c..4d017572a5c2 100644
 --- a/drivers/gpu/drm/vc4/vc4_regs.h
 +++ b/drivers/gpu/drm/vc4/vc4_regs.h
 @@ -668,6 +668,15 @@
@@ -416550,7 +416565,7 @@ Signed-off-by: Dom Cobley <popcornmix@gmail.com>
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
-index 9f6b260a72386..7b9d98fe2e3eb 100644
+index 9f6b260a7238..7b9d98fe2e3e 100644
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
 @@ -1429,7 +1429,8 @@ static int vc4_hdmi_cec_init(struct vc4_hdmi *vc4_hdmi)
@@ -416582,7 +416597,7 @@ Signed-off-by: Dom Cobley <popcornmix@gmail.com>
  2 files changed, 11 insertions(+), 3 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
-index 7b9d98fe2e3eb..35d1da61f05dd 100644
+index 7b9d98fe2e3e..35d1da61f05d 100644
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
 @@ -79,6 +79,7 @@
@@ -416647,7 +416662,7 @@ index 7b9d98fe2e3eb..35d1da61f05dd 100644
  	.num_registers		= ARRAY_SIZE(vc5_hdmi_hdmi1_fields),
  	.phy_lane_mapping	= {
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.h b/drivers/gpu/drm/vc4/vc4_hdmi.h
-index 7765b9cf885b3..dbf96a3b01ee5 100644
+index 7765b9cf885b..dbf96a3b01ee 100644
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.h
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.h
 @@ -48,6 +48,9 @@ struct vc4_hdmi_variant {
@@ -416677,7 +416692,7 @@ Signed-off-by: Dom Cobley <popcornmix@gmail.com>
  2 files changed, 7 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
-index 35d1da61f05dd..093f424ad5b46 100644
+index 35d1da61f05d..093f424ad5b4 100644
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
 @@ -1403,9 +1403,6 @@ static int vc4_hdmi_cec_init(struct vc4_hdmi *vc4_hdmi)
@@ -416699,7 +416714,7 @@ index 35d1da61f05dd..093f424ad5b46 100644
  	.num_registers		= ARRAY_SIZE(vc4_hdmi_fields),
  
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.h b/drivers/gpu/drm/vc4/vc4_hdmi.h
-index dbf96a3b01ee5..60f7bf99e06ef 100644
+index dbf96a3b01ee..60f7bf99e06e 100644
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.h
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.h
 @@ -42,9 +42,6 @@ struct vc4_hdmi_variant {
@@ -416728,7 +416743,7 @@ Signed-off-by: Dom Cobley <popcornmix@gmail.com>
  2 files changed, 2 insertions(+)
 
 diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig
-index 134c235b0fc2d..311c8bfbaedf5 100644
+index 134c235b0fc2..311c8bfbaedf 100644
 --- a/arch/arm/configs/bcm2711_defconfig
 +++ b/arch/arm/configs/bcm2711_defconfig
 @@ -890,6 +890,7 @@ CONFIG_DRM_PANEL_SIMPLE=m
@@ -416740,7 +416755,7 @@ index 134c235b0fc2d..311c8bfbaedf5 100644
  CONFIG_TINYDRM_ILI9341=m
  CONFIG_TINYDRM_MI0283QT=m
 diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig
-index 7c362f4355c55..35afa6b6ffd61 100644
+index 7c362f4355c5..35afa6b6ffd6 100644
 --- a/arch/arm64/configs/bcm2711_defconfig
 +++ b/arch/arm64/configs/bcm2711_defconfig
 @@ -921,6 +921,7 @@ CONFIG_DRM_PANEL_SIMPLE=m
@@ -416776,7 +416791,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  1 file changed, 4 insertions(+), 16 deletions(-)
 
 diff --git a/arch/arm/boot/dts/overlays/tc358743-overlay.dts b/arch/arm/boot/dts/overlays/tc358743-overlay.dts
-index f8c059827234d..b317e088b37e2 100644
+index f8c059827234..b317e088b37e 100644
 --- a/arch/arm/boot/dts/overlays/tc358743-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/tc358743-overlay.dts
 @@ -54,28 +54,16 @@
@@ -416850,7 +416865,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  12 files changed, 80 insertions(+), 55 deletions(-)
 
 diff --git a/arch/arm/boot/dts/overlays/audiosense-pi-overlay.dts b/arch/arm/boot/dts/overlays/audiosense-pi-overlay.dts
-index 4b96a3a8a14a2..81af26374d920 100644
+index 4b96a3a8a14a..81af26374d92 100644
 --- a/arch/arm/boot/dts/overlays/audiosense-pi-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/audiosense-pi-overlay.dts
 @@ -24,6 +24,13 @@
@@ -416882,7 +416897,7 @@ index 4b96a3a8a14a2..81af26374d920 100644
  				#sound-dai-cells = <0>;
  				compatible = "ti,tlv320aic32x4";
 diff --git a/arch/arm/boot/dts/overlays/draws-overlay.dts b/arch/arm/boot/dts/overlays/draws-overlay.dts
-index 32b665c3934b7..08bfce0edb239 100644
+index 32b665c3934b..08bfce0edb23 100644
 --- a/arch/arm/boot/dts/overlays/draws-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/draws-overlay.dts
 @@ -30,6 +30,12 @@
@@ -416912,7 +416927,7 @@ index 32b665c3934b7..08bfce0edb239 100644
  
              tla2024: tla2024@48 {
 diff --git a/arch/arm/boot/dts/overlays/fe-pi-audio-overlay.dts b/arch/arm/boot/dts/overlays/fe-pi-audio-overlay.dts
-index 1c3ec3e21a184..743f14ae5768d 100644
+index 1c3ec3e21a18..743f14ae5768 100644
 --- a/arch/arm/boot/dts/overlays/fe-pi-audio-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/fe-pi-audio-overlay.dts
 @@ -6,7 +6,7 @@
@@ -416925,7 +416940,7 @@ index 1c3ec3e21a184..743f14ae5768d 100644
  			sgtl5000_mclk: sgtl5000_mclk {
  				compatible = "fixed-clock";
 diff --git a/arch/arm/boot/dts/overlays/imx219-overlay.dts b/arch/arm/boot/dts/overlays/imx219-overlay.dts
-index 5fd39060ee87c..7cdafdc3db1bd 100644
+index 5fd39060ee87..7cdafdc3db1b 100644
 --- a/arch/arm/boot/dts/overlays/imx219-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/imx219-overlay.dts
 @@ -27,12 +27,6 @@
@@ -416955,7 +416970,7 @@ index 5fd39060ee87c..7cdafdc3db1bd 100644
  	};
  
 diff --git a/arch/arm/boot/dts/overlays/irs1125-overlay.dts b/arch/arm/boot/dts/overlays/irs1125-overlay.dts
-index 3fc7a9e23019a..7e9431f64dc32 100644
+index 3fc7a9e23019..7e9431f64dc3 100644
 --- a/arch/arm/boot/dts/overlays/irs1125-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/irs1125-overlay.dts
 @@ -21,12 +21,6 @@
@@ -416988,7 +417003,7 @@ index 3fc7a9e23019a..7e9431f64dc32 100644
 +	};
  };
 diff --git a/arch/arm/boot/dts/overlays/mcp2515-can0-overlay.dts b/arch/arm/boot/dts/overlays/mcp2515-can0-overlay.dts
-index 0dae8053a9a91..46f143d809cc8 100755
+index 0dae8053a9a9..46f143d809cc 100755
 --- a/arch/arm/boot/dts/overlays/mcp2515-can0-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/mcp2515-can0-overlay.dts
 @@ -35,7 +35,7 @@
@@ -417001,7 +417016,7 @@ index 0dae8053a9a91..46f143d809cc8 100755
              /* external oscillator of mcp2515 on SPI0.0 */
              can0_osc: can0_osc {
 diff --git a/arch/arm/boot/dts/overlays/mcp2515-can1-overlay.dts b/arch/arm/boot/dts/overlays/mcp2515-can1-overlay.dts
-index c70dc3d05ebfe..0a8dd576818e9 100644
+index c70dc3d05ebf..0a8dd576818e 100644
 --- a/arch/arm/boot/dts/overlays/mcp2515-can1-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/mcp2515-can1-overlay.dts
 @@ -35,7 +35,7 @@
@@ -417014,7 +417029,7 @@ index c70dc3d05ebfe..0a8dd576818e9 100644
              /* external oscillator of mcp2515 on spi0.1 */
              can1_osc: can1_osc {
 diff --git a/arch/arm/boot/dts/overlays/midi-uart0-overlay.dts b/arch/arm/boot/dts/overlays/midi-uart0-overlay.dts
-index 565af7cf79d76..f7e44d29e1010 100644
+index 565af7cf79d7..f7e44d29e101 100644
 --- a/arch/arm/boot/dts/overlays/midi-uart0-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/midi-uart0-overlay.dts
 @@ -15,7 +15,7 @@
@@ -417027,7 +417042,7 @@ index 565af7cf79d76..f7e44d29e1010 100644
  			midi_clk: midi_clk {
  				compatible = "fixed-clock";
 diff --git a/arch/arm/boot/dts/overlays/ov5647-overlay.dts b/arch/arm/boot/dts/overlays/ov5647-overlay.dts
-index 34aa9f3861782..3dc817fa48a8f 100644
+index 34aa9f386178..3dc817fa48a8 100644
 --- a/arch/arm/boot/dts/overlays/ov5647-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/ov5647-overlay.dts
 @@ -21,12 +21,6 @@
@@ -417060,7 +417075,7 @@ index 34aa9f3861782..3dc817fa48a8f 100644
 +	};
  };
 diff --git a/arch/arm/boot/dts/overlays/rpivid-v4l2-overlay.dts b/arch/arm/boot/dts/overlays/rpivid-v4l2-overlay.dts
-index cd8d96bb57153..0a611b31b9d43 100644
+index cd8d96bb5715..0a611b31b9d4 100644
 --- a/arch/arm/boot/dts/overlays/rpivid-v4l2-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/rpivid-v4l2-overlay.dts
 @@ -26,12 +26,6 @@
@@ -417093,7 +417108,7 @@ index cd8d96bb57153..0a611b31b9d43 100644
 +	};
  };
 diff --git a/arch/arm/boot/dts/overlays/sc16is752-spi1-overlay.dts b/arch/arm/boot/dts/overlays/sc16is752-spi1-overlay.dts
-index 131d3ab43d3a5..ffdea106434a2 100644
+index 131d3ab43d3a..ffdea106434a 100644
 --- a/arch/arm/boot/dts/overlays/sc16is752-spi1-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/sc16is752-spi1-overlay.dts
 @@ -38,12 +38,6 @@
@@ -417132,7 +417147,7 @@ index 131d3ab43d3a5..ffdea106434a2 100644
 +	};
  };
 diff --git a/arch/arm/boot/dts/overlays/tc358743-overlay.dts b/arch/arm/boot/dts/overlays/tc358743-overlay.dts
-index b317e088b37e2..2ea99cd9e1a1e 100644
+index b317e088b37e..2ea99cd9e1a1 100644
 --- a/arch/arm/boot/dts/overlays/tc358743-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/tc358743-overlay.dts
 @@ -21,12 +21,6 @@
@@ -417189,7 +417204,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  6 files changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts b/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts
-index af883bf02ec5a..6ec6b88e03ced 100644
+index af883bf02ec5..6ec6b88e03ce 100644
 --- a/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts
 +++ b/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts
 @@ -10,7 +10,7 @@
@@ -417202,7 +417217,7 @@ index af883bf02ec5a..6ec6b88e03ced 100644
  
  	aliases {
 diff --git a/arch/arm/boot/dts/bcm2708-rpi-zero.dts b/arch/arm/boot/dts/bcm2708-rpi-zero.dts
-index 0e61e8269efc8..c2f58e84eb323 100644
+index 0e61e8269efc..c2f58e84eb32 100644
 --- a/arch/arm/boot/dts/bcm2708-rpi-zero.dts
 +++ b/arch/arm/boot/dts/bcm2708-rpi-zero.dts
 @@ -10,7 +10,7 @@
@@ -417215,7 +417230,7 @@ index 0e61e8269efc8..c2f58e84eb323 100644
  };
  
 diff --git a/arch/arm/boot/dts/bcm270x.dtsi b/arch/arm/boot/dts/bcm270x.dtsi
-index 04669f512b4c9..bf90fd585364c 100644
+index 04669f512b4c..bf90fd585364 100644
 --- a/arch/arm/boot/dts/bcm270x.dtsi
 +++ b/arch/arm/boot/dts/bcm270x.dtsi
 @@ -3,7 +3,7 @@
@@ -417228,7 +417243,7 @@ index 04669f512b4c9..bf90fd585364c 100644
  	};
  
 diff --git a/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts b/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts
-index f497386881870..3ca70650287cb 100644
+index f49738688187..3ca70650287c 100644
 --- a/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts
 +++ b/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts
 @@ -11,7 +11,7 @@
@@ -417241,7 +417256,7 @@ index f497386881870..3ca70650287cb 100644
  
  	aliases {
 diff --git a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
-index 112eb73f2cc1f..abdf7e1c02476 100644
+index 112eb73f2cc1..abdf7e1c0247 100644
 --- a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
 +++ b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
 @@ -11,7 +11,7 @@
@@ -417254,7 +417269,7 @@ index 112eb73f2cc1f..abdf7e1c02476 100644
  
  	aliases {
 diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
-index 86dd3093e7098..05220fa0202b3 100644
+index 86dd3093e709..05220fa0202b 100644
 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
 +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
 @@ -198,7 +198,7 @@
@@ -417286,7 +417301,7 @@ Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
 
 diff --git a/Documentation/devicetree/bindings/media/i2c/imx477.yaml b/Documentation/devicetree/bindings/media/i2c/imx477.yaml
 new file mode 100644
-index 0000000000000..0994e13e67f68
+index 000000000000..0994e13e67f6
 --- /dev/null
 +++ b/Documentation/devicetree/bindings/media/i2c/imx477.yaml
 @@ -0,0 +1,113 @@
@@ -417424,7 +417439,7 @@ Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
  create mode 100644 arch/arm/boot/dts/overlays/imx477-overlay.dts
 
 diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile
-index c41abba3c3fb2..f9e7416a41ee1 100644
+index c41abba3c3fb..f9e7416a41ee 100644
 --- a/arch/arm/boot/dts/overlays/Makefile
 +++ b/arch/arm/boot/dts/overlays/Makefile
 @@ -85,6 +85,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
@@ -417436,7 +417451,7 @@ index c41abba3c3fb2..f9e7416a41ee1 100644
  	iqaudio-dac.dtbo \
  	iqaudio-dacplus.dtbo \
 diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
-index 116863ba85b6c..0a9c9ec6cc8d0 100644
+index 116863ba85b6..0a9c9ec6cc8d 100644
 --- a/arch/arm/boot/dts/overlays/README
 +++ b/arch/arm/boot/dts/overlays/README
 @@ -1390,6 +1390,14 @@ Load:   dtoverlay=imx219
@@ -417456,7 +417471,7 @@ index 116863ba85b6c..0a9c9ec6cc8d0 100644
  Load:   dtoverlay=iqaudio-codec
 diff --git a/arch/arm/boot/dts/overlays/imx477-overlay.dts b/arch/arm/boot/dts/overlays/imx477-overlay.dts
 new file mode 100644
-index 0000000000000..1dd6f92b4dfe7
+index 000000000000..1dd6f92b4dfe
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/imx477-overlay.dts
 @@ -0,0 +1,110 @@
@@ -417600,7 +417615,7 @@ Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
  create mode 100644 drivers/media/i2c/imx477.c
 
 diff --git a/MAINTAINERS b/MAINTAINERS
-index 4745f22521277..158c0a7f73c26 100644
+index 4745f2252127..158c0a7f73c2 100644
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
 @@ -15196,6 +15196,14 @@ T:	git git://linuxtv.org/media_tree.git
@@ -417619,7 +417634,7 @@ index 4745f22521277..158c0a7f73c26 100644
  M:	Maxim Levitsky <maximlevitsky@gmail.com>
  M:	Alex Dubov <oakad@yahoo.com>
 diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig
-index 7ae2a94bb2ef5..40ff7cf92cefe 100644
+index 7ae2a94bb2ef..40ff7cf92cef 100644
 --- a/drivers/media/i2c/Kconfig
 +++ b/drivers/media/i2c/Kconfig
 @@ -609,6 +609,17 @@ config VIDEO_IMX274
@@ -417641,7 +417656,7 @@ index 7ae2a94bb2ef5..40ff7cf92cefe 100644
  	tristate "Sony IMX319 sensor support"
  	depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API
 diff --git a/drivers/media/i2c/Makefile b/drivers/media/i2c/Makefile
-index 52e4c40263075..93015547a1f6c 100644
+index 52e4c4026307..93015547a1f6 100644
 --- a/drivers/media/i2c/Makefile
 +++ b/drivers/media/i2c/Makefile
 @@ -114,6 +114,7 @@ obj-$(CONFIG_VIDEO_IMX214)	+= imx214.o
@@ -417654,7 +417669,7 @@ index 52e4c40263075..93015547a1f6c 100644
  obj-$(CONFIG_VIDEO_ST_MIPID02) += st-mipid02.o
 diff --git a/drivers/media/i2c/imx477.c b/drivers/media/i2c/imx477.c
 new file mode 100644
-index 0000000000000..ec56b0cfd57b3
+index 000000000000..ec56b0cfd57b
 --- /dev/null
 +++ b/drivers/media/i2c/imx477.c
 @@ -0,0 +1,2191 @@
@@ -419869,7 +419884,7 @@ Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
  1 file changed, 91 insertions(+), 22 deletions(-)
 
 diff --git a/drivers/media/i2c/imx477.c b/drivers/media/i2c/imx477.c
-index ec56b0cfd57b3..bd0e2c291a321 100644
+index ec56b0cfd57b..bd0e2c291a32 100644
 --- a/drivers/media/i2c/imx477.c
 +++ b/drivers/media/i2c/imx477.c
 @@ -1082,6 +1082,8 @@ struct imx477 {
@@ -420065,7 +420080,7 @@ Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
  5 files changed, 5 insertions(+)
 
 diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig
-index e56f5bb9a54eb..19c12103e3677 100644
+index e56f5bb9a54e..19c12103e367 100644
 --- a/arch/arm/configs/bcm2709_defconfig
 +++ b/arch/arm/configs/bcm2709_defconfig
 @@ -902,6 +902,7 @@ CONFIG_VIDEO_TW2804=m
@@ -420077,7 +420092,7 @@ index e56f5bb9a54eb..19c12103e3677 100644
  CONFIG_VIDEO_OV7640=m
  CONFIG_VIDEO_IRS1125=m
 diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig
-index 311c8bfbaedf5..02a76e3d071d5 100644
+index 311c8bfbaedf..02a76e3d071d 100644
 --- a/arch/arm/configs/bcm2711_defconfig
 +++ b/arch/arm/configs/bcm2711_defconfig
 @@ -879,6 +879,7 @@ CONFIG_VIDEO_TW2804=m
@@ -420089,7 +420104,7 @@ index 311c8bfbaedf5..02a76e3d071d5 100644
  CONFIG_VIDEO_OV7640=m
  CONFIG_VIDEO_IRS1125=m
 diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig
-index 560f2e5a9a974..e3ff4e45fc547 100644
+index 560f2e5a9a97..e3ff4e45fc54 100644
 --- a/arch/arm/configs/bcmrpi_defconfig
 +++ b/arch/arm/configs/bcmrpi_defconfig
 @@ -894,6 +894,7 @@ CONFIG_VIDEO_TW2804=m
@@ -420101,7 +420116,7 @@ index 560f2e5a9a974..e3ff4e45fc547 100644
  CONFIG_VIDEO_OV7640=m
  CONFIG_VIDEO_IRS1125=m
 diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig
-index 35afa6b6ffd61..5eb62c0ceffed 100644
+index 35afa6b6ffd6..5eb62c0ceffe 100644
 --- a/arch/arm64/configs/bcm2711_defconfig
 +++ b/arch/arm64/configs/bcm2711_defconfig
 @@ -910,6 +910,7 @@ CONFIG_VIDEO_TW2804=m
@@ -420113,7 +420128,7 @@ index 35afa6b6ffd61..5eb62c0ceffed 100644
  CONFIG_VIDEO_OV7640=m
  CONFIG_VIDEO_IRS1125=m
 diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig
-index 751f6efda9f19..efb1b60cbbb62 100644
+index 751f6efda9f1..efb1b60cbbb6 100644
 --- a/arch/arm64/configs/bcmrpi3_defconfig
 +++ b/arch/arm64/configs/bcmrpi3_defconfig
 @@ -785,6 +785,7 @@ CONFIG_VIDEO_TW2804=m
@@ -420152,7 +420167,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191126142516.630200-1-maar
  1 file changed, 16 deletions(-)
 
 diff --git a/drivers/dma-buf/udmabuf.c b/drivers/dma-buf/udmabuf.c
-index 9635897458a09..9de539c1def47 100644
+index 9635897458a0..9de539c1def4 100644
 --- a/drivers/dma-buf/udmabuf.c
 +++ b/drivers/dma-buf/udmabuf.c
 @@ -93,26 +93,10 @@ static void release_udmabuf(struct dma_buf *buf)
@@ -420204,7 +420219,7 @@ Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
  1 file changed, 5 insertions(+), 4 deletions(-)
 
 diff --git a/drivers/dma-buf/udmabuf.c b/drivers/dma-buf/udmabuf.c
-index 9de539c1def47..be15eb6b05865 100644
+index 9de539c1def4..be15eb6b0586 100644
 --- a/drivers/dma-buf/udmabuf.c
 +++ b/drivers/dma-buf/udmabuf.c
 @@ -94,10 +94,11 @@ static void release_udmabuf(struct dma_buf *buf)
@@ -420247,7 +420262,7 @@ Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
  1 file changed, 7 insertions(+), 4 deletions(-)
 
 diff --git a/drivers/dma-buf/udmabuf.c b/drivers/dma-buf/udmabuf.c
-index be15eb6b05865..f0bf3ba7441e7 100644
+index be15eb6b0586..f0bf3ba7441e 100644
 --- a/drivers/dma-buf/udmabuf.c
 +++ b/drivers/dma-buf/udmabuf.c
 @@ -18,6 +18,7 @@ static const size_t size_limit_mb = 64; /* total dmabuf size, in megabytes  */
@@ -420318,7 +420333,7 @@ Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
  1 file changed, 19 insertions(+), 7 deletions(-)
 
 diff --git a/drivers/dma-buf/udmabuf.c b/drivers/dma-buf/udmabuf.c
-index f0bf3ba7441e7..0a610e09ae237 100644
+index f0bf3ba7441e..0a610e09ae23 100644
 --- a/drivers/dma-buf/udmabuf.c
 +++ b/drivers/dma-buf/udmabuf.c
 @@ -47,10 +47,10 @@ static int mmap_udmabuf(struct dma_buf *buf, struct vm_area_struct *vma)
@@ -420399,7 +420414,7 @@ Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
  1 file changed, 39 insertions(+)
 
 diff --git a/drivers/dma-buf/udmabuf.c b/drivers/dma-buf/udmabuf.c
-index 0a610e09ae237..61b0a2cff874a 100644
+index 0a610e09ae23..61b0a2cff874 100644
 --- a/drivers/dma-buf/udmabuf.c
 +++ b/drivers/dma-buf/udmabuf.c
 @@ -18,6 +18,7 @@ static const size_t size_limit_mb = 64; /* total dmabuf size, in megabytes  */
@@ -420511,7 +420526,7 @@ Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
  1 file changed, 3 insertions(+), 4 deletions(-)
 
 diff --git a/drivers/dma-buf/udmabuf.c b/drivers/dma-buf/udmabuf.c
-index 61b0a2cff874a..acb26c627d27b 100644
+index 61b0a2cff874..acb26c627d27 100644
 --- a/drivers/dma-buf/udmabuf.c
 +++ b/drivers/dma-buf/udmabuf.c
 @@ -122,9 +122,8 @@ static int begin_cpu_udmabuf(struct dma_buf *buf,
@@ -420594,7 +420609,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191203172641.66642-2-john.
  create mode 100644 include/uapi/linux/dma-heap.h
 
 diff --git a/MAINTAINERS b/MAINTAINERS
-index 158c0a7f73c26..4ba0cad485129 100644
+index 158c0a7f73c2..4ba0cad48512 100644
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
 @@ -4963,6 +4963,24 @@ F:	include/linux/*fence.h
@@ -420623,7 +420638,7 @@ index 158c0a7f73c26..4ba0cad485129 100644
  M:	Vinod Koul <vkoul@kernel.org>
  L:	dmaengine@vger.kernel.org
 diff --git a/drivers/dma-buf/Kconfig b/drivers/dma-buf/Kconfig
-index a23b6752d11ac..bffa58fc3e6e0 100644
+index a23b6752d11a..bffa58fc3e6e 100644
 --- a/drivers/dma-buf/Kconfig
 +++ b/drivers/dma-buf/Kconfig
 @@ -44,4 +44,13 @@ config DMABUF_SELFTESTS
@@ -420641,7 +420656,7 @@ index a23b6752d11ac..bffa58fc3e6e0 100644
 +
  endmenu
 diff --git a/drivers/dma-buf/Makefile b/drivers/dma-buf/Makefile
-index 03479da064222..caee5eb3d3517 100644
+index 03479da06422..caee5eb3d351 100644
 --- a/drivers/dma-buf/Makefile
 +++ b/drivers/dma-buf/Makefile
 @@ -1,6 +1,7 @@
@@ -420654,7 +420669,7 @@ index 03479da064222..caee5eb3d3517 100644
  obj-$(CONFIG_UDMABUF)		+= udmabuf.o
 diff --git a/drivers/dma-buf/dma-heap.c b/drivers/dma-buf/dma-heap.c
 new file mode 100644
-index 0000000000000..4f04d104ae614
+index 000000000000..4f04d104ae61
 --- /dev/null
 +++ b/drivers/dma-buf/dma-heap.c
 @@ -0,0 +1,297 @@
@@ -420957,7 +420972,7 @@ index 0000000000000..4f04d104ae614
 +subsys_initcall(dma_heap_init);
 diff --git a/include/linux/dma-heap.h b/include/linux/dma-heap.h
 new file mode 100644
-index 0000000000000..454e354d1ffb7
+index 000000000000..454e354d1ffb
 --- /dev/null
 +++ b/include/linux/dma-heap.h
 @@ -0,0 +1,59 @@
@@ -421022,7 +421037,7 @@ index 0000000000000..454e354d1ffb7
 +#endif /* _DMA_HEAPS_H */
 diff --git a/include/uapi/linux/dma-heap.h b/include/uapi/linux/dma-heap.h
 new file mode 100644
-index 0000000000000..73e7f66c1cae1
+index 000000000000..73e7f66c1cae
 --- /dev/null
 +++ b/include/uapi/linux/dma-heap.h
 @@ -0,0 +1,53 @@
@@ -421133,7 +421148,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191203172641.66642-3-john.
  create mode 100644 drivers/dma-buf/heaps/heap-helpers.h
 
 diff --git a/drivers/dma-buf/Makefile b/drivers/dma-buf/Makefile
-index caee5eb3d3517..9c190026bfab1 100644
+index caee5eb3d351..9c190026bfab 100644
 --- a/drivers/dma-buf/Makefile
 +++ b/drivers/dma-buf/Makefile
 @@ -2,6 +2,7 @@
@@ -421146,7 +421161,7 @@ index caee5eb3d3517..9c190026bfab1 100644
  obj-$(CONFIG_UDMABUF)		+= udmabuf.o
 diff --git a/drivers/dma-buf/heaps/Makefile b/drivers/dma-buf/heaps/Makefile
 new file mode 100644
-index 0000000000000..de49898112db8
+index 000000000000..de49898112db
 --- /dev/null
 +++ b/drivers/dma-buf/heaps/Makefile
 @@ -0,0 +1,2 @@
@@ -421154,7 +421169,7 @@ index 0000000000000..de49898112db8
 +obj-y					+= heap-helpers.o
 diff --git a/drivers/dma-buf/heaps/heap-helpers.c b/drivers/dma-buf/heaps/heap-helpers.c
 new file mode 100644
-index 0000000000000..9f964ca3f59ce
+index 000000000000..9f964ca3f59c
 --- /dev/null
 +++ b/drivers/dma-buf/heaps/heap-helpers.c
 @@ -0,0 +1,271 @@
@@ -421431,7 +421446,7 @@ index 0000000000000..9f964ca3f59ce
 +};
 diff --git a/drivers/dma-buf/heaps/heap-helpers.h b/drivers/dma-buf/heaps/heap-helpers.h
 new file mode 100644
-index 0000000000000..805d2df88024f
+index 000000000000..805d2df88024
 --- /dev/null
 +++ b/drivers/dma-buf/heaps/heap-helpers.h
 @@ -0,0 +1,53 @@
@@ -421543,7 +421558,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191203172641.66642-4-john.
  create mode 100644 drivers/dma-buf/heaps/system_heap.c
 
 diff --git a/drivers/dma-buf/Kconfig b/drivers/dma-buf/Kconfig
-index bffa58fc3e6e0..0613bb7770f52 100644
+index bffa58fc3e6e..0613bb7770f5 100644
 --- a/drivers/dma-buf/Kconfig
 +++ b/drivers/dma-buf/Kconfig
 @@ -53,4 +53,6 @@ menuconfig DMABUF_HEAPS
@@ -421555,7 +421570,7 @@ index bffa58fc3e6e0..0613bb7770f52 100644
  endmenu
 diff --git a/drivers/dma-buf/heaps/Kconfig b/drivers/dma-buf/heaps/Kconfig
 new file mode 100644
-index 0000000000000..205052744169e
+index 000000000000..205052744169
 --- /dev/null
 +++ b/drivers/dma-buf/heaps/Kconfig
 @@ -0,0 +1,6 @@
@@ -421566,7 +421581,7 @@ index 0000000000000..205052744169e
 +	  Choose this option to enable the system dmabuf heap. The system heap
 +	  is backed by pages from the buddy allocator. If in doubt, say Y.
 diff --git a/drivers/dma-buf/heaps/Makefile b/drivers/dma-buf/heaps/Makefile
-index de49898112db8..d1808eca25810 100644
+index de49898112db..d1808eca2581 100644
 --- a/drivers/dma-buf/heaps/Makefile
 +++ b/drivers/dma-buf/heaps/Makefile
 @@ -1,2 +1,3 @@
@@ -421575,7 +421590,7 @@ index de49898112db8..d1808eca25810 100644
 +obj-$(CONFIG_DMABUF_HEAPS_SYSTEM)	+= system_heap.o
 diff --git a/drivers/dma-buf/heaps/system_heap.c b/drivers/dma-buf/heaps/system_heap.c
 new file mode 100644
-index 0000000000000..1aa01e98c5958
+index 000000000000..1aa01e98c595
 --- /dev/null
 +++ b/drivers/dma-buf/heaps/system_heap.c
 @@ -0,0 +1,123 @@
@@ -421757,7 +421772,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191203172641.66642-5-john.
  create mode 100644 drivers/dma-buf/heaps/cma_heap.c
 
 diff --git a/drivers/dma-buf/heaps/Kconfig b/drivers/dma-buf/heaps/Kconfig
-index 205052744169e..a5eef06c42264 100644
+index 205052744169..a5eef06c4226 100644
 --- a/drivers/dma-buf/heaps/Kconfig
 +++ b/drivers/dma-buf/heaps/Kconfig
 @@ -4,3 +4,11 @@ config DMABUF_HEAPS_SYSTEM
@@ -421773,7 +421788,7 @@ index 205052744169e..a5eef06c42264 100644
 +	  by the Contiguous Memory Allocator (CMA). If your system has these
 +	  regions, you should say Y here.
 diff --git a/drivers/dma-buf/heaps/Makefile b/drivers/dma-buf/heaps/Makefile
-index d1808eca25810..6e54cdec3da02 100644
+index d1808eca2581..6e54cdec3da0 100644
 --- a/drivers/dma-buf/heaps/Makefile
 +++ b/drivers/dma-buf/heaps/Makefile
 @@ -1,3 +1,4 @@
@@ -421783,7 +421798,7 @@ index d1808eca25810..6e54cdec3da02 100644
 +obj-$(CONFIG_DMABUF_HEAPS_CMA)		+= cma_heap.o
 diff --git a/drivers/dma-buf/heaps/cma_heap.c b/drivers/dma-buf/heaps/cma_heap.c
 new file mode 100644
-index 0000000000000..626cf7fd033af
+index 000000000000..626cf7fd033a
 --- /dev/null
 +++ b/drivers/dma-buf/heaps/cma_heap.c
 @@ -0,0 +1,177 @@
@@ -422015,7 +422030,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191203172641.66642-6-john.
 
 diff --git a/tools/testing/selftests/dmabuf-heaps/Makefile b/tools/testing/selftests/dmabuf-heaps/Makefile
 new file mode 100644
-index 0000000000000..607c2acd20829
+index 000000000000..607c2acd2082
 --- /dev/null
 +++ b/tools/testing/selftests/dmabuf-heaps/Makefile
 @@ -0,0 +1,6 @@
@@ -422027,7 +422042,7 @@ index 0000000000000..607c2acd20829
 +include ../lib.mk
 diff --git a/tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c b/tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c
 new file mode 100644
-index 0000000000000..3e53ad331bdce
+index 000000000000..3e53ad331bdc
 --- /dev/null
 +++ b/tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c
 @@ -0,0 +1,396 @@
@@ -422453,7 +422468,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191216133405.1001-2-afd@ti
  3 files changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/drivers/dma-buf/dma-heap.c b/drivers/dma-buf/dma-heap.c
-index 4f04d104ae614..a247214961149 100644
+index 4f04d104ae61..a24721496114 100644
 --- a/drivers/dma-buf/dma-heap.c
 +++ b/drivers/dma-buf/dma-heap.c
 @@ -107,7 +107,7 @@ static long dma_heap_ioctl_allocate(struct file *file, void *data)
@@ -422475,7 +422490,7 @@ index 4f04d104ae614..a247214961149 100644
  		break;
  	default:
 diff --git a/include/uapi/linux/dma-heap.h b/include/uapi/linux/dma-heap.h
-index 73e7f66c1cae1..6f84fa08e074a 100644
+index 73e7f66c1cae..6f84fa08e074 100644
 --- a/include/uapi/linux/dma-heap.h
 +++ b/include/uapi/linux/dma-heap.h
 @@ -42,12 +42,12 @@ struct dma_heap_allocation_data {
@@ -422494,7 +422509,7 @@ index 73e7f66c1cae1..6f84fa08e074a 100644
  
  #endif /* _UAPI_LINUX_DMABUF_POOL_H */
 diff --git a/tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c b/tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c
-index 3e53ad331bdce..cd5e1f602ac9d 100644
+index 3e53ad331bdc..cd5e1f602ac9 100644
 --- a/tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c
 +++ b/tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c
 @@ -116,7 +116,7 @@ static int dmabuf_heap_alloc_fdflags(int fd, size_t len, unsigned int fd_flags,
@@ -422528,7 +422543,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191216133405.1001-3-afd@ti
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/dma-buf/heaps/system_heap.c b/drivers/dma-buf/heaps/system_heap.c
-index 1aa01e98c5958..0bf688e3c023a 100644
+index 1aa01e98c595..0bf688e3c023 100644
 --- a/drivers/dma-buf/heaps/system_heap.c
 +++ b/drivers/dma-buf/heaps/system_heap.c
 @@ -109,7 +109,7 @@ static int system_heap_create(void)
@@ -422567,7 +422582,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191216161059.269492-1-coli
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/dma-buf/dma-heap.c b/drivers/dma-buf/dma-heap.c
-index a247214961149..1886aee461315 100644
+index a24721496114..1886aee46131 100644
 --- a/drivers/dma-buf/dma-heap.c
 +++ b/drivers/dma-buf/dma-heap.c
 @@ -157,7 +157,8 @@ static long dma_heap_ioctl(struct file *file, unsigned int ucmd,
@@ -422608,7 +422623,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20191217190822.1969-1-sumit.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/dma-buf/dma-heap.c b/drivers/dma-buf/dma-heap.c
-index 1886aee461315..afd22c9dbdcfa 100644
+index 1886aee46131..afd22c9dbdcf 100644
 --- a/drivers/dma-buf/dma-heap.c
 +++ b/drivers/dma-buf/dma-heap.c
 @@ -106,7 +106,7 @@ static long dma_heap_ioctl_allocate(struct file *file, void *data)
@@ -422643,7 +422658,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  5 files changed, 15 insertions(+)
 
 diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig
-index 19c12103e3677..da822a5c6ef72 100644
+index 19c12103e367..da822a5c6ef7 100644
 --- a/arch/arm/configs/bcm2709_defconfig
 +++ b/arch/arm/configs/bcm2709_defconfig
 @@ -1237,6 +1237,9 @@ CONFIG_RTC_DRV_RV3029C2=m
@@ -422657,7 +422672,7 @@ index 19c12103e3677..da822a5c6ef72 100644
  CONFIG_HD44780=m
  CONFIG_UIO=m
 diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig
-index 02a76e3d071d5..3f977b02ce89a 100644
+index 02a76e3d071d..3f977b02ce89 100644
 --- a/arch/arm/configs/bcm2711_defconfig
 +++ b/arch/arm/configs/bcm2711_defconfig
 @@ -1236,6 +1236,9 @@ CONFIG_RTC_DRV_RV3029C2=m
@@ -422671,7 +422686,7 @@ index 02a76e3d071d5..3f977b02ce89a 100644
  CONFIG_HD44780=m
  CONFIG_UIO=m
 diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig
-index e3ff4e45fc547..34ac60ce63843 100644
+index e3ff4e45fc54..34ac60ce6384 100644
 --- a/arch/arm/configs/bcmrpi_defconfig
 +++ b/arch/arm/configs/bcmrpi_defconfig
 @@ -1246,6 +1246,9 @@ CONFIG_RTC_DRV_RV3029C2=m
@@ -422685,7 +422700,7 @@ index e3ff4e45fc547..34ac60ce63843 100644
  CONFIG_HD44780=m
  CONFIG_UIO=m
 diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig
-index 5eb62c0ceffed..6dcbe14ac4d8a 100644
+index 5eb62c0ceffe..6dcbe14ac4d8 100644
 --- a/arch/arm64/configs/bcm2711_defconfig
 +++ b/arch/arm64/configs/bcm2711_defconfig
 @@ -1267,6 +1267,9 @@ CONFIG_RTC_DRV_RV3029C2=m
@@ -422699,7 +422714,7 @@ index 5eb62c0ceffed..6dcbe14ac4d8a 100644
  CONFIG_HD44780=m
  CONFIG_UIO=m
 diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig
-index efb1b60cbbb62..1f037a5bd4ef1 100644
+index efb1b60cbbb6..1f037a5bd4ef 100644
 --- a/arch/arm64/configs/bcmrpi3_defconfig
 +++ b/arch/arm64/configs/bcmrpi3_defconfig
 @@ -1082,6 +1082,9 @@ CONFIG_RTC_DRV_RV3029C2=m
@@ -422727,7 +422742,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  1 file changed, 6 insertions(+)
 
 diff --git a/arch/arm/boot/dts/bcm270x.dtsi b/arch/arm/boot/dts/bcm270x.dtsi
-index bf90fd585364c..d2f5ea1f31f8e 100644
+index bf90fd585364..d2f5ea1f31f8 100644
 --- a/arch/arm/boot/dts/bcm270x.dtsi
 +++ b/arch/arm/boot/dts/bcm270x.dtsi
 @@ -7,6 +7,12 @@
@@ -422760,7 +422775,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  3 files changed, 3 insertions(+)
 
 diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig
-index da822a5c6ef72..38bd156165391 100644
+index da822a5c6ef7..38bd15616539 100644
 --- a/arch/arm/configs/bcm2709_defconfig
 +++ b/arch/arm/configs/bcm2709_defconfig
 @@ -1287,6 +1287,7 @@ CONFIG_SND_BCM2835=m
@@ -422772,7 +422787,7 @@ index da822a5c6ef72..38bd156165391 100644
  CONFIG_BCM2835_MBOX=y
  # CONFIG_IOMMU_SUPPORT is not set
 diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig
-index 34ac60ce63843..392f5cc9312f1 100644
+index 34ac60ce6384..392f5cc9312f 100644
 --- a/arch/arm/configs/bcmrpi_defconfig
 +++ b/arch/arm/configs/bcmrpi_defconfig
 @@ -1296,6 +1296,7 @@ CONFIG_SND_BCM2835=m
@@ -422784,7 +422799,7 @@ index 34ac60ce63843..392f5cc9312f1 100644
  CONFIG_BCM2835_MBOX=y
  # CONFIG_IOMMU_SUPPORT is not set
 diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig
-index 1f037a5bd4ef1..f546bc80c8b17 100644
+index 1f037a5bd4ef..f546bc80c8b1 100644
 --- a/arch/arm64/configs/bcmrpi3_defconfig
 +++ b/arch/arm64/configs/bcmrpi3_defconfig
 @@ -1128,6 +1128,7 @@ CONFIG_SND_BCM2835=m
@@ -422814,7 +422829,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  3 files changed, 7 insertions(+)
 
 diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig
-index 38bd156165391..20fced93a36a3 100644
+index 38bd15616539..20fced93a36a 100644
 --- a/arch/arm/configs/bcm2709_defconfig
 +++ b/arch/arm/configs/bcm2709_defconfig
 @@ -48,6 +48,9 @@ CONFIG_CPU_FREQ_GOV_USERSPACE=y
@@ -422828,7 +422843,7 @@ index 38bd156165391..20fced93a36a3 100644
  CONFIG_NEON=y
  CONFIG_KERNEL_MODE_NEON=y
 diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig
-index 6dcbe14ac4d8a..1fff60a1a876f 100644
+index 6dcbe14ac4d8..1fff60a1a876 100644
 --- a/arch/arm64/configs/bcm2711_defconfig
 +++ b/arch/arm64/configs/bcm2711_defconfig
 @@ -55,6 +55,7 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
@@ -422840,7 +422855,7 @@ index 6dcbe14ac4d8a..1fff60a1a876f 100644
  CONFIG_VIRTUALIZATION=y
  CONFIG_KVM=y
 diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig
-index f546bc80c8b17..05a9f0ef9508d 100644
+index f546bc80c8b1..05a9f0ef9508 100644
 --- a/arch/arm64/configs/bcmrpi3_defconfig
 +++ b/arch/arm64/configs/bcmrpi3_defconfig
 @@ -53,6 +53,9 @@ CONFIG_CPU_FREQ_GOV_USERSPACE=y
@@ -422878,7 +422893,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 15 deletions(-)
 
 diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-index 6fd1b0939a07a..aadc2ab6ec911 100644
+index 6fd1b0939a07..aadc2ab6ec91 100644
 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
 +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
 @@ -766,12 +766,6 @@ static int unicam_all_nodes_streaming(struct unicam_device *dev)
@@ -422941,7 +422956,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  1 file changed, 10 insertions(+), 4 deletions(-)
 
 diff --git a/drivers/tty/serial/sc16is7xx.c b/drivers/tty/serial/sc16is7xx.c
-index fe486498530da..7eda5b1eb1d9b 100644
+index fe486498530d..7eda5b1eb1d9 100644
 --- a/drivers/tty/serial/sc16is7xx.c
 +++ b/drivers/tty/serial/sc16is7xx.c
 @@ -523,8 +523,9 @@ static int sc16is7xx_set_baud(struct uart_port *port, int baud)
@@ -423008,7 +423023,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 12 insertions(+), 7 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
-index 6701cd3a0249a..25a1f066e62c5 100644
+index 6701cd3a0249..25a1f066e62c 100644
 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 @@ -936,19 +936,14 @@ static void vc4_crtc_mode_set_nofb(struct drm_crtc *crtc)
@@ -423068,7 +423083,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 6 insertions(+)
 
 diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h b/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h
-index 9c752db455658..5b596b5c057f8 100644
+index 9c752db45565..5b596b5c057f 100644
 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h
 +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h
 @@ -668,6 +668,12 @@ enum mmal_parameter_video_type {
@@ -423104,7 +423119,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 5 insertions(+)
 
 diff --git a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-index 50395795c3dba..3c819e2515137 100644
+index 50395795c3db..3c819e251513 100644
 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 @@ -1967,6 +1967,11 @@ static int bcm2835_codec_create_component(struct bcm2835_codec_ctx *ctx)
@@ -423139,7 +423154,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 8 insertions(+)
 
 diff --git a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-index 3c819e2515137..1c7fbba6c9c85 100644
+index 3c819e251513..1c7fbba6c9c8 100644
 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 @@ -1972,6 +1972,14 @@ static int bcm2835_codec_create_component(struct bcm2835_codec_ctx *ctx)
@@ -423177,7 +423192,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 6 insertions(+)
 
 diff --git a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
-index e69ec072c2c77..b7214741fa613 100644
+index e69ec072c2c7..b7214741fa61 100644
 --- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
 +++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
 @@ -1762,6 +1762,12 @@ static int mmal_init(struct bm2835_mmal_dev *dev)
@@ -423214,7 +423229,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  2 files changed, 80 insertions(+)
 
 diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig
-index 3f977b02ce89a..5b490f1a79169 100644
+index 3f977b02ce89..5b490f1a7916 100644
 --- a/arch/arm/configs/bcm2711_defconfig
 +++ b/arch/arm/configs/bcm2711_defconfig
 @@ -137,6 +137,36 @@ CONFIG_NF_CONNTRACK_SANE=m
@@ -423286,7 +423301,7 @@ index 3f977b02ce89a..5b490f1a79169 100644
  CONFIG_BRIDGE_EBT_BROUTE=m
  CONFIG_BRIDGE_EBT_T_FILTER=m
 diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig
-index 05a9f0ef9508d..da5a47b18b19e 100644
+index 05a9f0ef9508..da5a47b18b19 100644
 --- a/arch/arm64/configs/bcmrpi3_defconfig
 +++ b/arch/arm64/configs/bcmrpi3_defconfig
 @@ -128,6 +128,36 @@ CONFIG_NF_CONNTRACK_SANE=m
@@ -423377,7 +423392,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts b/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts
-index b40aa1d8f432b..caa64bfb95a72 100644
+index b40aa1d8f432..caa64bfb95a7 100644
 --- a/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts
 @@ -109,6 +109,6 @@
@@ -423404,7 +423419,7 @@ Signed-off-by: Joerg Schambacher <joerg@i2audio.com>
  1 file changed, 3 insertions(+), 10 deletions(-)
 
 diff --git a/sound/soc/bcm/hifiberry_dacplusadcpro.c b/sound/soc/bcm/hifiberry_dacplusadcpro.c
-index ffa76014e7df6..a7fab4d951b6e 100644
+index ffa76014e7df..a7fab4d951b6 100644
 --- a/sound/soc/bcm/hifiberry_dacplusadcpro.c
 +++ b/sound/soc/bcm/hifiberry_dacplusadcpro.c
 @@ -406,21 +406,14 @@ static int snd_rpi_hifiberry_dacplusadcpro_hw_params(
@@ -423457,7 +423472,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 17 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-index aadc2ab6ec911..c4e7d21771937 100644
+index aadc2ab6ec91..c4e7d2177193 100644
 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
 +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
 @@ -974,8 +974,23 @@ static int unicam_g_fmt_vid_cap(struct file *file, void *priv,
@@ -423510,7 +423525,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/mm/zswap.c b/mm/zswap.c
-index 46a322316e52c..b0fc8d9ffe1fb 100644
+index 46a322316e52..b0fc8d9ffe1f 100644
 --- a/mm/zswap.c
 +++ b/mm/zswap.c
 @@ -761,13 +761,13 @@ static int __zswap_param_set(const char *val, const struct kernel_param *kp,
@@ -423554,7 +423569,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  1 file changed, 28 insertions(+), 20 deletions(-)
 
 diff --git a/mm/zswap.c b/mm/zswap.c
-index b0fc8d9ffe1fb..a347f8df45c18 100644
+index b0fc8d9ffe1f..a347f8df45c1 100644
 --- a/mm/zswap.c
 +++ b/mm/zswap.c
 @@ -564,8 +564,9 @@ static struct zswap_pool *zswap_pool_create(char *type, char *compressor)
@@ -423669,7 +423684,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  5 files changed, 15 insertions(+)
 
 diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig
-index 20fced93a36a3..7581b253e359a 100644
+index 20fced93a36a..7581b253e359 100644
 --- a/arch/arm/configs/bcm2709_defconfig
 +++ b/arch/arm/configs/bcm2709_defconfig
 @@ -74,6 +74,9 @@ CONFIG_BINFMT_MISC=m
@@ -423683,7 +423698,7 @@ index 20fced93a36a3..7581b253e359a 100644
  CONFIG_PGTABLE_MAPPING=y
  CONFIG_NET=y
 diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig
-index 5b490f1a79169..d68934954ad70 100644
+index 5b490f1a7916..d68934954ad7 100644
 --- a/arch/arm/configs/bcm2711_defconfig
 +++ b/arch/arm/configs/bcm2711_defconfig
 @@ -77,6 +77,9 @@ CONFIG_BINFMT_MISC=m
@@ -423697,7 +423712,7 @@ index 5b490f1a79169..d68934954ad70 100644
  CONFIG_PGTABLE_MAPPING=y
  CONFIG_NET=y
 diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig
-index 392f5cc9312f1..7ed163999a2ee 100644
+index 392f5cc9312f..7ed163999a2e 100644
 --- a/arch/arm/configs/bcmrpi_defconfig
 +++ b/arch/arm/configs/bcmrpi_defconfig
 @@ -64,6 +64,9 @@ CONFIG_BINFMT_MISC=m
@@ -423711,7 +423726,7 @@ index 392f5cc9312f1..7ed163999a2ee 100644
  CONFIG_PGTABLE_MAPPING=y
  CONFIG_NET=y
 diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig
-index 1fff60a1a876f..05d721c25d2d6 100644
+index 1fff60a1a876..05d721c25d2d 100644
 --- a/arch/arm64/configs/bcm2711_defconfig
 +++ b/arch/arm64/configs/bcm2711_defconfig
 @@ -76,6 +76,9 @@ CONFIG_BINFMT_MISC=m
@@ -423725,7 +423740,7 @@ index 1fff60a1a876f..05d721c25d2d6 100644
  CONFIG_PGTABLE_MAPPING=y
  CONFIG_NET=y
 diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig
-index da5a47b18b19e..4b232432e240e 100644
+index da5a47b18b19..4b232432e240 100644
 --- a/arch/arm64/configs/bcmrpi3_defconfig
 +++ b/arch/arm64/configs/bcmrpi3_defconfig
 @@ -71,6 +71,9 @@ CONFIG_BINFMT_MISC=y
@@ -423763,7 +423778,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 18 insertions(+)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_drv.c b/drivers/gpu/drm/vc4/vc4_drv.c
-index 68f9db6c4c878..82fd80547bb11 100644
+index 68f9db6c4c87..82fd80547bb1 100644
 --- a/drivers/gpu/drm/vc4/vc4_drv.c
 +++ b/drivers/gpu/drm/vc4/vc4_drv.c
 @@ -249,6 +249,14 @@ static void vc4_match_add_drivers(struct device *dev,
@@ -423820,7 +423835,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 1 insertion(+)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_drv.c b/drivers/gpu/drm/vc4/vc4_drv.c
-index 82fd80547bb11..2e1b2e51aff04 100644
+index 82fd80547bb1..2e1b2e51aff0 100644
 --- a/drivers/gpu/drm/vc4/vc4_drv.c
 +++ b/drivers/gpu/drm/vc4/vc4_drv.c
 @@ -251,6 +251,7 @@ static void vc4_match_add_drivers(struct device *dev,
@@ -423850,7 +423865,7 @@ Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/media/i2c/imx477.c b/drivers/media/i2c/imx477.c
-index bd0e2c291a321..e42a8633087d4 100644
+index bd0e2c291a32..e42a8633087d 100644
 --- a/drivers/media/i2c/imx477.c
 +++ b/drivers/media/i2c/imx477.c
 @@ -1919,7 +1919,7 @@ static int imx477_identify_module(struct imx477 *imx477)
@@ -423884,7 +423899,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  2 files changed, 25 insertions(+), 28 deletions(-)
 
 diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
-index 2dfdee1f814f1..d6a6ca9e06ec6 100644
+index 2dfdee1f814f..d6a6ca9e06ec 100644
 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
 +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
 @@ -16,8 +16,6 @@
@@ -423998,7 +424013,7 @@ index 2dfdee1f814f1..d6a6ca9e06ec6 100644
  
  			/* Note: addrs is the address + page_count - 1
 diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
-index d01c2d4243104..d55f038637fc4 100644
+index d01c2d424310..d55f038637fc 100644
 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
 +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
 @@ -3205,22 +3205,8 @@ vchiq_register_child(struct platform_device *pdev, const char *name)
@@ -424043,7 +424058,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  1 file changed, 4 insertions(+), 19 deletions(-)
 
 diff --git a/arch/arm/boot/dts/bcm2711-rpi.dtsi b/arch/arm/boot/dts/bcm2711-rpi.dtsi
-index 2c55c78bd7cb3..46bcfd586f173 100644
+index 2c55c78bd7cb..46bcfd586f17 100644
 --- a/arch/arm/boot/dts/bcm2711-rpi.dtsi
 +++ b/arch/arm/boot/dts/bcm2711-rpi.dtsi
 @@ -4,7 +4,6 @@
@@ -424113,7 +424128,7 @@ This reverts commit e5e8a2214dff0c43580afc5dc22d496f667c3bbf.
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/mm/zswap.c b/mm/zswap.c
-index a347f8df45c18..232f4565e7957 100644
+index a347f8df45c1..232f4565e795 100644
 --- a/mm/zswap.c
 +++ b/mm/zswap.c
 @@ -774,13 +774,13 @@ static int __zswap_param_set(const char *val, const struct kernel_param *kp,
@@ -424154,7 +424169,7 @@ Signed-off-by: David Plowman <david.plowman@raspberrypi.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-index c4e7d21771937..47b2d3a03fbfa 100644
+index c4e7d2177193..47b2d3a03fbf 100644
 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
 +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
 @@ -2404,7 +2404,7 @@ static int register_node(struct unicam_device *unicam, struct unicam_node *node,
@@ -424194,7 +424209,7 @@ Signed-off-by: Chen-Yu Tsai <wens@csie.org>
 
 diff --git a/Documentation/devicetree/bindings/thermal/brcm,avs-ro-thermal.yaml b/Documentation/devicetree/bindings/thermal/brcm,avs-ro-thermal.yaml
 new file mode 100644
-index 0000000000000..98e7b57bfa13a
+index 000000000000..98e7b57bfa13
 --- /dev/null
 +++ b/Documentation/devicetree/bindings/thermal/brcm,avs-ro-thermal.yaml
 @@ -0,0 +1,45 @@
@@ -424273,7 +424288,7 @@ Signed-off-by: Chen-Yu Tsai <wens@csie.org>
  create mode 100644 drivers/thermal/broadcom/bcm2711_thermal.c
 
 diff --git a/drivers/thermal/broadcom/Kconfig b/drivers/thermal/broadcom/Kconfig
-index 54a9748feac5d..42c6b22b35ce7 100644
+index 54a9748feac5..42c6b22b35ce 100644
 --- a/drivers/thermal/broadcom/Kconfig
 +++ b/drivers/thermal/broadcom/Kconfig
 @@ -1,4 +1,11 @@
@@ -424289,7 +424304,7 @@ index 54a9748feac5d..42c6b22b35ce7 100644
  	tristate "Thermal sensors on bcm2835 SoC"
  	depends on ARCH_BCM2835 || COMPILE_TEST
 diff --git a/drivers/thermal/broadcom/Makefile b/drivers/thermal/broadcom/Makefile
-index 490ab1f7a86df..c917b243d5f00 100644
+index 490ab1f7a86d..c917b243d5f0 100644
 --- a/drivers/thermal/broadcom/Makefile
 +++ b/drivers/thermal/broadcom/Makefile
 @@ -1,4 +1,5 @@
@@ -424300,7 +424315,7 @@ index 490ab1f7a86df..c917b243d5f00 100644
  obj-$(CONFIG_BCM_NS_THERMAL)		+= ns-thermal.o
 diff --git a/drivers/thermal/broadcom/bcm2711_thermal.c b/drivers/thermal/broadcom/bcm2711_thermal.c
 new file mode 100644
-index 0000000000000..67c2a737bc9d9
+index 000000000000..67c2a737bc9d
 --- /dev/null
 +++ b/drivers/thermal/broadcom/bcm2711_thermal.c
 @@ -0,0 +1,123 @@
@@ -424453,7 +424468,7 @@ Signed-off-by: Chen-Yu Tsai <wens@csie.org>
  1 file changed, 12 insertions(+)
 
 diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi
-index 96ef133391d1c..20114a723cf94 100644
+index 96ef133391d1..20114a723cf9 100644
 --- a/arch/arm/boot/dts/bcm2711.dtsi
 +++ b/arch/arm/boot/dts/bcm2711.dtsi
 @@ -64,6 +64,17 @@
@@ -424508,7 +424523,7 @@ Signed-off-by: Chen-Yu Tsai <wens@csie.org>
  2 files changed, 2 insertions(+)
 
 diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
-index e4c8def9a0a57..458d8a07d7e2a 100644
+index e4c8def9a0a5..458d8a07d7e2 100644
 --- a/arch/arm/configs/multi_v7_defconfig
 +++ b/arch/arm/configs/multi_v7_defconfig
 @@ -487,6 +487,7 @@ CONFIG_IMX_THERMAL=y
@@ -424520,7 +424535,7 @@ index e4c8def9a0a57..458d8a07d7e2a 100644
  CONFIG_BRCMSTB_THERMAL=m
  CONFIG_ST_THERMAL_MEMMAP=y
 diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
-index c9a867ac32d48..4486777c7f86e 100644
+index c9a867ac32d4..4486777c7f86 100644
 --- a/arch/arm64/configs/defconfig
 +++ b/arch/arm64/configs/defconfig
 @@ -444,6 +444,7 @@ CONFIG_ROCKCHIP_THERMAL=m
@@ -424548,7 +424563,7 @@ Signed-off-by: Chen-Yu Tsai <wens@csie.org>
  1 file changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/drivers/thermal/broadcom/brcmstb_thermal.c b/drivers/thermal/broadcom/brcmstb_thermal.c
-index 08f71fec51520..7a7c6ad7b8a04 100644
+index 08f71fec5152..7a7c6ad7b8a0 100644
 --- a/drivers/thermal/broadcom/brcmstb_thermal.c
 +++ b/drivers/thermal/broadcom/brcmstb_thermal.c
 @@ -290,7 +290,7 @@ static const struct thermal_zone_of_device_ops bcm7445_thermal_of_ops = {
@@ -424601,7 +424616,7 @@ Signed-off-by: Chen-Yu Tsai <wens@csie.org>
  2 files changed, 9 insertions(+), 54 deletions(-)
 
 diff --git a/drivers/thermal/broadcom/Kconfig b/drivers/thermal/broadcom/Kconfig
-index 42c6b22b35ce7..061f1db6edc9e 100644
+index 42c6b22b35ce..061f1db6edc9 100644
 --- a/drivers/thermal/broadcom/Kconfig
 +++ b/drivers/thermal/broadcom/Kconfig
 @@ -16,7 +16,7 @@ config BCM2835_THERMAL
@@ -424614,7 +424629,7 @@ index 42c6b22b35ce7..061f1db6edc9e 100644
  	  Enable this driver if you have a Broadcom STB SoC and would like
  	  thermal framework support.
 diff --git a/drivers/thermal/broadcom/brcmstb_thermal.c b/drivers/thermal/broadcom/brcmstb_thermal.c
-index 7a7c6ad7b8a04..680f1a0706065 100644
+index 7a7c6ad7b8a0..680f1a070606 100644
 --- a/drivers/thermal/broadcom/brcmstb_thermal.c
 +++ b/drivers/thermal/broadcom/brcmstb_thermal.c
 @@ -10,7 +10,6 @@
@@ -424758,7 +424773,7 @@ Signed-off-by: Chen-Yu Tsai <wens@csie.org>
  1 file changed, 14 deletions(-)
 
 diff --git a/arch/arm/boot/dts/bcm2711-rpi.dtsi b/arch/arm/boot/dts/bcm2711-rpi.dtsi
-index 46bcfd586f173..05e51a05bf56c 100644
+index 46bcfd586f17..05e51a05bf56 100644
 --- a/arch/arm/boot/dts/bcm2711-rpi.dtsi
 +++ b/arch/arm/boot/dts/bcm2711-rpi.dtsi
 @@ -50,16 +50,6 @@
@@ -424806,7 +424821,7 @@ Signed-off-by: Chen-Yu Tsai <wens@csie.org>
  2 files changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig
-index d68934954ad70..c2b7263db6e47 100644
+index d68934954ad7..c2b7263db6e4 100644
 --- a/arch/arm/configs/bcm2711_defconfig
 +++ b/arch/arm/configs/bcm2711_defconfig
 @@ -731,13 +731,14 @@ CONFIG_SENSORS_SHTC1=m
@@ -424826,7 +424841,7 @@ index d68934954ad70..c2b7263db6e47 100644
  CONFIG_MFD_ARIZONA_SPI=m
  CONFIG_MFD_WM5102=y
 diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig
-index 05d721c25d2d6..09d3180c9fd97 100644
+index 05d721c25d2d..09d3180c9fd9 100644
 --- a/arch/arm64/configs/bcm2711_defconfig
 +++ b/arch/arm64/configs/bcm2711_defconfig
 @@ -725,13 +725,14 @@ CONFIG_SENSORS_SHTC1=m
@@ -424867,7 +424882,7 @@ Signed-off-by: Chen-Yu Tsai <wens@csie.org>
  5 files changed, 5 deletions(-)
 
 diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig
-index 7581b253e359a..6b8c0f506b5fd 100644
+index 7581b253e359..6b8c0f506b5f 100644
 --- a/arch/arm/configs/bcm2709_defconfig
 +++ b/arch/arm/configs/bcm2709_defconfig
 @@ -707,7 +707,6 @@ CONFIG_POWER_RESET_GPIO=y
@@ -424879,7 +424894,7 @@ index 7581b253e359a..6b8c0f506b5fd 100644
  CONFIG_SENSORS_GPIO_FAN=m
  CONFIG_SENSORS_JC42=m
 diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig
-index c2b7263db6e47..6dd5e643a32c4 100644
+index c2b7263db6e4..6dd5e643a32c 100644
 --- a/arch/arm/configs/bcm2711_defconfig
 +++ b/arch/arm/configs/bcm2711_defconfig
 @@ -718,7 +718,6 @@ CONFIG_POWER_RESET_GPIO=y
@@ -424891,7 +424906,7 @@ index c2b7263db6e47..6dd5e643a32c4 100644
  CONFIG_SENSORS_GPIO_FAN=m
  CONFIG_SENSORS_JC42=m
 diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig
-index 7ed163999a2ee..2e899053607a0 100644
+index 7ed163999a2e..2e899053607a 100644
 --- a/arch/arm/configs/bcmrpi_defconfig
 +++ b/arch/arm/configs/bcmrpi_defconfig
 @@ -696,7 +696,6 @@ CONFIG_POWER_RESET_GPIO=y
@@ -424903,7 +424918,7 @@ index 7ed163999a2ee..2e899053607a0 100644
  CONFIG_SENSORS_GPIO_FAN=m
  CONFIG_SENSORS_JC42=m
 diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig
-index 09d3180c9fd97..8a5702bbb37a7 100644
+index 09d3180c9fd9..8a5702bbb37a 100644
 --- a/arch/arm64/configs/bcm2711_defconfig
 +++ b/arch/arm64/configs/bcm2711_defconfig
 @@ -712,7 +712,6 @@ CONFIG_POWER_RESET_GPIO=y
@@ -424915,7 +424930,7 @@ index 09d3180c9fd97..8a5702bbb37a7 100644
  CONFIG_SENSORS_GPIO_FAN=m
  CONFIG_SENSORS_JC42=m
 diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig
-index 4b232432e240e..585a975caf2a9 100644
+index 4b232432e240..585a975caf2a 100644
 --- a/arch/arm64/configs/bcmrpi3_defconfig
 +++ b/arch/arm64/configs/bcmrpi3_defconfig
 @@ -678,7 +678,6 @@ CONFIG_W1_SLAVE_DS28E17=m
@@ -424941,7 +424956,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
-index 0c9f5b5791e93..bc858aaaddf99 100644
+index 0c9f5b5791e9..bc858aaaddf9 100644
 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
 @@ -611,6 +611,7 @@ BRCMF_FW_DEF(4339, "brcmfmac4339-sdio");
@@ -424982,7 +424997,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/arch/arm/boot/dts/overlays/i2c-rtc-overlay.dts b/arch/arm/boot/dts/overlays/i2c-rtc-overlay.dts
-index 5df390b52a7bb..24c86974b0dbd 100644
+index 5df390b52a7b..24c86974b0db 100644
 --- a/arch/arm/boot/dts/overlays/i2c-rtc-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/i2c-rtc-overlay.dts
 @@ -229,7 +229,7 @@
@@ -425010,7 +425025,7 @@ KeyboardSignal and kb::kbrequest can be used to call /sbin/shutdown
  1 file changed, 24 insertions(+)
 
 diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
-index 0a9c9ec6cc8d0..2afd499b2808c 100644
+index 0a9c9ec6cc8d..2afd499b2808 100644
 --- a/arch/arm/boot/dts/overlays/README
 +++ b/arch/arm/boot/dts/overlays/README
 @@ -847,6 +847,7 @@ Params: gpiopin                 GPIO for signalling (default 26)
@@ -425068,7 +425083,7 @@ Raspberry Pi 1 Model B rev 1 uses GPIO1 for power-up instead of GPIO3.
  2 files changed, 12 insertions(+), 4 deletions(-)
 
 diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
-index 2afd499b2808c..4dfd7923492c8 100644
+index 2afd499b2808..4dfd7923492c 100644
 --- a/arch/arm/boot/dts/overlays/README
 +++ b/arch/arm/boot/dts/overlays/README
 @@ -883,9 +883,14 @@ Info:   Initiates a shutdown when GPIO pin changes. The given GPIO pin
@@ -425098,7 +425113,7 @@ index 2afd499b2808c..4dfd7923492c8 100644
          debounce                Specify the debounce interval in milliseconds
                                  (default 100)
 diff --git a/arch/arm/boot/dts/overlays/gpio-shutdown-overlay.dts b/arch/arm/boot/dts/overlays/gpio-shutdown-overlay.dts
-index db07ba67781d7..0a27595143ec1 100644
+index db07ba67781d..0a27595143ec 100644
 --- a/arch/arm/boot/dts/overlays/gpio-shutdown-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/gpio-shutdown-overlay.dts
 @@ -4,7 +4,9 @@
@@ -425139,7 +425154,7 @@ Signed-off-by: Bjorn <beikeland@gmail.com>
  create mode 100644 arch/arm/boot/dts/overlays/sc16is752-spi0-overlay.dts
 
 diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile
-index f9e7416a41ee1..52fd4e6840870 100644
+index f9e7416a41ee..52fd4e684087 100644
 --- a/arch/arm/boot/dts/overlays/Makefile
 +++ b/arch/arm/boot/dts/overlays/Makefile
 @@ -143,6 +143,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
@@ -425151,7 +425166,7 @@ index f9e7416a41ee1..52fd4e6840870 100644
  	sdhost.dtbo \
  	sdio.dtbo \
 diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
-index 4dfd7923492c8..71651c85a6f27 100644
+index 4dfd7923492c..71651c85a6f2 100644
 --- a/arch/arm/boot/dts/overlays/README
 +++ b/arch/arm/boot/dts/overlays/README
 @@ -2144,6 +2144,14 @@ Params: int_pin                 GPIO used for IRQ (default 24)
@@ -425171,7 +425186,7 @@ index 4dfd7923492c8..71651c85a6f27 100644
          Enables the chip on SPI1.
 diff --git a/arch/arm/boot/dts/overlays/sc16is752-spi0-overlay.dts b/arch/arm/boot/dts/overlays/sc16is752-spi0-overlay.dts
 new file mode 100644
-index 0000000000000..ccce7ad599bc1
+index 000000000000..ccce7ad599bc
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/sc16is752-spi0-overlay.dts
 @@ -0,0 +1,44 @@
@@ -425237,7 +425252,7 @@ Signed-off-by: David Lechner <david@lechnology.com>
  1 file changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/drivers/net/wireless/realtek/rtl8192cu/core/rtw_security.c b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_security.c
-index 8fa8ed51b721c..bdd9c73cba3fc 100755
+index 8fa8ed51b721..bdd9c73cba3f 100755
 --- a/drivers/net/wireless/realtek/rtl8192cu/core/rtw_security.c
 +++ b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_security.c
 @@ -1502,10 +1502,10 @@ _func_enter_;
@@ -425289,7 +425304,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/arch/arm/boot/dts/overlays/i2c-rtc-gpio-overlay.dts b/arch/arm/boot/dts/overlays/i2c-rtc-gpio-overlay.dts
-index 44df77459520b..125bd77fff0a5 100644
+index 44df77459520..125bd77fff0a 100644
 --- a/arch/arm/boot/dts/overlays/i2c-rtc-gpio-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/i2c-rtc-gpio-overlay.dts
 @@ -230,7 +230,7 @@
@@ -425324,7 +425339,7 @@ Signed-off-by: David Plowman <david.plowman@raspberrypi.com>
  2 files changed, 10 insertions(+), 6 deletions(-)
 
 diff --git a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
-index bd1bb760419cc..bc86354ac4c6c 100644
+index bd1bb760419c..bc86354ac4c6 100644
 --- a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
 +++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
 @@ -676,7 +676,11 @@ struct bcm2835_isp_fmt *get_default_format(struct bcm2835_isp_node *node)
@@ -425341,7 +425356,7 @@ index bd1bb760419cc..bc86354ac4c6c 100644
  
  static inline unsigned int get_sizeimage(int bpl, int width, int height,
 diff --git a/drivers/staging/vc04_services/bcm2835-isp/bcm2835_isp_fmts.h b/drivers/staging/vc04_services/bcm2835-isp/bcm2835_isp_fmts.h
-index af3bde152bb24..40ca0f6e9c979 100644
+index af3bde152bb2..40ca0f6e9c97 100644
 --- a/drivers/staging/vc04_services/bcm2835-isp/bcm2835_isp_fmts.h
 +++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835_isp_fmts.h
 @@ -71,7 +71,7 @@ static const struct bcm2835_isp_fmt supported_formats[] = {
@@ -425410,7 +425425,7 @@ Signed-off-by: Kevin P. Fleming <kevin+linux@km6g.us>
  3 files changed, 56 insertions(+), 11 deletions(-)
 
 diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
-index 71651c85a6f27..9060fe7b0d7ea 100644
+index 71651c85a6f2..9060fe7b0d7e 100644
 --- a/arch/arm/boot/dts/overlays/README
 +++ b/arch/arm/boot/dts/overlays/README
 @@ -1196,6 +1196,8 @@ Params: abx80x                  Select one of the ABx80x family:
@@ -425458,7 +425473,7 @@ index 71651c85a6f27..9060fe7b0d7ea 100644
          wakeup-source           Specify that the RTC can be used as a wakeup
                                  source
 diff --git a/arch/arm/boot/dts/overlays/i2c-rtc-gpio-overlay.dts b/arch/arm/boot/dts/overlays/i2c-rtc-gpio-overlay.dts
-index 125bd77fff0a5..23813369093a7 100644
+index 125bd77fff0a..23813369093a 100644
 --- a/arch/arm/boot/dts/overlays/i2c-rtc-gpio-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/i2c-rtc-gpio-overlay.dts
 @@ -204,6 +204,23 @@
@@ -425513,7 +425528,7 @@ index 125bd77fff0a5..23813369093a7 100644
  		wakeup-source = <&ds1339>,"wakeup-source?",
  				<&ds3231>,"wakeup-source?",
 diff --git a/arch/arm/boot/dts/overlays/i2c-rtc-overlay.dts b/arch/arm/boot/dts/overlays/i2c-rtc-overlay.dts
-index 24c86974b0dbd..df59d93cd759b 100644
+index 24c86974b0db..df59d93cd759 100644
 --- a/arch/arm/boot/dts/overlays/i2c-rtc-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/i2c-rtc-overlay.dts
 @@ -203,6 +203,23 @@
@@ -425589,7 +425604,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  5 files changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig
-index 6b8c0f506b5fd..41a34ca374a8b 100644
+index 6b8c0f506b5f..41a34ca374a8 100644
 --- a/arch/arm/configs/bcm2709_defconfig
 +++ b/arch/arm/configs/bcm2709_defconfig
 @@ -1000,6 +1000,7 @@ CONFIG_SND_SOC_AK4554=m
@@ -425601,7 +425616,7 @@ index 6b8c0f506b5fd..41a34ca374a8b 100644
  CONFIG_SND_SOC_WM8804_I2C=m
  CONFIG_SND_SIMPLE_CARD=m
 diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig
-index 6dd5e643a32c4..c7b9f34ceb775 100644
+index 6dd5e643a32c..c7b9f34ceb77 100644
 --- a/arch/arm/configs/bcm2711_defconfig
 +++ b/arch/arm/configs/bcm2711_defconfig
 @@ -737,7 +737,6 @@ CONFIG_GPIO_WATCHDOG=m
@@ -425621,7 +425636,7 @@ index 6dd5e643a32c4..c7b9f34ceb775 100644
  CONFIG_SND_SOC_WM8804_I2C=m
  CONFIG_SND_SIMPLE_CARD=m
 diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig
-index 2e899053607a0..93fb7f03d31ce 100644
+index 2e899053607a..93fb7f03d31c 100644
 --- a/arch/arm/configs/bcmrpi_defconfig
 +++ b/arch/arm/configs/bcmrpi_defconfig
 @@ -988,6 +988,7 @@ CONFIG_SND_SOC_AK4554=m
@@ -425633,7 +425648,7 @@ index 2e899053607a0..93fb7f03d31ce 100644
  CONFIG_SND_SOC_WM8804_I2C=m
  CONFIG_SND_SIMPLE_CARD=m
 diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig
-index 8a5702bbb37a7..448cc2ec5c4f9 100644
+index 8a5702bbb37a..448cc2ec5c4f 100644
 --- a/arch/arm64/configs/bcm2711_defconfig
 +++ b/arch/arm64/configs/bcm2711_defconfig
 @@ -1008,6 +1008,7 @@ CONFIG_SND_SOC_AK4554=m
@@ -425645,7 +425660,7 @@ index 8a5702bbb37a7..448cc2ec5c4f9 100644
  CONFIG_SND_SOC_WM8804_I2C=m
  CONFIG_SND_SIMPLE_CARD=m
 diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig
-index 585a975caf2a9..c82e163a095c3 100644
+index 585a975caf2a..c82e163a095c 100644
 --- a/arch/arm64/configs/bcmrpi3_defconfig
 +++ b/arch/arm64/configs/bcmrpi3_defconfig
 @@ -904,6 +904,7 @@ CONFIG_SND_SOC_AK4554=m
@@ -425673,7 +425688,7 @@ Signed-off-by: Dom Cobley <popcornmix@gmail.com>
  1 file changed, 1 insertion(+)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
-index 093f424ad5b46..4ba7add2737f7 100644
+index 093f424ad5b4..4ba7add2737f 100644
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
 @@ -1216,6 +1216,7 @@ static int vc4_hdmi_audio_init(struct vc4_hdmi *vc4_hdmi)
@@ -425705,7 +425720,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
-index d6a6ca9e06ec6..b396fed96f3fb 100644
+index d6a6ca9e06ec..b396fed96f3f 100644
 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
 +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
 @@ -641,7 +641,7 @@ free_pagelist(struct vchiq_pagelist_info *pagelistinfo,
@@ -425738,7 +425753,7 @@ Signed-off-by: Dom Cobley <popcornmix@gmail.com>
  1 file changed, 17 insertions(+), 8 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
-index 4ba7add2737f7..5aa5236e576da 100644
+index 4ba7add2737f..5aa5236e576d 100644
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
 @@ -113,20 +113,29 @@ static enum drm_connector_status
@@ -425807,7 +425822,7 @@ Signed-off-by: Hristo Venev <hristo@venev.name>
  4 files changed, 22 insertions(+), 2 deletions(-)
 
 diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
-index 9060fe7b0d7ea..3c38fbe718863 100644
+index 9060fe7b0d7e..3c38fbe71886 100644
 --- a/arch/arm/boot/dts/overlays/README
 +++ b/arch/arm/boot/dts/overlays/README
 @@ -2745,6 +2745,7 @@ Params: cma-256                 CMA is 256MB (needs 1GB)
@@ -425827,7 +425842,7 @@ index 9060fe7b0d7ea..3c38fbe718863 100644
  
  Name:   vga666
 diff --git a/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts b/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts
-index caa64bfb95a72..6d34a2bff49b6 100644
+index caa64bfb95a7..6d34a2bff49b 100644
 --- a/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts
 @@ -108,7 +108,15 @@
@@ -425848,7 +425863,7 @@ index caa64bfb95a72..6d34a2bff49b6 100644
  	};
  };
 diff --git a/arch/arm/boot/dts/overlays/vc4-kms-v3d-pi4-overlay.dts b/arch/arm/boot/dts/overlays/vc4-kms-v3d-pi4-overlay.dts
-index 134ad9ecbd4ab..935e9469e318a 100644
+index 134ad9ecbd4a..935e9469e318 100644
 --- a/arch/arm/boot/dts/overlays/vc4-kms-v3d-pi4-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/vc4-kms-v3d-pi4-overlay.dts
 @@ -138,8 +138,16 @@
@@ -425869,7 +425884,7 @@ index 134ad9ecbd4ab..935e9469e318a 100644
  	};
  };
 diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c
-index f926784c622de..31968fec297f5 100644
+index f926784c622d..31968fec297f 100644
 --- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c
 +++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c
 @@ -381,7 +381,9 @@ static int snd_bcm2835_alsa_probe(struct platform_device *pdev)
@@ -425899,7 +425914,7 @@ This reverts commit 907e08e6e70dd557a1f5cd03ef28492ffebffb08.
  1 file changed, 2 deletions(-)
 
 diff --git a/arch/arm/boot/dts/overlays/i2c-gpio-overlay.dts b/arch/arm/boot/dts/overlays/i2c-gpio-overlay.dts
-index def139db8bcb5..39e7bc5fa9d88 100644
+index def139db8bcb..39e7bc5fa9d8 100644
 --- a/arch/arm/boot/dts/overlays/i2c-gpio-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/i2c-gpio-overlay.dts
 @@ -16,8 +16,6 @@
@@ -425944,7 +425959,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  3 files changed, 12 insertions(+), 5 deletions(-)
 
 diff --git a/arch/arm/boot/dts/overlays/balena-fin-overlay.dts b/arch/arm/boot/dts/overlays/balena-fin-overlay.dts
-index 249c8202b2ed4..e7ead7cdf5f5e 100644
+index 249c8202b2ed..e7ead7cdf5f5 100644
 --- a/arch/arm/boot/dts/overlays/balena-fin-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/balena-fin-overlay.dts
 @@ -1,6 +1,8 @@
@@ -425967,7 +425982,7 @@ index 249c8202b2ed4..e7ead7cdf5f5e 100644
  				i2c-gpio,scl-open-drain;
  				i2c-gpio,sda-open-drain;
 diff --git a/arch/arm/boot/dts/overlays/i2c-gpio-overlay.dts b/arch/arm/boot/dts/overlays/i2c-gpio-overlay.dts
-index 39e7bc5fa9d88..63231b5d7c0c1 100644
+index 39e7bc5fa9d8..63231b5d7c0c 100644
 --- a/arch/arm/boot/dts/overlays/i2c-gpio-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/i2c-gpio-overlay.dts
 @@ -2,6 +2,8 @@
@@ -425991,7 +426006,7 @@ index 39e7bc5fa9d88..63231b5d7c0c1 100644
  				i2c-gpio,delay-us = <2>;        /* ~100 kHz */
  				#address-cells = <1>;
 diff --git a/arch/arm/boot/dts/overlays/i2c-rtc-gpio-overlay.dts b/arch/arm/boot/dts/overlays/i2c-rtc-gpio-overlay.dts
-index 23813369093a7..227e3c0fa1cd2 100644
+index 23813369093a..227e3c0fa1cd 100644
 --- a/arch/arm/boot/dts/overlays/i2c-rtc-gpio-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/i2c-rtc-gpio-overlay.dts
 @@ -3,6 +3,8 @@
@@ -426031,7 +426046,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  2 files changed, 12 insertions(+)
 
 diff --git a/arch/arm/boot/dts/overlays/upstream-overlay.dts b/arch/arm/boot/dts/overlays/upstream-overlay.dts
-index 4d46790d81c9c..2e9dcd4f5f0a3 100644
+index 4d46790d81c9..2e9dcd4f5f0a 100644
 --- a/arch/arm/boot/dts/overlays/upstream-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/upstream-overlay.dts
 @@ -92,6 +92,12 @@
@@ -426048,7 +426063,7 @@ index 4d46790d81c9c..2e9dcd4f5f0a3 100644
  		#address-cells = <1>;
  		#size-cells = <1>;
 diff --git a/arch/arm/boot/dts/overlays/upstream-pi4-overlay.dts b/arch/arm/boot/dts/overlays/upstream-pi4-overlay.dts
-index 428aa5dcc38f0..30130f09fbc66 100644
+index 428aa5dcc38f..30130f09fbc6 100644
 --- a/arch/arm/boot/dts/overlays/upstream-pi4-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/upstream-pi4-overlay.dts
 @@ -122,6 +122,12 @@
@@ -426092,7 +426107,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  1 file changed, 259 insertions(+), 168 deletions(-)
 
 diff --git a/drivers/w1/slaves/w1_therm.c b/drivers/w1/slaves/w1_therm.c
-index e028e00927991..1234916daaa8f 100644
+index e028e0092799..1234916daaa8 100644
 --- a/drivers/w1/slaves/w1_therm.c
 +++ b/drivers/w1/slaves/w1_therm.c
 @@ -25,7 +25,8 @@
@@ -426684,7 +426699,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  1 file changed, 41 insertions(+), 7 deletions(-)
 
 diff --git a/drivers/w1/slaves/w1_therm.c b/drivers/w1/slaves/w1_therm.c
-index 1234916daaa8f..aa5678369c0b6 100644
+index 1234916daaa8..aa5678369c0b 100644
 --- a/drivers/w1/slaves/w1_therm.c
 +++ b/drivers/w1/slaves/w1_therm.c
 @@ -16,6 +16,7 @@
@@ -426852,7 +426867,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 diff --git a/Documentation/ABI/testing/sysfs-driver-w1_therm b/Documentation/ABI/testing/sysfs-driver-w1_therm
 new file mode 100644
-index 0000000000000..99d73eeee3db6
+index 000000000000..99d73eeee3db
 --- /dev/null
 +++ b/Documentation/ABI/testing/sysfs-driver-w1_therm
 @@ -0,0 +1,29 @@
@@ -426887,7 +426902,7 @@ index 0000000000000..99d73eeee3db6
 +		w1_term device
 \ No newline at end of file
 diff --git a/drivers/w1/slaves/w1_therm.c b/drivers/w1/slaves/w1_therm.c
-index aa5678369c0b6..932a0738b52ad 100644
+index aa5678369c0b..932a0738b52a 100644
 --- a/drivers/w1/slaves/w1_therm.c
 +++ b/drivers/w1/slaves/w1_therm.c
 @@ -43,8 +43,21 @@
@@ -427164,7 +427179,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  2 files changed, 361 insertions(+), 98 deletions(-)
 
 diff --git a/Documentation/ABI/testing/sysfs-driver-w1_therm b/Documentation/ABI/testing/sysfs-driver-w1_therm
-index 99d73eeee3db6..7ed95e9e0b648 100644
+index 99d73eeee3db..7ed95e9e0b64 100644
 --- a/Documentation/ABI/testing/sysfs-driver-w1_therm
 +++ b/Documentation/ABI/testing/sysfs-driver-w1_therm
 @@ -10,6 +10,23 @@ Users:		any user space application which wants to communicate with
@@ -427192,7 +427207,7 @@ index 99d73eeee3db6..7ed95e9e0b648 100644
  Date:		May 2020
  Contact:	Akira Shimahara <akira215corp@gmail.com>
 diff --git a/drivers/w1/slaves/w1_therm.c b/drivers/w1/slaves/w1_therm.c
-index 932a0738b52ad..7ab8a141ce6e4 100644
+index 932a0738b52a..7ab8a141ce6e 100644
 --- a/drivers/w1/slaves/w1_therm.c
 +++ b/drivers/w1/slaves/w1_therm.c
 @@ -51,6 +51,13 @@ module_param_named(strong_pullup, w1_strong_pullup, int, 0);
@@ -427859,7 +427874,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  2 files changed, 132 insertions(+), 57 deletions(-)
 
 diff --git a/Documentation/ABI/testing/sysfs-driver-w1_therm b/Documentation/ABI/testing/sysfs-driver-w1_therm
-index 7ed95e9e0b648..8b7ee89ac6ce2 100644
+index 7ed95e9e0b64..8b7ee89ac6ce 100644
 --- a/Documentation/ABI/testing/sysfs-driver-w1_therm
 +++ b/Documentation/ABI/testing/sysfs-driver-w1_therm
 @@ -1,3 +1,17 @@
@@ -427881,7 +427896,7 @@ index 7ed95e9e0b648..8b7ee89ac6ce2 100644
  Date:		May 2020
  Contact:	Akira Shimahara <akira215corp@gmail.com>
 diff --git a/drivers/w1/slaves/w1_therm.c b/drivers/w1/slaves/w1_therm.c
-index 7ab8a141ce6e4..1ba07b0833fac 100644
+index 7ab8a141ce6e..1ba07b0833fa 100644
 --- a/drivers/w1/slaves/w1_therm.c
 +++ b/drivers/w1/slaves/w1_therm.c
 @@ -43,12 +43,21 @@
@@ -428248,7 +428263,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  2 files changed, 197 insertions(+), 101 deletions(-)
 
 diff --git a/Documentation/ABI/testing/sysfs-driver-w1_therm b/Documentation/ABI/testing/sysfs-driver-w1_therm
-index 8b7ee89ac6ce2..6ffd3e3286a75 100644
+index 8b7ee89ac6ce..6ffd3e3286a7 100644
 --- a/Documentation/ABI/testing/sysfs-driver-w1_therm
 +++ b/Documentation/ABI/testing/sysfs-driver-w1_therm
 @@ -41,6 +41,18 @@ Users:		any user space application which wants to communicate with
@@ -428271,7 +428286,7 @@ index 8b7ee89ac6ce2..6ffd3e3286a75 100644
  Date:		May 2020
  Contact:	Akira Shimahara <akira215corp@gmail.com>
 diff --git a/drivers/w1/slaves/w1_therm.c b/drivers/w1/slaves/w1_therm.c
-index 1ba07b0833fac..5a81ce2a4e742 100644
+index 1ba07b0833fa..5a81ce2a4e74 100644
 --- a/drivers/w1/slaves/w1_therm.c
 +++ b/drivers/w1/slaves/w1_therm.c
 @@ -93,6 +93,7 @@ module_param_named(strong_pullup, w1_strong_pullup, int, 0);
@@ -428778,7 +428793,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  2 files changed, 177 insertions(+)
 
 diff --git a/Documentation/ABI/testing/sysfs-driver-w1_therm b/Documentation/ABI/testing/sysfs-driver-w1_therm
-index 6ffd3e3286a75..f2895205a515c 100644
+index 6ffd3e3286a7..f2895205a515 100644
 --- a/Documentation/ABI/testing/sysfs-driver-w1_therm
 +++ b/Documentation/ABI/testing/sysfs-driver-w1_therm
 @@ -1,3 +1,19 @@
@@ -428802,7 +428817,7 @@ index 6ffd3e3286a75..f2895205a515c 100644
  Date:		May 2020
  Contact:	Akira Shimahara <akira215corp@gmail.com>
 diff --git a/drivers/w1/slaves/w1_therm.c b/drivers/w1/slaves/w1_therm.c
-index 5a81ce2a4e742..825536196e610 100644
+index 5a81ce2a4e74..825536196e61 100644
 --- a/drivers/w1/slaves/w1_therm.c
 +++ b/drivers/w1/slaves/w1_therm.c
 @@ -58,6 +58,9 @@ module_param_named(strong_pullup, w1_strong_pullup, int, 0);
@@ -429128,7 +429143,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  3 files changed, 322 insertions(+), 15 deletions(-)
 
 diff --git a/Documentation/ABI/testing/sysfs-driver-w1_therm b/Documentation/ABI/testing/sysfs-driver-w1_therm
-index f2895205a515c..076659d506f26 100644
+index f2895205a515..076659d506f2 100644
 --- a/Documentation/ABI/testing/sysfs-driver-w1_therm
 +++ b/Documentation/ABI/testing/sysfs-driver-w1_therm
 @@ -62,9 +62,16 @@ Date:		May 2020
@@ -429180,7 +429195,7 @@ index f2895205a515c..076659d506f26 100644
 +Users:		any user space application which wants to communicate with
 +		w1_term device
 diff --git a/Documentation/w1/slaves/w1_therm.rst b/Documentation/w1/slaves/w1_therm.rst
-index 90531c340a07a..cc4edae177513 100644
+index 90531c340a07..cc4edae17751 100644
 --- a/Documentation/w1/slaves/w1_therm.rst
 +++ b/Documentation/w1/slaves/w1_therm.rst
 @@ -26,20 +26,31 @@ W1_THERM_DS1825		0x3B
@@ -429253,7 +429268,7 @@ index 90531c340a07a..cc4edae177513 100644
  strong pullup, 1 to enable autodetection or 2 to force strong pullup.
  In case of autodetection, the driver will use the "READ POWER SUPPLY"
 diff --git a/drivers/w1/slaves/w1_therm.c b/drivers/w1/slaves/w1_therm.c
-index 825536196e610..cc4b88056b338 100644
+index 825536196e61..cc4b88056b33 100644
 --- a/drivers/w1/slaves/w1_therm.c
 +++ b/drivers/w1/slaves/w1_therm.c
 @@ -43,6 +43,9 @@
@@ -429692,7 +429707,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  1 file changed, 3 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/w1/slaves/w1_therm.c b/drivers/w1/slaves/w1_therm.c
-index cc4b88056b338..a6c85e4866719 100644
+index cc4b88056b33..a6c85e486671 100644
 --- a/drivers/w1/slaves/w1_therm.c
 +++ b/drivers/w1/slaves/w1_therm.c
 @@ -1526,8 +1526,9 @@ static ssize_t alarms_store(struct device *device,
@@ -429740,7 +429755,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/drivers/w1/slaves/w1_therm.c b/drivers/w1/slaves/w1_therm.c
-index a6c85e4866719..c1b4eda167193 100644
+index a6c85e486671..c1b4eda16719 100644
 --- a/drivers/w1/slaves/w1_therm.c
 +++ b/drivers/w1/slaves/w1_therm.c
 @@ -505,7 +505,7 @@ static inline int w1_DS18S20_write_data(struct w1_slave *sl,
@@ -429807,7 +429822,7 @@ Acked-by: Florian Fainelli <f.fainelli@gmail.com>
  1 file changed, 1 insertion(+)
 
 diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c
-index 3a10e678c7f47..9e452c366b263 100644
+index 3a10e678c7f4..9e452c366b26 100644
 --- a/drivers/pci/controller/pcie-brcmstb.c
 +++ b/drivers/pci/controller/pcie-brcmstb.c
 @@ -697,6 +697,7 @@ static int brcm_pcie_setup(struct brcm_pcie *pcie)
@@ -429843,7 +429858,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  11 files changed, 51 insertions(+), 13 deletions(-)
 
 diff --git a/arch/arm/boot/dts/bcm270x.dtsi b/arch/arm/boot/dts/bcm270x.dtsi
-index d2f5ea1f31f8e..bf90fd585364c 100644
+index d2f5ea1f31f8..bf90fd585364 100644
 --- a/arch/arm/boot/dts/bcm270x.dtsi
 +++ b/arch/arm/boot/dts/bcm270x.dtsi
 @@ -7,12 +7,6 @@
@@ -429860,7 +429875,7 @@ index d2f5ea1f31f8e..bf90fd585364c 100644
  
  		watchdog: watchdog@7e100000 {
 diff --git a/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts b/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts
-index 3ca70650287cb..497a3f253291c 100644
+index 3ca70650287c..497a3f253291 100644
 --- a/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts
 +++ b/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts
 @@ -85,6 +85,11 @@
@@ -429876,7 +429891,7 @@ index 3ca70650287cb..497a3f253291c 100644
  		compatible = "raspberrypi,firmware-gpio";
  		gpio-controller;
 diff --git a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
-index abdf7e1c02476..92ad8ba8987db 100644
+index abdf7e1c0247..92ad8ba8987d 100644
 --- a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
 +++ b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
 @@ -96,6 +96,11 @@
@@ -429892,7 +429907,7 @@ index abdf7e1c02476..92ad8ba8987db 100644
  		compatible = "raspberrypi,firmware-gpio";
  		gpio-controller;
 diff --git a/arch/arm/boot/dts/bcm2710-rpi-cm3.dts b/arch/arm/boot/dts/bcm2710-rpi-cm3.dts
-index 88f7fe53b97f2..a8e2e6486d59b 100644
+index 88f7fe53b97f..a8e2e6486d59 100644
 --- a/arch/arm/boot/dts/bcm2710-rpi-cm3.dts
 +++ b/arch/arm/boot/dts/bcm2710-rpi-cm3.dts
 @@ -58,6 +58,11 @@
@@ -429908,7 +429923,7 @@ index 88f7fe53b97f2..a8e2e6486d59b 100644
  		compatible = "raspberrypi,firmware-gpio";
  		gpio-controller;
 diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
-index 05220fa0202b3..efff867951bb9 100644
+index 05220fa0202b..efff867951bb 100644
 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
 +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
 @@ -54,6 +54,11 @@
@@ -429924,7 +429939,7 @@ index 05220fa0202b3..efff867951bb9 100644
  		compatible = "raspberrypi,firmware-gpio";
  		gpio-controller;
 diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi
-index 20114a723cf94..4b98dba51e59b 100644
+index 20114a723cf9..4b98dba51e59 100644
 --- a/arch/arm/boot/dts/bcm2711.dtsi
 +++ b/arch/arm/boot/dts/bcm2711.dtsi
 @@ -24,12 +24,6 @@
@@ -429941,7 +429956,7 @@ index 20114a723cf94..4b98dba51e59b 100644
  		/*
  		 * Defined ranges:
 diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts b/arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts
-index 66ba24e9ff375..4a28b144eaf21 100644
+index 66ba24e9ff37..4a28b144eaf2 100644
 --- a/arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts
 +++ b/arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts
 @@ -31,6 +31,11 @@
@@ -429957,7 +429972,7 @@ index 66ba24e9ff375..4a28b144eaf21 100644
  		compatible = "raspberrypi,firmware-gpio";
  		gpio-controller;
 diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts
-index 63f4592ba7dd6..f38b2c5aa449b 100644
+index 63f4592ba7dd..f38b2c5aa449 100644
 --- a/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts
 +++ b/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts
 @@ -37,6 +37,11 @@
@@ -429973,7 +429988,7 @@ index 63f4592ba7dd6..f38b2c5aa449b 100644
  		compatible = "raspberrypi,firmware-gpio";
  		gpio-controller;
 diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
-index 5474f8ab894fa..11b2d823e6ae6 100644
+index 5474f8ab894f..11b2d823e6ae 100644
 --- a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
 +++ b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
 @@ -32,6 +32,11 @@
@@ -429989,7 +430004,7 @@ index 5474f8ab894fa..11b2d823e6ae6 100644
  		compatible = "raspberrypi,firmware-gpio";
  		gpio-controller;
 diff --git a/arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi b/arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi
-index 925cb37c22f06..73e1290616e4f 100644
+index 925cb37c22f0..73e1290616e4 100644
 --- a/arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi
 +++ b/arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi
 @@ -35,6 +35,11 @@
@@ -430005,7 +430020,7 @@ index 925cb37c22f06..73e1290616e4f 100644
  		compatible = "raspberrypi,firmware-gpio";
  		gpio-controller;
 diff --git a/drivers/clk/bcm/clk-raspberrypi.c b/drivers/clk/bcm/clk-raspberrypi.c
-index eb1844148af96..c4929416b6d5c 100644
+index eb1844148af9..c4929416b6d5 100644
 --- a/drivers/clk/bcm/clk-raspberrypi.c
 +++ b/drivers/clk/bcm/clk-raspberrypi.c
 @@ -383,13 +383,23 @@ static int raspberrypi_clk_probe(struct platform_device *pdev)
@@ -430054,7 +430069,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  1 file changed, 24 insertions(+), 6 deletions(-)
 
 diff --git a/drivers/clk/bcm/clk-raspberrypi.c b/drivers/clk/bcm/clk-raspberrypi.c
-index c4929416b6d5c..c21d8c7de439e 100644
+index c4929416b6d5..c21d8c7de439 100644
 --- a/drivers/clk/bcm/clk-raspberrypi.c
 +++ b/drivers/clk/bcm/clk-raspberrypi.c
 @@ -18,7 +18,23 @@
@@ -430142,7 +430157,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  1 file changed, 32 insertions(+), 17 deletions(-)
 
 diff --git a/drivers/clk/bcm/clk-raspberrypi.c b/drivers/clk/bcm/clk-raspberrypi.c
-index c21d8c7de439e..70574c937b68f 100644
+index c21d8c7de439..70574c937b68 100644
 --- a/drivers/clk/bcm/clk-raspberrypi.c
 +++ b/drivers/clk/bcm/clk-raspberrypi.c
 @@ -57,9 +57,6 @@ struct raspberrypi_clk_data {
@@ -430279,7 +430294,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  1 file changed, 20 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/clk/bcm/clk-raspberrypi.c b/drivers/clk/bcm/clk-raspberrypi.c
-index 70574c937b68f..4f7fe01c1b3b0 100644
+index 70574c937b68..4f7fe01c1b3b 100644
 --- a/drivers/clk/bcm/clk-raspberrypi.c
 +++ b/drivers/clk/bcm/clk-raspberrypi.c
 @@ -36,6 +36,23 @@ enum rpi_firmware_clk_id {
@@ -430336,7 +430351,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  1 file changed, 9 insertions(+), 154 deletions(-)
 
 diff --git a/drivers/clk/bcm/clk-raspberrypi.c b/drivers/clk/bcm/clk-raspberrypi.c
-index 4f7fe01c1b3b0..c87e3ee58e4ba 100644
+index 4f7fe01c1b3b..c87e3ee58e4b 100644
 --- a/drivers/clk/bcm/clk-raspberrypi.c
 +++ b/drivers/clk/bcm/clk-raspberrypi.c
 @@ -151,13 +151,6 @@ static unsigned long raspberrypi_fw_get_rate(struct clk_hw *hw,
@@ -430545,7 +430560,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  1 file changed, 18 insertions(+), 7 deletions(-)
 
 diff --git a/drivers/clk/bcm/clk-raspberrypi.c b/drivers/clk/bcm/clk-raspberrypi.c
-index c87e3ee58e4ba..642622fb77ea4 100644
+index c87e3ee58e4b..642622fb77ea 100644
 --- a/drivers/clk/bcm/clk-raspberrypi.c
 +++ b/drivers/clk/bcm/clk-raspberrypi.c
 @@ -268,13 +268,24 @@ static int raspberrypi_discover_clocks(struct raspberrypi_clk *rpi,
@@ -430595,7 +430610,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/clk/bcm/clk-raspberrypi.c b/drivers/clk/bcm/clk-raspberrypi.c
-index 642622fb77ea4..cb87980b468e5 100644
+index 642622fb77ea..cb87980b468e 100644
 --- a/drivers/clk/bcm/clk-raspberrypi.c
 +++ b/drivers/clk/bcm/clk-raspberrypi.c
 @@ -359,8 +359,8 @@ static int raspberrypi_clk_remove(struct platform_device *pdev)
@@ -430639,7 +430654,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  11 files changed, 21 insertions(+), 40 deletions(-)
 
 diff --git a/arch/arm/boot/dts/bcm2709-rpi.dtsi b/arch/arm/boot/dts/bcm2709-rpi.dtsi
-index babfa41cd9f78..624e2bdc8733f 100644
+index babfa41cd9f7..624e2bdc8733 100644
 --- a/arch/arm/boot/dts/bcm2709-rpi.dtsi
 +++ b/arch/arm/boot/dts/bcm2709-rpi.dtsi
 @@ -3,3 +3,10 @@
@@ -430654,7 +430669,7 @@ index babfa41cd9f78..624e2bdc8733f 100644
 +	};
 +};
 diff --git a/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts b/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts
-index 497a3f253291c..3ca70650287cb 100644
+index 497a3f253291..3ca70650287c 100644
 --- a/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts
 +++ b/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts
 @@ -85,11 +85,6 @@
@@ -430670,7 +430685,7 @@ index 497a3f253291c..3ca70650287cb 100644
  		compatible = "raspberrypi,firmware-gpio";
  		gpio-controller;
 diff --git a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
-index 92ad8ba8987db..abdf7e1c02476 100644
+index 92ad8ba8987d..abdf7e1c0247 100644
 --- a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
 +++ b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
 @@ -96,11 +96,6 @@
@@ -430686,7 +430701,7 @@ index 92ad8ba8987db..abdf7e1c02476 100644
  		compatible = "raspberrypi,firmware-gpio";
  		gpio-controller;
 diff --git a/arch/arm/boot/dts/bcm2710-rpi-cm3.dts b/arch/arm/boot/dts/bcm2710-rpi-cm3.dts
-index a8e2e6486d59b..88f7fe53b97f2 100644
+index a8e2e6486d59..88f7fe53b97f 100644
 --- a/arch/arm/boot/dts/bcm2710-rpi-cm3.dts
 +++ b/arch/arm/boot/dts/bcm2710-rpi-cm3.dts
 @@ -58,11 +58,6 @@
@@ -430702,7 +430717,7 @@ index a8e2e6486d59b..88f7fe53b97f2 100644
  		compatible = "raspberrypi,firmware-gpio";
  		gpio-controller;
 diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
-index efff867951bb9..05220fa0202b3 100644
+index efff867951bb..05220fa0202b 100644
 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
 +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
 @@ -54,11 +54,6 @@
@@ -430718,7 +430733,7 @@ index efff867951bb9..05220fa0202b3 100644
  		compatible = "raspberrypi,firmware-gpio";
  		gpio-controller;
 diff --git a/arch/arm/boot/dts/bcm2711-rpi.dtsi b/arch/arm/boot/dts/bcm2711-rpi.dtsi
-index 05e51a05bf56c..7fd09353740af 100644
+index 05e51a05bf56..7fd09353740a 100644
 --- a/arch/arm/boot/dts/bcm2711-rpi.dtsi
 +++ b/arch/arm/boot/dts/bcm2711-rpi.dtsi
 @@ -170,3 +170,10 @@
@@ -430733,7 +430748,7 @@ index 05e51a05bf56c..7fd09353740af 100644
 +	};
 +};
 diff --git a/arch/arm/boot/dts/bcm2836-rpi.dtsi b/arch/arm/boot/dts/bcm2836-rpi.dtsi
-index c4c858b984c6b..52b47038ca822 100644
+index c4c858b984c6..52b47038ca82 100644
 --- a/arch/arm/boot/dts/bcm2836-rpi.dtsi
 +++ b/arch/arm/boot/dts/bcm2836-rpi.dtsi
 @@ -4,3 +4,10 @@
@@ -430748,7 +430763,7 @@ index c4c858b984c6b..52b47038ca822 100644
 +	};
 +};
 diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts b/arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts
-index 4a28b144eaf21..66ba24e9ff375 100644
+index 4a28b144eaf2..66ba24e9ff37 100644
 --- a/arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts
 +++ b/arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts
 @@ -31,11 +31,6 @@
@@ -430764,7 +430779,7 @@ index 4a28b144eaf21..66ba24e9ff375 100644
  		compatible = "raspberrypi,firmware-gpio";
  		gpio-controller;
 diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts
-index f38b2c5aa449b..63f4592ba7dd6 100644
+index f38b2c5aa449..63f4592ba7dd 100644
 --- a/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts
 +++ b/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts
 @@ -37,11 +37,6 @@
@@ -430780,7 +430795,7 @@ index f38b2c5aa449b..63f4592ba7dd6 100644
  		compatible = "raspberrypi,firmware-gpio";
  		gpio-controller;
 diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
-index 11b2d823e6ae6..5474f8ab894fa 100644
+index 11b2d823e6ae..5474f8ab894f 100644
 --- a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
 +++ b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
 @@ -32,11 +32,6 @@
@@ -430796,7 +430811,7 @@ index 11b2d823e6ae6..5474f8ab894fa 100644
  		compatible = "raspberrypi,firmware-gpio";
  		gpio-controller;
 diff --git a/arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi b/arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi
-index 73e1290616e4f..925cb37c22f06 100644
+index 73e1290616e4..925cb37c22f0 100644
 --- a/arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi
 +++ b/arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi
 @@ -35,11 +35,6 @@
@@ -430831,7 +430846,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  create mode 100644 arch/arm/boot/dts/bcm2711-rpi-cm4.dts
 
 diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
-index 990457a51843b..477108fe04043 100644
+index 990457a51843..477108fe0404 100644
 --- a/arch/arm/boot/dts/Makefile
 +++ b/arch/arm/boot/dts/Makefile
 @@ -12,7 +12,8 @@ dtb-$(CONFIG_ARCH_BCM2835) += \
@@ -430846,7 +430861,7 @@ index 990457a51843b..477108fe04043 100644
  	alpine-db.dtb
 diff --git a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
 new file mode 100644
-index 0000000000000..f616d3f23f14b
+index 000000000000..f616d3f23f14
 --- /dev/null
 +++ b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
 @@ -0,0 +1,586 @@
@@ -431437,7 +431452,7 @@ index 0000000000000..f616d3f23f14b
 +	};
 +};
 diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
-index 3c38fbe718863..073d7dadcc95a 100644
+index 3c38fbe71886..073d7dadcc95 100644
 --- a/arch/arm/boot/dts/overlays/README
 +++ b/arch/arm/boot/dts/overlays/README
 @@ -92,6 +92,12 @@ Name:   <The base DTB>
@@ -431476,7 +431491,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  1 file changed, 23 insertions(+), 7 deletions(-)
 
 diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c
-index 9e452c366b263..1e0a94778856a 100644
+index 9e452c366b26..1e0a94778856 100644
 --- a/drivers/pci/controller/pcie-brcmstb.c
 +++ b/drivers/pci/controller/pcie-brcmstb.c
 @@ -102,8 +102,9 @@
@@ -431557,7 +431572,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  1 file changed, 4 insertions(+)
 
 diff --git a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
-index f616d3f23f14b..2ea54b92fbcab 100644
+index f616d3f23f14..2ea54b92fbca 100644
 --- a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
 +++ b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
 @@ -252,6 +252,10 @@
@@ -431588,7 +431603,7 @@ See: https://github.com/raspberrypi/linux/pull/3687
  1 file changed, 2 insertions(+), 51 deletions(-)
 
 diff --git a/drivers/spi/spi-bcm2835.c b/drivers/spi/spi-bcm2835.c
-index 7ac3563f458b1..7b5216461bc4b 100644
+index cebc6f016614..c81ea853d913 100644
 --- a/drivers/spi/spi-bcm2835.c
 +++ b/drivers/spi/spi-bcm2835.c
 @@ -1173,57 +1173,9 @@ static void bcm2835_spi_handle_err(struct spi_controller *ctlr,
@@ -431651,9 +431666,9 @@ index 7ac3563f458b1..7b5216461bc4b 100644
  }
  
  static int bcm2835_spi_setup(struct spi_device *spi)
-@@ -1328,7 +1280,6 @@ static int bcm2835_spi_probe(struct platform_device *pdev)
+@@ -1334,7 +1286,6 @@ static int bcm2835_spi_probe(struct platform_device *pdev)
  	ctlr->bits_per_word_mask = SPI_BPW_MASK(8);
- 	ctlr->num_chipselect = BCM2835_SPI_NUM_CS;
+ 	ctlr->num_chipselect = 3;
  	ctlr->setup = bcm2835_spi_setup;
 -	ctlr->set_cs = bcm2835_spi_set_cs;
  	ctlr->transfer_one = bcm2835_spi_transfer_one;
@@ -431677,7 +431692,7 @@ Signed-off-by: Markus Proeller <markus.proeller@pieye.org>
  1 file changed, 22 insertions(+), 15 deletions(-)
 
 diff --git a/drivers/media/i2c/irs1125.c b/drivers/media/i2c/irs1125.c
-index 25e1dd5a08efa..6680afea58947 100644
+index 25e1dd5a08ef..6680afea5894 100644
 --- a/drivers/media/i2c/irs1125.c
 +++ b/drivers/media/i2c/irs1125.c
 @@ -248,27 +248,34 @@ static int irs1125_write(struct v4l2_subdev *sd, u16 reg, u16 val)
@@ -431748,7 +431763,7 @@ Signed-off-by: Markus Proeller <markus.proeller@pieye.org>
  1 file changed, 20 insertions(+), 16 deletions(-)
 
 diff --git a/drivers/media/i2c/irs1125.c b/drivers/media/i2c/irs1125.c
-index 6680afea58947..289f0c25b1414 100644
+index 6680afea5894..289f0c25b141 100644
 --- a/drivers/media/i2c/irs1125.c
 +++ b/drivers/media/i2c/irs1125.c
 @@ -15,6 +15,7 @@
@@ -431884,7 +431899,7 @@ Signed-off-by: Markus Proeller <markus.proeller@pieye.org>
  2 files changed, 204 insertions(+), 88 deletions(-)
 
 diff --git a/drivers/media/i2c/irs1125.c b/drivers/media/i2c/irs1125.c
-index 289f0c25b1414..d59e05004a037 100644
+index 289f0c25b141..d59e05004a03 100644
 --- a/drivers/media/i2c/irs1125.c
 +++ b/drivers/media/i2c/irs1125.c
 @@ -89,6 +89,52 @@ static inline struct irs1125 *to_state(struct v4l2_subdev *sd)
@@ -432163,7 +432178,7 @@ index 289f0c25b1414..d59e05004a037 100644
  	return 0;
  
 diff --git a/drivers/media/i2c/irs1125.h b/drivers/media/i2c/irs1125.h
-index dccaca23aa76a..96d676123d5ed 100644
+index dccaca23aa76..96d676123d5e 100644
 --- a/drivers/media/i2c/irs1125.h
 +++ b/drivers/media/i2c/irs1125.h
 @@ -21,18 +21,57 @@
@@ -432272,7 +432287,7 @@ Signed-off-by: Markus Proeller <markus.proeller@pieye.org>
  1 file changed, 58 insertions(+), 63 deletions(-)
 
 diff --git a/drivers/media/i2c/irs1125.c b/drivers/media/i2c/irs1125.c
-index d59e05004a037..30c3d26403865 100644
+index d59e05004a03..30c3d2640386 100644
 --- a/drivers/media/i2c/irs1125.c
 +++ b/drivers/media/i2c/irs1125.c
 @@ -82,6 +82,7 @@ struct irs1125 {
@@ -432463,7 +432478,7 @@ Signed-off-by: Maxim Mikityanskiy <maxtram95@gmail.com>
  1 file changed, 1 insertion(+)
 
 diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c
-index 31968fec297f5..a0cba3823e5ef 100644
+index 31968fec297f..a0cba3823e5e 100644
 --- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c
 +++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c
 @@ -438,3 +438,4 @@ module_platform_driver(bcm2835_alsa_driver);
@@ -432490,7 +432505,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  2 files changed, 47 insertions(+), 13 deletions(-)
 
 diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
-index f953e98a95f83..7ddb88b02ea9e 100644
+index f953e98a95f8..7ddb88b02ea9 100644
 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
 @@ -9,6 +9,7 @@
@@ -432560,7 +432575,7 @@ index f953e98a95f83..7ddb88b02ea9e 100644
  		return;
  
 diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
-index 3aed4c4b887aa..a926c466706f0 100644
+index 3aed4c4b887a..a926c466706f 100644
 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
 @@ -10,6 +10,7 @@
@@ -432633,7 +432648,7 @@ Signed-off-by: Jacopo Mondi <jacopo+renesas@jmondi.org>
  1 file changed, 27 insertions(+)
 
 diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h
-index 71f1f2f0da536..ab736577b882f 100644
+index 71f1f2f0da53..ab736577b882 100644
 --- a/include/media/v4l2-subdev.h
 +++ b/include/media/v4l2-subdev.h
 @@ -670,6 +670,29 @@ struct v4l2_subdev_pad_config {
@@ -432709,7 +432724,7 @@ Signed-off-by: Jacopo Mondi <jacopo+renesas@jmondi.org>
  7 files changed, 28 insertions(+), 21 deletions(-)
 
 diff --git a/drivers/media/i2c/adv7180.c b/drivers/media/i2c/adv7180.c
-index 8e3cf751a5a1d..575c4b60beae6 100644
+index 8e3cf751a5a1..575c4b60beae 100644
 --- a/drivers/media/i2c/adv7180.c
 +++ b/drivers/media/i2c/adv7180.c
 @@ -749,8 +749,9 @@ static int adv7180_set_pad_format(struct v4l2_subdev *sd,
@@ -432741,7 +432756,7 @@ index 8e3cf751a5a1d..575c4b60beae6 100644
  
  static const struct v4l2_subdev_sensor_ops adv7180_sensor_ops = {
 diff --git a/drivers/media/i2c/ml86v7667.c b/drivers/media/i2c/ml86v7667.c
-index c444bd6a06580..ff212335326a7 100644
+index c444bd6a0658..ff212335326a 100644
 --- a/drivers/media/i2c/ml86v7667.c
 +++ b/drivers/media/i2c/ml86v7667.c
 @@ -219,8 +219,9 @@ static int ml86v7667_fill_fmt(struct v4l2_subdev *sd,
@@ -432772,7 +432787,7 @@ index c444bd6a06580..ff212335326a7 100644
  
  static const struct v4l2_subdev_core_ops ml86v7667_subdev_core_ops = {
 diff --git a/drivers/media/i2c/mt9m001.c b/drivers/media/i2c/mt9m001.c
-index 5613072908acb..052d168e2700b 100644
+index 5613072908ac..052d168e2700 100644
 --- a/drivers/media/i2c/mt9m001.c
 +++ b/drivers/media/i2c/mt9m001.c
 @@ -689,8 +689,9 @@ static int mt9m001_enum_mbus_code(struct v4l2_subdev *sd,
@@ -432804,7 +432819,7 @@ index 5613072908acb..052d168e2700b 100644
  
  static const struct v4l2_subdev_ops mt9m001_subdev_ops = {
 diff --git a/drivers/media/i2c/mt9m111.c b/drivers/media/i2c/mt9m111.c
-index 17e8253f5748e..69697386ffcd6 100644
+index 17e8253f5748..69697386ffcd 100644
 --- a/drivers/media/i2c/mt9m111.c
 +++ b/drivers/media/i2c/mt9m111.c
 @@ -1137,8 +1137,9 @@ static int mt9m111_init_cfg(struct v4l2_subdev *sd,
@@ -432836,7 +432851,7 @@ index 17e8253f5748e..69697386ffcd6 100644
  
  static const struct v4l2_subdev_ops mt9m111_subdev_ops = {
 diff --git a/drivers/media/i2c/ov9640.c b/drivers/media/i2c/ov9640.c
-index 4826096653056..0ef5af026d097 100644
+index 482609665305..0ef5af026d09 100644
 --- a/drivers/media/i2c/ov9640.c
 +++ b/drivers/media/i2c/ov9640.c
 @@ -648,8 +648,9 @@ static const struct v4l2_subdev_core_ops ov9640_core_ops = {
@@ -432867,7 +432882,7 @@ index 4826096653056..0ef5af026d097 100644
  
  static const struct v4l2_subdev_ops ov9640_subdev_ops = {
 diff --git a/drivers/media/i2c/tc358743.c b/drivers/media/i2c/tc358743.c
-index 73caf8609a7e1..b3b8d6e15ea2b 100644
+index 427ae6c009d4..b69eb9fd02c8 100644
 --- a/drivers/media/i2c/tc358743.c
 +++ b/drivers/media/i2c/tc358743.c
 @@ -1621,8 +1621,9 @@ static int tc358743_dv_timings_cap(struct v4l2_subdev *sd,
@@ -432899,7 +432914,7 @@ index 73caf8609a7e1..b3b8d6e15ea2b 100644
  
  static const struct v4l2_subdev_ops tc358743_ops = {
 diff --git a/drivers/media/i2c/tvp5150.c b/drivers/media/i2c/tvp5150.c
-index edad49cebcdf6..8ffff67ce2b7c 100644
+index edad49cebcdf..8ffff67ce2b7 100644
 --- a/drivers/media/i2c/tvp5150.c
 +++ b/drivers/media/i2c/tvp5150.c
 @@ -1104,8 +1104,9 @@ static int tvp5150_get_selection(struct v4l2_subdev *sd,
@@ -432965,7 +432980,7 @@ Signed-off-by: Jacopo Mondi <jacopo+renesas@jmondi.org>
  1 file changed, 39 insertions(+), 17 deletions(-)
 
 diff --git a/drivers/media/i2c/ov6650.c b/drivers/media/i2c/ov6650.c
-index af482620f94a6..704064728f55b 100644
+index af482620f94a..704064728f55 100644
 --- a/drivers/media/i2c/ov6650.c
 +++ b/drivers/media/i2c/ov6650.c
 @@ -909,46 +909,68 @@ static const struct v4l2_subdev_core_ops ov6650_core_ops = {
@@ -433118,7 +433133,7 @@ Signed-off-by: Jacopo Mondi <jacopo+renesas@jmondi.org>
  1 file changed, 51 insertions(+), 138 deletions(-)
 
 diff --git a/drivers/media/platform/pxa_camera.c b/drivers/media/platform/pxa_camera.c
-index 6e04e3ec61bac..b99bdfe8402c1 100644
+index 6e04e3ec61ba..b99bdfe8402c 100644
 --- a/drivers/media/platform/pxa_camera.c
 +++ b/drivers/media/platform/pxa_camera.c
 @@ -605,42 +605,6 @@ static const struct pxa_mbus_pixelfmt *pxa_mbus_get_fmtdesc(
@@ -433381,7 +433396,7 @@ Signed-off-by: Jacopo Mondi <jacopo+renesas@jmondi.org>
  1 file changed, 10 deletions(-)
 
 diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h
-index ab736577b882f..d5225239f3165 100644
+index ab736577b882..d5225239f316 100644
 --- a/include/media/v4l2-subdev.h
 +++ b/include/media/v4l2-subdev.h
 @@ -402,12 +402,6 @@ struct v4l2_mbus_frame_desc {
@@ -433428,7 +433443,7 @@ Signed-off-by: Jacopo Mondi <jacopo+renesas@jmondi.org>
  1 file changed, 4 insertions(+)
 
 diff --git a/drivers/staging/media/imx/TODO b/drivers/staging/media/imx/TODO
-index 6f29b5ca5324c..64c6ba5945ca3 100644
+index 6f29b5ca5324..64c6ba5945ca 100644
 --- a/drivers/staging/media/imx/TODO
 +++ b/drivers/staging/media/imx/TODO
 @@ -10,6 +10,10 @@
@@ -433478,7 +433493,7 @@ Signed-off-by: Jacopo Mondi <jacopo+renesas@jmondi.org>
  2 files changed, 25 insertions(+), 7 deletions(-)
 
 diff --git a/drivers/media/i2c/adv748x/adv748x-core.c b/drivers/media/i2c/adv748x/adv748x-core.c
-index 23e02ff27b17b..1fe7f97c6d52c 100644
+index 23e02ff27b17..1fe7f97c6d52 100644
 --- a/drivers/media/i2c/adv748x/adv748x-core.c
 +++ b/drivers/media/i2c/adv748x/adv748x-core.c
 @@ -241,10 +241,10 @@ static int adv748x_power_up_tx(struct adv748x_csi2 *tx)
@@ -433562,7 +433577,7 @@ index 23e02ff27b17b..1fe7f97c6d52c 100644
  	}
  
 diff --git a/drivers/media/i2c/adv748x/adv748x.h b/drivers/media/i2c/adv748x/adv748x.h
-index fccb388ce179f..1061f425ece59 100644
+index fccb388ce179..1061f425ece5 100644
 --- a/drivers/media/i2c/adv748x/adv748x.h
 +++ b/drivers/media/i2c/adv748x/adv748x.h
 @@ -79,6 +79,7 @@ struct adv748x_csi2 {
@@ -433598,7 +433613,7 @@ Signed-off-by: Jacopo Mondi <jacopo+renesas@jmondi.org>
  1 file changed, 31 insertions(+)
 
 diff --git a/drivers/media/i2c/adv748x/adv748x-csi2.c b/drivers/media/i2c/adv748x/adv748x-csi2.c
-index 2091cda509356..99bb63d05eef1 100644
+index 2091cda50935..99bb63d05eef 100644
 --- a/drivers/media/i2c/adv748x/adv748x-csi2.c
 +++ b/drivers/media/i2c/adv748x/adv748x-csi2.c
 @@ -214,9 +214,40 @@ static int adv748x_csi2_set_format(struct v4l2_subdev *sd,
@@ -433666,7 +433681,7 @@ Signed-off-by: Jacopo Mondi <jacopo+renesas@jmondi.org>
  1 file changed, 67 insertions(+), 7 deletions(-)
 
 diff --git a/drivers/media/platform/rcar-vin/rcar-csi2.c b/drivers/media/platform/rcar-vin/rcar-csi2.c
-index d27eccfa57cae..7a1f397d4fc37 100644
+index d27eccfa57ca..7a1f397d4fc3 100644
 --- a/drivers/media/platform/rcar-vin/rcar-csi2.c
 +++ b/drivers/media/platform/rcar-vin/rcar-csi2.c
 @@ -362,6 +362,7 @@ struct rcar_csi2 {
@@ -433833,7 +433848,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
 
 diff --git a/drivers/media/platform/bcm2835/Kconfig b/drivers/media/platform/bcm2835/Kconfig
 deleted file mode 100644
-index 20e15147ee02f..0000000000000
+index 20e15147ee02..000000000000
 --- a/drivers/media/platform/bcm2835/Kconfig
 +++ /dev/null
 @@ -1,14 +0,0 @@
@@ -433853,7 +433868,7 @@ index 20e15147ee02f..0000000000000
 -	   will be called bcm2835-unicam.
 diff --git a/drivers/media/platform/bcm2835/Makefile b/drivers/media/platform/bcm2835/Makefile
 deleted file mode 100644
-index a98aba03598ab..0000000000000
+index a98aba03598a..000000000000
 --- a/drivers/media/platform/bcm2835/Makefile
 +++ /dev/null
 @@ -1,3 +0,0 @@
@@ -433862,7 +433877,7 @@ index a98aba03598ab..0000000000000
 -obj-$(CONFIG_VIDEO_BCM2835_UNICAM) += bcm2835-unicam.o
 diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c
 deleted file mode 100644
-index 47b2d3a03fbfa..0000000000000
+index 47b2d3a03fbf..000000000000
 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
 +++ /dev/null
 @@ -1,2873 +0,0 @@
@@ -436741,7 +436756,7 @@ index 47b2d3a03fbfa..0000000000000
 -MODULE_VERSION(UNICAM_VERSION);
 diff --git a/drivers/media/platform/bcm2835/vc4-regs-unicam.h b/drivers/media/platform/bcm2835/vc4-regs-unicam.h
 deleted file mode 100644
-index ae059a171d0fe..0000000000000
+index ae059a171d0f..000000000000
 --- a/drivers/media/platform/bcm2835/vc4-regs-unicam.h
 +++ /dev/null
 @@ -1,253 +0,0 @@
@@ -437018,7 +437033,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 1 insertion(+)
 
 diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
-index 8f2befe9c905e..4cc362a79c7c7 100644
+index 8f2befe9c905..4cc362a79c7c 100644
 --- a/include/media/v4l2-dev.h
 +++ b/include/media/v4l2-dev.h
 @@ -34,6 +34,7 @@
@@ -437065,7 +437080,7 @@ Reported-by: kbuild test robot <lkp@intel.com>
  create mode 100644 drivers/media/platform/bcm2835/vc4-regs-unicam.h
 
 diff --git a/MAINTAINERS b/MAINTAINERS
-index 4ba0cad485129..d744087f13a70 100644
+index 4ba0cad48512..d744087f13a7 100644
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
 @@ -3210,7 +3210,7 @@ M:	Raspberry Pi Kernel Maintenance <kernel-list@raspberrypi.com>
@@ -437079,7 +437094,7 @@ index 4ba0cad485129..d744087f13a70 100644
  M:	Raspberry Pi Kernel Maintenance <kernel-list@raspberrypi.com>
 diff --git a/drivers/media/platform/bcm2835/Kconfig b/drivers/media/platform/bcm2835/Kconfig
 new file mode 100644
-index 0000000000000..ec46e3ef053cf
+index 000000000000..ec46e3ef053c
 --- /dev/null
 +++ b/drivers/media/platform/bcm2835/Kconfig
 @@ -0,0 +1,15 @@
@@ -437100,7 +437115,7 @@ index 0000000000000..ec46e3ef053cf
 +	  called bcm2835-unicam.
 diff --git a/drivers/media/platform/bcm2835/Makefile b/drivers/media/platform/bcm2835/Makefile
 new file mode 100644
-index 0000000000000..a98aba03598ab
+index 000000000000..a98aba03598a
 --- /dev/null
 +++ b/drivers/media/platform/bcm2835/Makefile
 @@ -0,0 +1,3 @@
@@ -437109,7 +437124,7 @@ index 0000000000000..a98aba03598ab
 +obj-$(CONFIG_VIDEO_BCM2835_UNICAM) += bcm2835-unicam.o
 diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c
 new file mode 100644
-index 0000000000000..2e9387cbc1e05
+index 000000000000..2e9387cbc1e0
 --- /dev/null
 +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
 @@ -0,0 +1,2825 @@
@@ -439940,7 +439955,7 @@ index 0000000000000..2e9387cbc1e05
 +MODULE_VERSION(UNICAM_VERSION);
 diff --git a/drivers/media/platform/bcm2835/vc4-regs-unicam.h b/drivers/media/platform/bcm2835/vc4-regs-unicam.h
 new file mode 100644
-index 0000000000000..ae059a171d0fe
+index 000000000000..ae059a171d0f
 --- /dev/null
 +++ b/drivers/media/platform/bcm2835/vc4-regs-unicam.h
 @@ -0,0 +1,253 @@
@@ -440216,7 +440231,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 27 insertions(+), 4 deletions(-)
 
 diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-index 2e9387cbc1e05..9adfb2d217af1 100644
+index 2e9387cbc1e0..9adfb2d217af 100644
 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
 +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
 @@ -1639,12 +1639,35 @@ static int unicam_start_streaming(struct vb2_queue *vq, unsigned int count)
@@ -440284,7 +440299,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 15 deletions(-)
 
 diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-index 9adfb2d217af1..9c0b9375572d1 100644
+index 9adfb2d217af..9c0b9375572d 100644
 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
 +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
 @@ -772,12 +772,6 @@ static bool unicam_all_nodes_streaming(struct unicam_device *dev)
@@ -440331,7 +440346,7 @@ Signed-off-by: Jacko Dirks <jdirks.linuxdev@gmail.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-index 9c0b9375572d1..7906c2813a700 100644
+index 9c0b9375572d..7906c2813a70 100644
 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
 +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
 @@ -994,7 +994,7 @@ const struct unicam_fmt *get_first_supported_format(struct unicam_device *dev)
@@ -440363,7 +440378,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  2 files changed, 39 insertions(+), 43 deletions(-)
 
 diff --git a/drivers/media/platform/bcm2835/Kconfig b/drivers/media/platform/bcm2835/Kconfig
-index ec46e3ef053cf..c45ae3c6f1fde 100644
+index ec46e3ef053c..c45ae3c6f1fd 100644
 --- a/drivers/media/platform/bcm2835/Kconfig
 +++ b/drivers/media/platform/bcm2835/Kconfig
 @@ -1,15 +1,19 @@
@@ -440391,7 +440406,7 @@ index ec46e3ef053cf..c45ae3c6f1fde 100644
  	  To compile this driver as a module, choose M here. The module will be
  	  called bcm2835-unicam.
 diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-index 7906c2813a700..94e08ae92c1f6 100644
+index 7906c2813a70..94e08ae92c1f 100644
 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
 +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
 @@ -1,6 +1,6 @@
@@ -440618,7 +440633,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 17 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-index 94e08ae92c1f6..96c0b9fea9423 100644
+index 94e08ae92c1f..96c0b9fea942 100644
 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
 +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
 @@ -970,8 +970,23 @@ static int unicam_g_fmt_vid_cap(struct file *file, void *priv,
@@ -440669,7 +440684,7 @@ Signed-off-by: David Plowman <david.plowman@raspberrypi.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-index 96c0b9fea9423..f2cd2083bbd42 100644
+index 96c0b9fea942..f2cd2083bbd4 100644
 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
 +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
 @@ -2387,7 +2387,7 @@ static int register_node(struct unicam_device *unicam, struct unicam_node *node,
@@ -440715,7 +440730,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  9 files changed, 25 insertions(+), 17 deletions(-)
 
 diff --git a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
-index 2ea54b92fbcab..c42fa2aa5ef23 100644
+index 2ea54b92fbca..c42fa2aa5ef2 100644
 --- a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
 +++ b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
 @@ -203,7 +203,8 @@
@@ -440729,7 +440744,7 @@ index 2ea54b92fbcab..c42fa2aa5ef23 100644
  
  /delete-node/ &emmc2;
 diff --git a/arch/arm/boot/dts/bcm283x-rpi-csi0-2lane.dtsi b/arch/arm/boot/dts/bcm283x-rpi-csi0-2lane.dtsi
-index 952a28eaf6163..6e4ce8622b477 100644
+index 952a28eaf616..6e4ce8622b47 100644
 --- a/arch/arm/boot/dts/bcm283x-rpi-csi0-2lane.dtsi
 +++ b/arch/arm/boot/dts/bcm283x-rpi-csi0-2lane.dtsi
 @@ -1,8 +1,4 @@
@@ -440743,7 +440758,7 @@ index 952a28eaf6163..6e4ce8622b477 100644
 +	brcm,num-data-lanes = <2>;
  };
 diff --git a/arch/arm/boot/dts/bcm283x-rpi-csi1-2lane.dtsi b/arch/arm/boot/dts/bcm283x-rpi-csi1-2lane.dtsi
-index 451fb4bb4ab81..6938f4daacdc2 100644
+index 451fb4bb4ab8..6938f4daacdc 100644
 --- a/arch/arm/boot/dts/bcm283x-rpi-csi1-2lane.dtsi
 +++ b/arch/arm/boot/dts/bcm283x-rpi-csi1-2lane.dtsi
 @@ -1,8 +1,4 @@
@@ -440757,7 +440772,7 @@ index 451fb4bb4ab81..6938f4daacdc2 100644
 +	brcm,num-data-lanes = <2>;
  };
 diff --git a/arch/arm/boot/dts/bcm283x-rpi-csi1-4lane.dtsi b/arch/arm/boot/dts/bcm283x-rpi-csi1-4lane.dtsi
-index 9279d4b0bfae2..b37037437beed 100644
+index 9279d4b0bfae..b37037437bee 100644
 --- a/arch/arm/boot/dts/bcm283x-rpi-csi1-4lane.dtsi
 +++ b/arch/arm/boot/dts/bcm283x-rpi-csi1-4lane.dtsi
 @@ -1,8 +1,4 @@
@@ -440771,7 +440786,7 @@ index 9279d4b0bfae2..b37037437beed 100644
 +	brcm,num-data-lanes = <4>;
  };
 diff --git a/arch/arm/boot/dts/overlays/adv7282m-overlay.dts b/arch/arm/boot/dts/overlays/adv7282m-overlay.dts
-index 238acd2bee723..5d85dfd0595c9 100644
+index 238acd2bee72..5d85dfd0595c 100644
 --- a/arch/arm/boot/dts/overlays/adv7282m-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/adv7282m-overlay.dts
 @@ -40,6 +40,7 @@
@@ -440783,7 +440798,7 @@ index 238acd2bee723..5d85dfd0595c9 100644
  			};
  		};
 diff --git a/arch/arm/boot/dts/overlays/imx477-overlay.dts b/arch/arm/boot/dts/overlays/imx477-overlay.dts
-index 1dd6f92b4dfe7..bd187713939e1 100644
+index 1dd6f92b4dfe..bd187713939e 100644
 --- a/arch/arm/boot/dts/overlays/imx477-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/imx477-overlay.dts
 @@ -49,6 +49,7 @@
@@ -440795,7 +440810,7 @@ index 1dd6f92b4dfe7..bd187713939e1 100644
  			};
  		};
 diff --git a/arch/arm/boot/dts/overlays/irs1125-overlay.dts b/arch/arm/boot/dts/overlays/irs1125-overlay.dts
-index 7e9431f64dc32..e926e18e71fce 100644
+index 7e9431f64dc3..e926e18e71fc 100644
 --- a/arch/arm/boot/dts/overlays/irs1125-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/irs1125-overlay.dts
 @@ -43,6 +43,8 @@
@@ -440808,7 +440823,7 @@ index 7e9431f64dc32..e926e18e71fce 100644
  			};
  		};
 diff --git a/arch/arm/boot/dts/overlays/ov5647-overlay.dts b/arch/arm/boot/dts/overlays/ov5647-overlay.dts
-index 3dc817fa48a8f..5eba3cb9fb91d 100644
+index 3dc817fa48a8..5eba3cb9fb91 100644
 --- a/arch/arm/boot/dts/overlays/ov5647-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/ov5647-overlay.dts
 @@ -43,6 +43,7 @@
@@ -440820,7 +440835,7 @@ index 3dc817fa48a8f..5eba3cb9fb91d 100644
  			};
  		};
 diff --git a/arch/arm/boot/dts/overlays/tc358743-overlay.dts b/arch/arm/boot/dts/overlays/tc358743-overlay.dts
-index 2ea99cd9e1a1e..a1f8af36d2e74 100644
+index 2ea99cd9e1a1..a1f8af36d2e7 100644
 --- a/arch/arm/boot/dts/overlays/tc358743-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/tc358743-overlay.dts
 @@ -86,8 +86,22 @@
@@ -440868,7 +440883,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-index f2cd2083bbd42..f70167d271fe6 100644
+index f2cd2083bbd4..f70167d271fe 100644
 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
 +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
 @@ -2578,7 +2578,7 @@ static const struct v4l2_async_notifier_operations unicam_async_ops = {
@@ -440907,7 +440922,7 @@ Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
 
 diff --git a/Documentation/devicetree/bindings/media/i2c/imx290.txt b/Documentation/devicetree/bindings/media/i2c/imx290.txt
 new file mode 100644
-index 0000000000000..a3cc21410f7c6
+index 000000000000..a3cc21410f7c
 --- /dev/null
 +++ b/Documentation/devicetree/bindings/media/i2c/imx290.txt
 @@ -0,0 +1,57 @@
@@ -440969,7 +440984,7 @@ index 0000000000000..a3cc21410f7c6
 +			};
 +		};
 diff --git a/MAINTAINERS b/MAINTAINERS
-index d744087f13a70..1543a5147d221 100644
+index d744087f13a7..1543a5147d22 100644
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
 @@ -15200,6 +15200,14 @@ S:	Maintained
@@ -441014,7 +441029,7 @@ Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
  create mode 100644 drivers/media/i2c/imx290.c
 
 diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig
-index 40ff7cf92cefe..8e5e037f30df9 100644
+index 40ff7cf92cef..8e5e037f30df 100644
 --- a/drivers/media/i2c/Kconfig
 +++ b/drivers/media/i2c/Kconfig
 @@ -609,6 +609,17 @@ config VIDEO_IMX274
@@ -441036,7 +441051,7 @@ index 40ff7cf92cefe..8e5e037f30df9 100644
  	tristate "Sony IMX477 sensor support"
  	depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API
 diff --git a/drivers/media/i2c/Makefile b/drivers/media/i2c/Makefile
-index 93015547a1f6c..2d55801afdc6c 100644
+index 93015547a1f6..2d55801afdc6 100644
 --- a/drivers/media/i2c/Makefile
 +++ b/drivers/media/i2c/Makefile
 @@ -114,6 +114,7 @@ obj-$(CONFIG_VIDEO_IMX214)	+= imx214.o
@@ -441049,7 +441064,7 @@ index 93015547a1f6c..2d55801afdc6c 100644
  obj-$(CONFIG_VIDEO_IMX355)	+= imx355.o
 diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c
 new file mode 100644
-index 0000000000000..f7678e5a5d879
+index 000000000000..f7678e5a5d87
 --- /dev/null
 +++ b/drivers/media/i2c/imx290.c
 @@ -0,0 +1,884 @@
@@ -441970,7 +441985,7 @@ Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c
-index f7678e5a5d879..2d8c38ffe2f07 100644
+index f7678e5a5d87..2d8c38ffe2f0 100644
 --- a/drivers/media/i2c/imx290.c
 +++ b/drivers/media/i2c/imx290.c
 @@ -722,9 +722,6 @@ static int imx290_probe(struct i2c_client *client)
@@ -442017,7 +442032,7 @@ Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c
-index 2d8c38ffe2f07..d0322f9a88562 100644
+index 2d8c38ffe2f0..d0322f9a8856 100644
 --- a/drivers/media/i2c/imx290.c
 +++ b/drivers/media/i2c/imx290.c
 @@ -648,7 +648,7 @@ static int imx290_power_off(struct device *dev)
@@ -442065,7 +442080,7 @@ Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
  1 file changed, 4 insertions(+), 3 deletions(-)
 
 diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c
-index d0322f9a88562..7b1de1f0c8b74 100644
+index d0322f9a8856..7b1de1f0c8b7 100644
 --- a/drivers/media/i2c/imx290.c
 +++ b/drivers/media/i2c/imx290.c
 @@ -628,7 +628,7 @@ static int imx290_power_on(struct device *dev)
@@ -442121,7 +442136,7 @@ Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
  1 file changed, 133 insertions(+), 14 deletions(-)
 
 diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c
-index 7b1de1f0c8b74..ffb393962ffc5 100644
+index 7b1de1f0c8b7..ffb393962ffc 100644
 --- a/drivers/media/i2c/imx290.c
 +++ b/drivers/media/i2c/imx290.c
 @@ -25,7 +25,12 @@
@@ -442442,7 +442457,7 @@ Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
  1 file changed, 109 insertions(+), 39 deletions(-)
 
 diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c
-index ffb393962ffc5..152b65cb7cbc1 100644
+index ffb393962ffc..152b65cb7cbc 100644
 --- a/drivers/media/i2c/imx290.c
 +++ b/drivers/media/i2c/imx290.c
 @@ -32,8 +32,6 @@
@@ -442759,7 +442774,7 @@ Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
  1 file changed, 40 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c
-index 152b65cb7cbc1..67725a5aabd36 100644
+index 152b65cb7cbc..67725a5aabd3 100644
 --- a/drivers/media/i2c/imx290.c
 +++ b/drivers/media/i2c/imx290.c
 @@ -26,12 +26,19 @@
@@ -442868,7 +442883,7 @@ Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
  1 file changed, 33 insertions(+), 3 deletions(-)
 
 diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c
-index 67725a5aabd36..c654a9a8fb081 100644
+index 67725a5aabd3..c654a9a8fb08 100644
 --- a/drivers/media/i2c/imx290.c
 +++ b/drivers/media/i2c/imx290.c
 @@ -67,6 +67,7 @@ struct imx290 {
@@ -442983,7 +442998,7 @@ Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
  1 file changed, 23 insertions(+)
 
 diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c
-index c654a9a8fb081..fd147fac5ef2e 100644
+index c654a9a8fb08..fd147fac5ef2 100644
 --- a/drivers/media/i2c/imx290.c
 +++ b/drivers/media/i2c/imx290.c
 @@ -528,6 +528,28 @@ static int imx290_enum_mbus_code(struct v4l2_subdev *sd,
@@ -443048,7 +443063,7 @@ Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c
-index fd147fac5ef2e..02001c1b0dfcf 100644
+index fd147fac5ef2..02001c1b0dfc 100644
 --- a/drivers/media/i2c/imx290.c
 +++ b/drivers/media/i2c/imx290.c
 @@ -404,11 +404,11 @@ static int imx290_set_register_array(struct imx290 *imx290,
@@ -443094,7 +443109,7 @@ Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
  1 file changed, 19 insertions(+), 19 deletions(-)
 
 diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c
-index 02001c1b0dfcf..9c97830164e97 100644
+index 02001c1b0dfc..9c97830164e9 100644
 --- a/drivers/media/i2c/imx290.c
 +++ b/drivers/media/i2c/imx290.c
 @@ -70,7 +70,6 @@ struct imx290 {
@@ -443230,7 +443245,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 97 insertions(+), 22 deletions(-)
 
 diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c
-index 9c97830164e97..656716fea44b3 100644
+index 9c97830164e9..656716fea44b 100644
 --- a/drivers/media/i2c/imx290.c
 +++ b/drivers/media/i2c/imx290.c
 @@ -1,6 +1,10 @@
@@ -443499,7 +443514,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c
-index 656716fea44b3..e7eecbea9bb07 100644
+index 656716fea44b..e7eecbea9bb0 100644
 --- a/drivers/media/i2c/imx290.c
 +++ b/drivers/media/i2c/imx290.c
 @@ -1124,7 +1124,7 @@ static int imx290_probe(struct i2c_client *client)
@@ -443530,7 +443545,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 44 insertions(+), 22 deletions(-)
 
 diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c
-index e7eecbea9bb07..876ad590102be 100644
+index e7eecbea9bb0..876ad590102b 100644
 --- a/drivers/media/i2c/imx290.c
 +++ b/drivers/media/i2c/imx290.c
 @@ -40,6 +40,9 @@ enum imx290_clk_index {
@@ -443698,7 +443713,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 36 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c
-index 876ad590102be..ea0559e8dcc95 100644
+index 876ad590102b..ea0559e8dcc9 100644
 --- a/drivers/media/i2c/imx290.c
 +++ b/drivers/media/i2c/imx290.c
 @@ -38,6 +38,8 @@ enum imx290_clk_index {
@@ -443842,7 +443857,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 35 insertions(+)
 
 diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c
-index ea0559e8dcc95..df1ad9ac509fa 100644
+index ea0559e8dcc9..df1ad9ac509f 100644
 --- a/drivers/media/i2c/imx290.c
 +++ b/drivers/media/i2c/imx290.c
 @@ -45,6 +45,10 @@ enum imx290_clk_index {
@@ -443944,7 +443959,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 22 insertions(+)
 
 diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c
-index df1ad9ac509fa..246c4b1495983 100644
+index df1ad9ac509f..246c4b149598 100644
 --- a/drivers/media/i2c/imx290.c
 +++ b/drivers/media/i2c/imx290.c
 @@ -34,6 +34,7 @@ enum imx290_clk_index {
@@ -444032,7 +444047,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 4 insertions(+), 3 deletions(-)
 
 diff --git a/Documentation/devicetree/bindings/media/i2c/imx290.txt b/Documentation/devicetree/bindings/media/i2c/imx290.txt
-index a3cc21410f7c6..294e63650d9e3 100644
+index a3cc21410f7c..294e63650d9e 100644
 --- a/Documentation/devicetree/bindings/media/i2c/imx290.txt
 +++ b/Documentation/devicetree/bindings/media/i2c/imx290.txt
 @@ -1,13 +1,14 @@
@@ -444074,7 +444089,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 41 insertions(+), 17 deletions(-)
 
 diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c
-index 246c4b1495983..a6c5d9ce709f6 100644
+index 246c4b149598..a6c5d9ce709f 100644
 --- a/drivers/media/i2c/imx290.c
 +++ b/drivers/media/i2c/imx290.c
 @@ -1,10 +1,12 @@
@@ -444266,7 +444281,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 4 insertions(+), 11 deletions(-)
 
 diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c
-index a6c5d9ce709f6..9431c2b917ed5 100644
+index a6c5d9ce709f..9431c2b917ed 100644
 --- a/drivers/media/i2c/imx290.c
 +++ b/drivers/media/i2c/imx290.c
 @@ -568,19 +568,12 @@ static int imx290_set_hmax(struct imx290 *imx290, u32 val)
@@ -444316,7 +444331,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  create mode 100644 arch/arm/boot/dts/overlays/imx290_327-overlay.dtsi
 
 diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile
-index 52fd4e6840870..25f3ee2e1accc 100644
+index 52fd4e684087..25f3ee2e1acc 100644
 --- a/arch/arm/boot/dts/overlays/Makefile
 +++ b/arch/arm/boot/dts/overlays/Makefile
 @@ -85,6 +85,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
@@ -444328,7 +444343,7 @@ index 52fd4e6840870..25f3ee2e1accc 100644
  	iqaudio-codec.dtbo \
  	iqaudio-dac.dtbo \
 diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
-index 073d7dadcc95a..88d69764b8ea8 100644
+index 073d7dadcc95..88d69764b8ea 100644
 --- a/arch/arm/boot/dts/overlays/README
 +++ b/arch/arm/boot/dts/overlays/README
 @@ -1430,6 +1430,22 @@ Load:   dtoverlay=imx219
@@ -444356,7 +444371,7 @@ index 073d7dadcc95a..88d69764b8ea8 100644
          Uses Unicam 1, which is the standard camera connector on most Pi
 diff --git a/arch/arm/boot/dts/overlays/imx290-overlay.dts b/arch/arm/boot/dts/overlays/imx290-overlay.dts
 new file mode 100644
-index 0000000000000..e536aa7f9e338
+index 000000000000..e536aa7f9e33
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/imx290-overlay.dts
 @@ -0,0 +1,32 @@
@@ -444394,7 +444409,7 @@ index 0000000000000..e536aa7f9e338
 +};
 diff --git a/arch/arm/boot/dts/overlays/imx290_327-overlay.dtsi b/arch/arm/boot/dts/overlays/imx290_327-overlay.dtsi
 new file mode 100644
-index 0000000000000..8f1dadb13f6a9
+index 000000000000..8f1dadb13f6a
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/imx290_327-overlay.dtsi
 @@ -0,0 +1,145 @@
@@ -444566,7 +444581,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  5 files changed, 5 insertions(+)
 
 diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig
-index 41a34ca374a8b..80ff3a2d1085b 100644
+index 41a34ca374a8..80ff3a2d1085 100644
 --- a/arch/arm/configs/bcm2709_defconfig
 +++ b/arch/arm/configs/bcm2709_defconfig
 @@ -907,6 +907,7 @@ CONFIG_VIDEO_TW2804=m
@@ -444578,7 +444593,7 @@ index 41a34ca374a8b..80ff3a2d1085b 100644
  CONFIG_VIDEO_OV5647=m
  CONFIG_VIDEO_OV7640=m
 diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig
-index c7b9f34ceb775..60ec82bf1a115 100644
+index c7b9f34ceb77..60ec82bf1a11 100644
 --- a/arch/arm/configs/bcm2711_defconfig
 +++ b/arch/arm/configs/bcm2711_defconfig
 @@ -921,6 +921,7 @@ CONFIG_VIDEO_TW2804=m
@@ -444590,7 +444605,7 @@ index c7b9f34ceb775..60ec82bf1a115 100644
  CONFIG_VIDEO_OV5647=m
  CONFIG_VIDEO_OV7640=m
 diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig
-index 93fb7f03d31ce..fd6e2a4422fb0 100644
+index 93fb7f03d31c..fd6e2a4422fb 100644
 --- a/arch/arm/configs/bcmrpi_defconfig
 +++ b/arch/arm/configs/bcmrpi_defconfig
 @@ -896,6 +896,7 @@ CONFIG_VIDEO_TW2804=m
@@ -444602,7 +444617,7 @@ index 93fb7f03d31ce..fd6e2a4422fb0 100644
  CONFIG_VIDEO_OV5647=m
  CONFIG_VIDEO_OV7640=m
 diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig
-index 448cc2ec5c4f9..641f5fe2801b7 100644
+index 448cc2ec5c4f..641f5fe2801b 100644
 --- a/arch/arm64/configs/bcm2711_defconfig
 +++ b/arch/arm64/configs/bcm2711_defconfig
 @@ -914,6 +914,7 @@ CONFIG_VIDEO_TW2804=m
@@ -444614,7 +444629,7 @@ index 448cc2ec5c4f9..641f5fe2801b7 100644
  CONFIG_VIDEO_OV5647=m
  CONFIG_VIDEO_OV7640=m
 diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig
-index c82e163a095c3..55bf3bbbcb746 100644
+index c82e163a095c..55bf3bbbcb74 100644
 --- a/arch/arm64/configs/bcmrpi3_defconfig
 +++ b/arch/arm64/configs/bcmrpi3_defconfig
 @@ -830,6 +830,7 @@ CONFIG_VIDEO_TW2804=m
@@ -444657,7 +444672,7 @@ Signed-off-by: Dom Cobley <popcornmix@gmail.com>
  1 file changed, 2 insertions(+)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
-index 5aa5236e576da..994bcb027172d 100644
+index 5aa5236e576d..994bcb027172 100644
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
 @@ -1002,6 +1002,8 @@ static int vc4_hdmi_audio_trigger(struct snd_pcm_substream *substream, int cmd,
@@ -444689,7 +444704,7 @@ Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
  1 file changed, 55 insertions(+), 29 deletions(-)
 
 diff --git a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
-index bc86354ac4c6c..83471996a84d6 100644
+index bc86354ac4c6..83471996a84d 100644
 --- a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
 +++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
 @@ -1006,15 +1006,32 @@ static int bcm2835_isp_node_s_selection(struct file *file, void *fh,
@@ -444823,7 +444838,7 @@ Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
  1 file changed, 32 insertions(+), 16 deletions(-)
 
 diff --git a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
-index 83471996a84d6..815cf50cd07a5 100644
+index 83471996a84d..815cf50cd07a 100644
 --- a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
 +++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
 @@ -1295,21 +1295,6 @@ static int register_node(struct bcm2835_isp_dev *dev,
@@ -444921,7 +444936,7 @@ Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/include/uapi/linux/bcm2835-isp.h b/include/uapi/linux/bcm2835-isp.h
-index e7afc367fd76c..bb16dcbcb40f5 100644
+index e7afc367fd76..bb16dcbcb40f 100644
 --- a/include/uapi/linux/bcm2835-isp.h
 +++ b/include/uapi/linux/bcm2835-isp.h
 @@ -46,7 +46,7 @@
@@ -444981,7 +444996,7 @@ Signed-off-by: Maxim Mikityanskiy <maxtram95@gmail.com>
  5 files changed, 10 insertions(+), 5 deletions(-)
 
 diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig
-index 80ff3a2d1085b..78cfd48bdbaa5 100644
+index 80ff3a2d1085..78cfd48bdbaa 100644
 --- a/arch/arm/configs/bcm2709_defconfig
 +++ b/arch/arm/configs/bcm2709_defconfig
 @@ -650,7 +650,8 @@ CONFIG_SERIAL_AMBA_PL011=y
@@ -444995,7 +445010,7 @@ index 80ff3a2d1085b..78cfd48bdbaa5 100644
  CONFIG_HW_RANDOM=y
  CONFIG_RAW_DRIVER=y
 diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig
-index 60ec82bf1a115..6d4215757ab87 100644
+index 60ec82bf1a11..6d4215757ab8 100644
 --- a/arch/arm/configs/bcm2711_defconfig
 +++ b/arch/arm/configs/bcm2711_defconfig
 @@ -661,7 +661,8 @@ CONFIG_SERIAL_AMBA_PL011=y
@@ -445009,7 +445024,7 @@ index 60ec82bf1a115..6d4215757ab87 100644
  CONFIG_HW_RANDOM=y
  CONFIG_RAW_DRIVER=y
 diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig
-index fd6e2a4422fb0..b5d722f1164b4 100644
+index fd6e2a4422fb..b5d722f1164b 100644
 --- a/arch/arm/configs/bcmrpi_defconfig
 +++ b/arch/arm/configs/bcmrpi_defconfig
 @@ -640,7 +640,8 @@ CONFIG_SERIAL_AMBA_PL011=y
@@ -445023,7 +445038,7 @@ index fd6e2a4422fb0..b5d722f1164b4 100644
  CONFIG_HW_RANDOM=y
  CONFIG_RAW_DRIVER=y
 diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig
-index 641f5fe2801b7..ef61141de634b 100644
+index 641f5fe2801b..ef61141de634 100644
 --- a/arch/arm64/configs/bcm2711_defconfig
 +++ b/arch/arm64/configs/bcm2711_defconfig
 @@ -656,7 +656,8 @@ CONFIG_SERIAL_AMBA_PL011=y
@@ -445037,7 +445052,7 @@ index 641f5fe2801b7..ef61141de634b 100644
  CONFIG_HW_RANDOM=y
  CONFIG_RAW_DRIVER=y
 diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig
-index 55bf3bbbcb746..bf65e65615895 100644
+index 55bf3bbbcb74..bf65e6561589 100644
 --- a/arch/arm64/configs/bcmrpi3_defconfig
 +++ b/arch/arm64/configs/bcmrpi3_defconfig
 @@ -630,7 +630,8 @@ CONFIG_SERIAL_AMBA_PL011=y
@@ -445092,7 +445107,7 @@ Signed-off-by: Maxim Mikityanskiy <maxtram95@gmail.com>
 
 diff --git a/arch/arm/boot/dts/bcm2708-rpi-bt.dtsi b/arch/arm/boot/dts/bcm2708-rpi-bt.dtsi
 new file mode 100644
-index 0000000000000..a18f80af97d32
+index 000000000000..a18f80af97d3
 --- /dev/null
 +++ b/arch/arm/boot/dts/bcm2708-rpi-bt.dtsi
 @@ -0,0 +1,26 @@
@@ -445123,7 +445138,7 @@ index 0000000000000..a18f80af97d32
 +	};
 +};
 diff --git a/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts b/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts
-index 6ec6b88e03ced..111f61915947a 100644
+index 6ec6b88e03ce..111f61915947 100644
 --- a/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts
 +++ b/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts
 @@ -4,6 +4,7 @@
@@ -445135,7 +445150,7 @@ index 6ec6b88e03ced..111f61915947a 100644
  / {
  	compatible = "raspberrypi,model-zero-w", "brcm,bcm2835";
 diff --git a/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts b/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts
-index 3ca70650287cb..0d6a47118b83e 100644
+index 3ca70650287c..0d6a47118b83 100644
 --- a/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts
 +++ b/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts
 @@ -5,6 +5,7 @@
@@ -445147,7 +445162,7 @@ index 3ca70650287cb..0d6a47118b83e 100644
  / {
  	compatible = "raspberrypi,3-model-b-plus", "brcm,bcm2837";
 diff --git a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
-index abdf7e1c02476..e833915a7854d 100644
+index abdf7e1c0247..e833915a7854 100644
 --- a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
 +++ b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
 @@ -5,6 +5,7 @@
@@ -445159,7 +445174,7 @@ index abdf7e1c02476..e833915a7854d 100644
  / {
  	compatible = "raspberrypi,3-model-b", "brcm,bcm2837";
 diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
-index 05220fa0202b3..46475840a6da2 100644
+index 05220fa0202b..46475840a6da 100644
 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
 +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
 @@ -182,6 +182,7 @@
@@ -445181,7 +445196,7 @@ index 05220fa0202b3..46475840a6da2 100644
  &uart1 {
 diff --git a/arch/arm/boot/dts/bcm271x-rpi-bt.dtsi b/arch/arm/boot/dts/bcm271x-rpi-bt.dtsi
 new file mode 100644
-index 0000000000000..6b9b79f74cf36
+index 000000000000..6b9b79f74cf3
 --- /dev/null
 +++ b/arch/arm/boot/dts/bcm271x-rpi-bt.dtsi
 @@ -0,0 +1,26 @@
@@ -445212,7 +445227,7 @@ index 0000000000000..6b9b79f74cf36
 +	};
 +};
 diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
-index 88d69764b8ea8..500437d65c96d 100644
+index 88d69764b8ea..500437d65c96 100644
 --- a/arch/arm/boot/dts/overlays/README
 +++ b/arch/arm/boot/dts/overlays/README
 @@ -162,6 +162,13 @@ Params:
@@ -445242,7 +445257,7 @@ index 88d69764b8ea8..500437d65c96d 100644
  
  Name:   mmc
 diff --git a/arch/arm/boot/dts/overlays/disable-bt-overlay.dts b/arch/arm/boot/dts/overlays/disable-bt-overlay.dts
-index 2f1b655a133c3..d5a66e5d76a94 100644
+index 2f1b655a133c..d5a66e5d76a9 100644
 --- a/arch/arm/boot/dts/overlays/disable-bt-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/disable-bt-overlay.dts
 @@ -8,6 +8,8 @@
@@ -445287,7 +445302,7 @@ index 2f1b655a133c3..d5a66e5d76a94 100644
  		__overlay__ {
  			serial0 = "/soc/serial@7e201000";
 diff --git a/arch/arm/boot/dts/overlays/miniuart-bt-overlay.dts b/arch/arm/boot/dts/overlays/miniuart-bt-overlay.dts
-index 30d3d8549da0a..44d8e10ef735c 100644
+index 30d3d8549da0..44d8e10ef735 100644
 --- a/arch/arm/boot/dts/overlays/miniuart-bt-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/miniuart-bt-overlay.dts
 @@ -15,6 +15,8 @@
@@ -445378,7 +445393,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
-index 25a1f066e62c5..ab794eec6afef 100644
+index 25a1f066e62c..ab794eec6afe 100644
 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 @@ -936,6 +936,9 @@ static void vc4_crtc_mode_set_nofb(struct drm_crtc *crtc)
@@ -445417,7 +445432,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  1 file changed, 7 insertions(+)
 
 diff --git a/drivers/tty/serial/8250/8250_bcm2835aux.c b/drivers/tty/serial/8250/8250_bcm2835aux.c
-index 33da68341c3a7..8102ad9d04ead 100644
+index 33da68341c3a..8102ad9d04ea 100644
 --- a/drivers/tty/serial/8250/8250_bcm2835aux.c
 +++ b/drivers/tty/serial/8250/8250_bcm2835aux.c
 @@ -92,6 +92,13 @@ static int bcm2835aux_serial_probe(struct platform_device *pdev)
@@ -445470,7 +445485,7 @@ Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
  create mode 100644 Documentation/media/uapi/v4l/pixfmt-srggb14.rst
 
 diff --git a/Documentation/media/uapi/v4l/pixfmt-bayer.rst b/Documentation/media/uapi/v4l/pixfmt-bayer.rst
-index cfa2f4e3e1142..807ab34ba93bb 100644
+index cfa2f4e3e114..807ab34ba93b 100644
 --- a/Documentation/media/uapi/v4l/pixfmt-bayer.rst
 +++ b/Documentation/media/uapi/v4l/pixfmt-bayer.rst
 @@ -34,5 +34,6 @@ orders. See also `the Wikipedia article on Bayer filter
@@ -445482,7 +445497,7 @@ index cfa2f4e3e1142..807ab34ba93bb 100644
      pixfmt-srggb16
 diff --git a/Documentation/media/uapi/v4l/pixfmt-srggb14.rst b/Documentation/media/uapi/v4l/pixfmt-srggb14.rst
 new file mode 100644
-index 0000000000000..3420d4d1825e4
+index 000000000000..3420d4d1825e
 --- /dev/null
 +++ b/Documentation/media/uapi/v4l/pixfmt-srggb14.rst
 @@ -0,0 +1,82 @@
@@ -445569,7 +445584,7 @@ index 0000000000000..3420d4d1825e4
 +      - R\ :sub:`33low`
 +      - R\ :sub:`33high`
 diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
-index 27370a6cd75f2..9dd866f420c59 100644
+index 27370a6cd75f..9dd866f420c5 100644
 --- a/drivers/media/v4l2-core/v4l2-ioctl.c
 +++ b/drivers/media/v4l2-core/v4l2-ioctl.c
 @@ -1298,6 +1298,10 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt)
@@ -445584,7 +445599,7 @@ index 27370a6cd75f2..9dd866f420c59 100644
  	case V4L2_PIX_FMT_SGBRG14P:	descr = "14-bit Bayer GBGB/RGRG Packed"; break;
  	case V4L2_PIX_FMT_SGRBG14P:	descr = "14-bit Bayer GRGR/BGBG Packed"; break;
 diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
-index 10e146cd092aa..20bbc3e601189 100644
+index 10e146cd092a..20bbc3e60118 100644
 --- a/include/uapi/linux/videodev2.h
 +++ b/include/uapi/linux/videodev2.h
 @@ -666,6 +666,10 @@ struct v4l2_pix_format {
@@ -445630,7 +445645,7 @@ Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
 
 diff --git a/Documentation/media/uapi/v4l/pixfmt-y14.rst b/Documentation/media/uapi/v4l/pixfmt-y14.rst
 new file mode 100644
-index 0000000000000..5c260f8da0882
+index 000000000000..5c260f8da088
 --- /dev/null
 +++ b/Documentation/media/uapi/v4l/pixfmt-y14.rst
 @@ -0,0 +1,72 @@
@@ -445707,7 +445722,7 @@ index 0000000000000..5c260f8da0882
 +      - Y'\ :sub:`33low`
 +      - Y'\ :sub:`33high`
 diff --git a/Documentation/media/uapi/v4l/yuv-formats.rst b/Documentation/media/uapi/v4l/yuv-formats.rst
-index 962f5c367ebcd..d3017026ec7b2 100644
+index 962f5c367ebc..d3017026ec7b 100644
 --- a/Documentation/media/uapi/v4l/yuv-formats.rst
 +++ b/Documentation/media/uapi/v4l/yuv-formats.rst
 @@ -35,6 +35,7 @@ to brightness information.
@@ -445719,7 +445734,7 @@ index 962f5c367ebcd..d3017026ec7b2 100644
      pixfmt-y10p
      pixfmt-y16
 diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
-index 9dd866f420c59..5848b22cdf976 100644
+index 9dd866f420c5..5848b22cdf97 100644
 --- a/drivers/media/v4l2-core/v4l2-ioctl.c
 +++ b/drivers/media/v4l2-core/v4l2-ioctl.c
 @@ -1212,6 +1212,7 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt)
@@ -445731,7 +445746,7 @@ index 9dd866f420c59..5848b22cdf976 100644
  	case V4L2_PIX_FMT_Y16_BE:	descr = "16-bit Greyscale BE"; break;
  	case V4L2_PIX_FMT_Y10BPACK:	descr = "10-bit Greyscale (Packed)"; break;
 diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
-index 20bbc3e601189..a4fd05446c627 100644
+index 20bbc3e60118..a4fd05446c62 100644
 --- a/include/uapi/linux/videodev2.h
 +++ b/include/uapi/linux/videodev2.h
 @@ -569,6 +569,7 @@ struct v4l2_pix_format {
@@ -445770,7 +445785,7 @@ Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
  2 files changed, 39 insertions(+), 1 deletion(-)
 
 diff --git a/Documentation/media/uapi/v4l/subdev-formats.rst b/Documentation/media/uapi/v4l/subdev-formats.rst
-index 42870bd65de17..e79caa61b9ced 100644
+index 42870bd65de1..e79caa61b9ce 100644
 --- a/Documentation/media/uapi/v4l/subdev-formats.rst
 +++ b/Documentation/media/uapi/v4l/subdev-formats.rst
 @@ -5792,6 +5792,43 @@ the following codes.
@@ -445818,7 +445833,7 @@ index 42870bd65de17..e79caa61b9ced 100644
  
        - MEDIA_BUS_FMT_UYVY8_1X16
 diff --git a/include/uapi/linux/media-bus-format.h b/include/uapi/linux/media-bus-format.h
-index 4b5e2a71dfec3..3c2848e91c1b2 100644
+index 4b5e2a71dfec..3c2848e91c1b 100644
 --- a/include/uapi/linux/media-bus-format.h
 +++ b/include/uapi/linux/media-bus-format.h
 @@ -64,7 +64,7 @@
@@ -445861,7 +445876,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
 
 diff --git a/Documentation/media/uapi/v4l/pixfmt-y12p.rst b/Documentation/media/uapi/v4l/pixfmt-y12p.rst
 new file mode 100644
-index 0000000000000..3704f9180fd77
+index 000000000000..3704f9180fd7
 --- /dev/null
 +++ b/Documentation/media/uapi/v4l/pixfmt-y12p.rst
 @@ -0,0 +1,45 @@
@@ -445911,7 +445926,7 @@ index 0000000000000..3704f9180fd77
 +          Y'\ :sub:`00low`\ (bits 3--0)
 +
 diff --git a/Documentation/media/uapi/v4l/yuv-formats.rst b/Documentation/media/uapi/v4l/yuv-formats.rst
-index d3017026ec7b2..37f0dabf71747 100644
+index d3017026ec7b..37f0dabf7174 100644
 --- a/Documentation/media/uapi/v4l/yuv-formats.rst
 +++ b/Documentation/media/uapi/v4l/yuv-formats.rst
 @@ -35,6 +35,7 @@ to brightness information.
@@ -445923,7 +445938,7 @@ index d3017026ec7b2..37f0dabf71747 100644
      pixfmt-y10b
      pixfmt-y10p
 diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
-index 5848b22cdf976..1a4c428c038b8 100644
+index 5848b22cdf97..1a4c428c038b 100644
 --- a/drivers/media/v4l2-core/v4l2-ioctl.c
 +++ b/drivers/media/v4l2-core/v4l2-ioctl.c
 @@ -1217,6 +1217,7 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt)
@@ -445935,7 +445950,7 @@ index 5848b22cdf976..1a4c428c038b8 100644
  	case V4L2_PIX_FMT_Y12I:		descr = "Interleaved 12-bit Greyscale"; break;
  	case V4L2_PIX_FMT_Z16:		descr = "16-bit Depth"; break;
 diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
-index a4fd05446c627..cd055346095bc 100644
+index a4fd05446c62..cd055346095b 100644
 --- a/include/uapi/linux/videodev2.h
 +++ b/include/uapi/linux/videodev2.h
 @@ -576,6 +576,7 @@ struct v4l2_pix_format {
@@ -445969,7 +445984,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
 
 diff --git a/Documentation/media/uapi/v4l/pixfmt-y14p.rst b/Documentation/media/uapi/v4l/pixfmt-y14p.rst
 new file mode 100644
-index 0000000000000..27fe14c9a9ebd
+index 000000000000..27fe14c9a9eb
 --- /dev/null
 +++ b/Documentation/media/uapi/v4l/pixfmt-y14p.rst
 @@ -0,0 +1,54 @@
@@ -446028,7 +446043,7 @@ index 0000000000000..27fe14c9a9ebd
 +
 +	  Y'\ :sub:`02low bits 5--4`\ (bits 1--0)
 diff --git a/Documentation/media/uapi/v4l/yuv-formats.rst b/Documentation/media/uapi/v4l/yuv-formats.rst
-index 37f0dabf71747..04315eb60c64a 100644
+index 37f0dabf7174..04315eb60c64 100644
 --- a/Documentation/media/uapi/v4l/yuv-formats.rst
 +++ b/Documentation/media/uapi/v4l/yuv-formats.rst
 @@ -37,6 +37,7 @@ to brightness information.
@@ -446040,7 +446055,7 @@ index 37f0dabf71747..04315eb60c64a 100644
      pixfmt-y10p
      pixfmt-y16
 diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
-index 1a4c428c038b8..32b28235d32be 100644
+index 1a4c428c038b..32b28235d32b 100644
 --- a/drivers/media/v4l2-core/v4l2-ioctl.c
 +++ b/drivers/media/v4l2-core/v4l2-ioctl.c
 @@ -1218,6 +1218,7 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt)
@@ -446052,7 +446067,7 @@ index 1a4c428c038b8..32b28235d32be 100644
  	case V4L2_PIX_FMT_Y12I:		descr = "Interleaved 12-bit Greyscale"; break;
  	case V4L2_PIX_FMT_Z16:		descr = "16-bit Depth"; break;
 diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
-index cd055346095bc..8020c483ea3cb 100644
+index cd055346095b..8020c483ea3c 100644
 --- a/include/uapi/linux/videodev2.h
 +++ b/include/uapi/linux/videodev2.h
 @@ -577,6 +577,7 @@ struct v4l2_pix_format {
@@ -446082,7 +446097,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  2 files changed, 43 insertions(+)
 
 diff --git a/drivers/staging/vc04_services/bcm2835-isp/bcm2835_isp_fmts.h b/drivers/staging/vc04_services/bcm2835-isp/bcm2835_isp_fmts.h
-index 40ca0f6e9c979..f590c20315dd5 100644
+index 40ca0f6e9c97..f590c20315dd 100644
 --- a/drivers/staging/vc04_services/bcm2835-isp/bcm2835_isp_fmts.h
 +++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835_isp_fmts.h
 @@ -253,6 +253,43 @@ static const struct bcm2835_isp_fmt supported_formats[] = {
@@ -446130,7 +446145,7 @@ index 40ca0f6e9c979..f590c20315dd5 100644
  		/* 16 bit */
  		.fourcc		    = V4L2_PIX_FMT_SRGGB16,
 diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-encodings.h b/drivers/staging/vc04_services/vchiq-mmal/mmal-encodings.h
-index 8d904fcce3889..4288d50a7e6b6 100644
+index 8d904fcce388..4288d50a7e6b 100644
 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-encodings.h
 +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-encodings.h
 @@ -90,6 +90,12 @@
@@ -446166,7 +446181,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  2 files changed, 58 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/staging/vc04_services/bcm2835-isp/bcm2835_isp_fmts.h b/drivers/staging/vc04_services/bcm2835-isp/bcm2835_isp_fmts.h
-index f590c20315dd5..fc0f95a3677de 100644
+index f590c20315dd..fc0f95a3677d 100644
 --- a/drivers/staging/vc04_services/bcm2835-isp/bcm2835_isp_fmts.h
 +++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835_isp_fmts.h
 @@ -328,7 +328,57 @@ static const struct bcm2835_isp_fmt supported_formats[] = {
@@ -446229,7 +446244,7 @@ index f590c20315dd5..fc0f95a3677de 100644
  		.mmal_fmt	    = MMAL_ENCODING_BRCM_STATS,
  		/* The rest are not valid fields for stats. */
 diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-encodings.h b/drivers/staging/vc04_services/vchiq-mmal/mmal-encodings.h
-index 4288d50a7e6b6..8eb6334ee0557 100644
+index 4288d50a7e6b..8eb6334ee055 100644
 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-encodings.h
 +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-encodings.h
 @@ -102,6 +102,13 @@
@@ -446265,7 +446280,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
-index 815cf50cd07a5..424e7e6da1d6f 100644
+index 815cf50cd07a..424e7e6da1d6 100644
 --- a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
 +++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
 @@ -1134,10 +1134,10 @@ static const struct v4l2_ioctl_ops bcm2835_isp_node_ioctl_ops = {
@@ -446300,7 +446315,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-index 1c7fbba6c9c85..2391d589f1702 100644
+index 1c7fbba6c9c8..2391d589f170 100644
 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 @@ -2569,10 +2569,10 @@ static const struct v4l2_m2m_ops m2m_ops = {
@@ -446335,7 +446350,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 41 insertions(+)
 
 diff --git a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-index 2391d589f1702..b9415f3cdb76f 100644
+index 2391d589f170..b9415f3cdb76 100644
 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 @@ -343,6 +343,47 @@ static const struct bcm2835_codec_fmt supported_formats[] = {
@@ -446405,7 +446420,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 34 insertions(+)
 
 diff --git a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-index b9415f3cdb76f..3fe81979aaa16 100644
+index b9415f3cdb76..3fe81979aaa1 100644
 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 @@ -310,6 +310,40 @@ static const struct bcm2835_codec_fmt supported_formats[] = {
@@ -446468,7 +446483,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-index f70167d271fe6..104f4d0f9f057 100644
+index f70167d271fe..104f4d0f9f05 100644
 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
 +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
 @@ -336,7 +336,7 @@ static const struct unicam_fmt formats[] = {
@@ -446499,7 +446514,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 6 insertions(+)
 
 diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-index 104f4d0f9f057..799bea3d4f41b 100644
+index 104f4d0f9f05..799bea3d4f41 100644
 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
 +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
 @@ -341,6 +341,12 @@ static const struct unicam_fmt formats[] = {
@@ -446534,7 +446549,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 4 insertions(+)
 
 diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-index 799bea3d4f41b..3b082587dd14d 100644
+index 799bea3d4f41..3b082587dd14 100644
 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
 +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
 @@ -299,21 +299,25 @@ static const struct unicam_fmt formats[] = {
@@ -446583,7 +446598,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  1 file changed, 7 insertions(+), 1 deletion(-)
 
 diff --git a/arch/arm/boot/dts/overlays/miniuart-bt-overlay.dts b/arch/arm/boot/dts/overlays/miniuart-bt-overlay.dts
-index 44d8e10ef735c..da49f14a09401 100644
+index 44d8e10ef735..da49f14a0940 100644
 --- a/arch/arm/boot/dts/overlays/miniuart-bt-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/miniuart-bt-overlay.dts
 @@ -81,7 +81,13 @@
@@ -446626,7 +446641,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 10 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
-index ab794eec6afef..a173ca430db4d 100644
+index ab794eec6afe..a173ca430db4 100644
 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 @@ -14,6 +14,8 @@
@@ -446683,7 +446698,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 21 insertions(+)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
-index a173ca430db4d..ff726486c7855 100644
+index a173ca430db4..ff726486c785 100644
 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 @@ -44,6 +44,7 @@ struct get_display_cfg {
@@ -446758,7 +446773,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  2 files changed, 8 insertions(+)
 
 diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
-index 46475840a6da2..9b8a3ce831bb1 100644
+index 46475840a6da..9b8a3ce831bb 100644
 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
 +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
 @@ -443,6 +443,10 @@
@@ -446773,7 +446788,7 @@ index 46475840a6da2..9b8a3ce831bb1 100644
  // Board specific stuff here
  
 diff --git a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
-index c42fa2aa5ef23..ce3edc2cda7d4 100644
+index c42fa2aa5ef2..ce3edc2cda7d 100644
 --- a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
 +++ b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
 @@ -461,6 +461,10 @@
@@ -446806,7 +446821,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 15 insertions(+), 14 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
-index ff726486c7855..ec5c223033c8d 100644
+index ff726486c785..ec5c223033c8 100644
 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 @@ -14,25 +14,26 @@
@@ -446902,7 +446917,7 @@ Link: https://lore.kernel.org/r/f97868ba4e9b86ddad71f44ec9d8b3b7d8daa1ea.1582618
  1 file changed, 17 insertions(+), 4 deletions(-)
 
 diff --git a/drivers/irqchip/irq-bcm2835.c b/drivers/irqchip/irq-bcm2835.c
-index 40c1b38d5db5c..be181d4aeccae 100644
+index 40c1b38d5db5..be181d4aecca 100644
 --- a/drivers/irqchip/irq-bcm2835.c
 +++ b/drivers/irqchip/irq-bcm2835.c
 @@ -67,8 +67,7 @@
@@ -446984,7 +446999,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  2 files changed, 5 insertions(+)
 
 diff --git a/arch/arm/boot/dts/overlays/imx219-overlay.dts b/arch/arm/boot/dts/overlays/imx219-overlay.dts
-index 7cdafdc3db1bd..3c2d3fac93d21 100644
+index 7cdafdc3db1b..3c2d3fac93d2 100644
 --- a/arch/arm/boot/dts/overlays/imx219-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/imx219-overlay.dts
 @@ -49,6 +49,9 @@
@@ -446998,7 +447013,7 @@ index 7cdafdc3db1bd..3c2d3fac93d21 100644
  			};
  		};
 diff --git a/arch/arm/boot/dts/overlays/imx477-overlay.dts b/arch/arm/boot/dts/overlays/imx477-overlay.dts
-index bd187713939e1..73d4f79d54e6f 100644
+index bd187713939e..73d4f79d54e6 100644
 --- a/arch/arm/boot/dts/overlays/imx477-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/imx477-overlay.dts
 @@ -49,7 +49,9 @@
@@ -447029,7 +447044,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/arch/arm/boot/dts/overlays/rpi-ft5406-overlay.dts b/arch/arm/boot/dts/overlays/rpi-ft5406-overlay.dts
-index 4dcb490f04b6f..8483c4f4b2eb2 100644
+index 4dcb490f04b6..8483c4f4b2eb 100644
 --- a/arch/arm/boot/dts/overlays/rpi-ft5406-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/rpi-ft5406-overlay.dts
 @@ -18,8 +18,8 @@
@@ -447063,7 +447078,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  5 files changed, 5 deletions(-)
 
 diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig
-index 78cfd48bdbaa5..21051cbfbe8ee 100644
+index 78cfd48bdbaa..21051cbfbe8e 100644
 --- a/arch/arm/configs/bcm2709_defconfig
 +++ b/arch/arm/configs/bcm2709_defconfig
 @@ -651,7 +651,6 @@ CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
@@ -447075,7 +447090,7 @@ index 78cfd48bdbaa5..21051cbfbe8ee 100644
  CONFIG_HW_RANDOM=y
  CONFIG_RAW_DRIVER=y
 diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig
-index 6d4215757ab87..cae30e908ee7f 100644
+index 6d4215757ab8..cae30e908ee7 100644
 --- a/arch/arm/configs/bcm2711_defconfig
 +++ b/arch/arm/configs/bcm2711_defconfig
 @@ -662,7 +662,6 @@ CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
@@ -447087,7 +447102,7 @@ index 6d4215757ab87..cae30e908ee7f 100644
  CONFIG_HW_RANDOM=y
  CONFIG_RAW_DRIVER=y
 diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig
-index b5d722f1164b4..3c258e9510748 100644
+index b5d722f1164b..3c258e951074 100644
 --- a/arch/arm/configs/bcmrpi_defconfig
 +++ b/arch/arm/configs/bcmrpi_defconfig
 @@ -641,7 +641,6 @@ CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
@@ -447099,7 +447114,7 @@ index b5d722f1164b4..3c258e9510748 100644
  CONFIG_HW_RANDOM=y
  CONFIG_RAW_DRIVER=y
 diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig
-index ef61141de634b..9656ca9f53167 100644
+index ef61141de634..9656ca9f5316 100644
 --- a/arch/arm64/configs/bcm2711_defconfig
 +++ b/arch/arm64/configs/bcm2711_defconfig
 @@ -657,7 +657,6 @@ CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
@@ -447111,7 +447126,7 @@ index ef61141de634b..9656ca9f53167 100644
  CONFIG_HW_RANDOM=y
  CONFIG_RAW_DRIVER=y
 diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig
-index bf65e65615895..99ed08604d569 100644
+index bf65e6561589..99ed08604d56 100644
 --- a/arch/arm64/configs/bcmrpi3_defconfig
 +++ b/arch/arm64/configs/bcmrpi3_defconfig
 @@ -631,7 +631,6 @@ CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
@@ -447137,7 +447152,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  1 file changed, 1 insertion(+), 2 deletions(-)
 
 diff --git a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
-index ce3edc2cda7d4..d5d62245f73c3 100644
+index ce3edc2cda7d..d5d62245f73c 100644
 --- a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
 +++ b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
 @@ -194,6 +194,7 @@
@@ -447179,7 +447194,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  4 files changed, 245 insertions(+), 273 deletions(-)
 
 diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
-index 9b8a3ce831bb1..21b20e334b1a7 100644
+index 9b8a3ce831bb..21b20e334b1a 100644
 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
 +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
 @@ -19,7 +19,9 @@
@@ -447376,7 +447391,7 @@ index 9b8a3ce831bb1..21b20e334b1a7 100644
  			   <&spi0>, "dmas:8=", <&dma40>;
  	};
 diff --git a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
-index d5d62245f73c3..d4ea928e30ce6 100644
+index d5d62245f73c..d4ea928e30ce 100644
 --- a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
 +++ b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
 @@ -19,7 +19,9 @@
@@ -447493,7 +447508,7 @@ index d5d62245f73c3..d4ea928e30ce6 100644
  			   <&spi0>, "dmas:8=", <&dma40>;
  	};
 diff --git a/arch/arm/boot/dts/bcm2711-rpi.dtsi b/arch/arm/boot/dts/bcm2711-rpi.dtsi
-index 7fd09353740af..e8c6a0dfc9f70 100644
+index 7fd09353740a..e8c6a0dfc9f7 100644
 --- a/arch/arm/boot/dts/bcm2711-rpi.dtsi
 +++ b/arch/arm/boot/dts/bcm2711-rpi.dtsi
 @@ -4,6 +4,129 @@
@@ -447678,7 +447693,7 @@ index 7fd09353740af..e8c6a0dfc9f70 100644
  	firmware_clocks: clocks {
  		compatible = "raspberrypi,firmware-clocks";
 diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi
-index 4b98dba51e59b..4f87bb4fd3d1e 100644
+index 4b98dba51e59..4f87bb4fd3d1 100644
 --- a/arch/arm/boot/dts/bcm2711.dtsi
 +++ b/arch/arm/boot/dts/bcm2711.dtsi
 @@ -12,18 +12,6 @@
@@ -447883,7 +447898,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  1 file changed, 8 insertions(+), 3 deletions(-)
 
 diff --git a/drivers/dma/bcm2835-dma.c b/drivers/dma/bcm2835-dma.c
-index 53346d7eb66c4..9fec52489421a 100644
+index 53346d7eb66c..9fec52489421 100644
 --- a/drivers/dma/bcm2835-dma.c
 +++ b/drivers/dma/bcm2835-dma.c
 @@ -167,6 +167,11 @@ struct bcm2835_desc {
@@ -447942,7 +447957,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/arch/arm/boot/dts/bcm2711-rpi.dtsi b/arch/arm/boot/dts/bcm2711-rpi.dtsi
-index e8c6a0dfc9f70..4a3659d21997b 100644
+index e8c6a0dfc9f7..4a3659d21997 100644
 --- a/arch/arm/boot/dts/bcm2711-rpi.dtsi
 +++ b/arch/arm/boot/dts/bcm2711-rpi.dtsi
 @@ -191,7 +191,8 @@
@@ -447973,7 +447988,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  2 files changed, 2 insertions(+)
 
 diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig
-index cae30e908ee7f..18fc77ae0aeef 100644
+index cae30e908ee7..18fc77ae0aee 100644
 --- a/arch/arm/configs/bcm2711_defconfig
 +++ b/arch/arm/configs/bcm2711_defconfig
 @@ -462,6 +462,7 @@ CONFIG_BLK_DEV_NBD=m
@@ -447985,7 +448000,7 @@ index cae30e908ee7f..18fc77ae0aeef 100644
  CONFIG_TI_ST=m
  CONFIG_SCSI=y
 diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig
-index 9656ca9f53167..656068a1bbb8c 100644
+index 9656ca9f5316..656068a1bbb8 100644
 --- a/arch/arm64/configs/bcm2711_defconfig
 +++ b/arch/arm64/configs/bcm2711_defconfig
 @@ -458,6 +458,7 @@ CONFIG_BLK_DEV_NBD=m
@@ -448015,7 +448030,7 @@ Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
  create mode 100644 drivers/media/i2c/ov9281.c
 
 diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig
-index 8e5e037f30df9..499fd08b2a404 100644
+index 8e5e037f30df..499fd08b2a40 100644
 --- a/drivers/media/i2c/Kconfig
 +++ b/drivers/media/i2c/Kconfig
 @@ -855,6 +855,17 @@ config VIDEO_OV9640
@@ -448037,7 +448052,7 @@ index 8e5e037f30df9..499fd08b2a404 100644
  	tristate "OmniVision OV9650/OV9652 sensor support"
  	depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API
 diff --git a/drivers/media/i2c/Makefile b/drivers/media/i2c/Makefile
-index 2d55801afdc6c..9aaf6f2bd87e1 100644
+index 2d55801afdc6..9aaf6f2bd87e 100644
 --- a/drivers/media/i2c/Makefile
 +++ b/drivers/media/i2c/Makefile
 @@ -79,6 +79,7 @@ obj-$(CONFIG_VIDEO_OV7670) += ov7670.o
@@ -448050,7 +448065,7 @@ index 2d55801afdc6c..9aaf6f2bd87e1 100644
  obj-$(CONFIG_VIDEO_OV13858) += ov13858.o
 diff --git a/drivers/media/i2c/ov9281.c b/drivers/media/i2c/ov9281.c
 new file mode 100644
-index 0000000000000..4a6324a3e5da2
+index 000000000000..4a6324a3e5da
 --- /dev/null
 +++ b/drivers/media/i2c/ov9281.c
 @@ -0,0 +1,1171 @@
@@ -449244,7 +449259,7 @@ Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
  1 file changed, 8 insertions(+), 8 deletions(-)
 
 diff --git a/drivers/media/i2c/ov9281.c b/drivers/media/i2c/ov9281.c
-index 4a6324a3e5da2..0d6759942f793 100644
+index 4a6324a3e5da..0d6759942f79 100644
 --- a/drivers/media/i2c/ov9281.c
 +++ b/drivers/media/i2c/ov9281.c
 @@ -3,6 +3,7 @@
@@ -449311,7 +449326,7 @@ Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
  1 file changed, 26 insertions(+), 5 deletions(-)
 
 diff --git a/drivers/media/i2c/ov9281.c b/drivers/media/i2c/ov9281.c
-index 0d6759942f793..273aa904683cd 100644
+index 0d6759942f79..273aa904683c 100644
 --- a/drivers/media/i2c/ov9281.c
 +++ b/drivers/media/i2c/ov9281.c
 @@ -4,6 +4,7 @@
@@ -449417,7 +449432,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  2 files changed, 123 insertions(+), 240 deletions(-)
 
 diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig
-index 499fd08b2a404..0a0973b5f55d1 100644
+index 499fd08b2a40..0a0973b5f55d 100644
 --- a/drivers/media/i2c/Kconfig
 +++ b/drivers/media/i2c/Kconfig
 @@ -857,7 +857,7 @@ config VIDEO_OV9640
@@ -449430,7 +449445,7 @@ index 499fd08b2a404..0a0973b5f55d1 100644
  	help
  	  This is a Video4Linux2 sensor-level driver for the OmniVision
 diff --git a/drivers/media/i2c/ov9281.c b/drivers/media/i2c/ov9281.c
-index 273aa904683cd..7b9bea476cfb4 100644
+index 273aa904683c..7b9bea476cfb 100644
 --- a/drivers/media/i2c/ov9281.c
 +++ b/drivers/media/i2c/ov9281.c
 @@ -1,6 +1,11 @@
@@ -450113,7 +450128,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 9 insertions(+), 5 deletions(-)
 
 diff --git a/drivers/media/i2c/ov9281.c b/drivers/media/i2c/ov9281.c
-index 7b9bea476cfb4..bb8efc3d3cba8 100644
+index 7b9bea476cfb..bb8efc3d3cba 100644
 --- a/drivers/media/i2c/ov9281.c
 +++ b/drivers/media/i2c/ov9281.c
 @@ -904,13 +904,17 @@ static int ov9281_check_sensor_id(struct ov9281 *ov9281,
@@ -450161,7 +450176,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  create mode 100644 arch/arm/boot/dts/overlays/ov9281-overlay.dts
 
 diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile
-index 25f3ee2e1accc..e7db9daa89694 100644
+index 25f3ee2e1acc..e7db9daa8969 100644
 --- a/arch/arm/boot/dts/overlays/Makefile
 +++ b/arch/arm/boot/dts/overlays/Makefile
 @@ -115,6 +115,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
@@ -450173,7 +450188,7 @@ index 25f3ee2e1accc..e7db9daa89694 100644
  	pibell.dtbo \
  	piglow.dtbo \
 diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
-index 500437d65c96d..4a3f201d185a5 100644
+index 500437d65c96..4a3f201d185a 100644
 --- a/arch/arm/boot/dts/overlays/README
 +++ b/arch/arm/boot/dts/overlays/README
 @@ -1813,6 +1813,14 @@ Load:   dtoverlay=ov5647
@@ -450193,7 +450208,7 @@ index 500437d65c96d..4a3f201d185a5 100644
  Load:   dtoverlay=papirus,<param>=<val>
 diff --git a/arch/arm/boot/dts/overlays/ov9281-overlay.dts b/arch/arm/boot/dts/overlays/ov9281-overlay.dts
 new file mode 100644
-index 0000000000000..4411c9d965646
+index 000000000000..4411c9d96564
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/ov9281-overlay.dts
 @@ -0,0 +1,110 @@
@@ -450328,7 +450343,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  5 files changed, 5 insertions(+)
 
 diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig
-index 21051cbfbe8ee..8269ac84d6fd3 100644
+index 21051cbfbe8e..8269ac84d6fd 100644
 --- a/arch/arm/configs/bcm2709_defconfig
 +++ b/arch/arm/configs/bcm2709_defconfig
 @@ -911,6 +911,7 @@ CONFIG_VIDEO_IMX290=m
@@ -450340,7 +450355,7 @@ index 21051cbfbe8ee..8269ac84d6fd3 100644
  CONFIG_VIDEO_MT9V011=m
  CONFIG_DRM=m
 diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig
-index 18fc77ae0aeef..d332041fffe60 100644
+index 18fc77ae0aee..d332041fffe6 100644
 --- a/arch/arm/configs/bcm2711_defconfig
 +++ b/arch/arm/configs/bcm2711_defconfig
 @@ -926,6 +926,7 @@ CONFIG_VIDEO_IMX290=m
@@ -450352,7 +450367,7 @@ index 18fc77ae0aeef..d332041fffe60 100644
  CONFIG_VIDEO_MT9V011=m
  CONFIG_DRM=m
 diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig
-index 3c258e9510748..1148f84893ed8 100644
+index 3c258e951074..1148f84893ed 100644
 --- a/arch/arm/configs/bcmrpi_defconfig
 +++ b/arch/arm/configs/bcmrpi_defconfig
 @@ -900,6 +900,7 @@ CONFIG_VIDEO_IMX290=m
@@ -450364,7 +450379,7 @@ index 3c258e9510748..1148f84893ed8 100644
  CONFIG_VIDEO_MT9V011=m
  CONFIG_DRM=m
 diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig
-index 656068a1bbb8c..59bf96c985fa6 100644
+index 656068a1bbb8..59bf96c985fa 100644
 --- a/arch/arm64/configs/bcm2711_defconfig
 +++ b/arch/arm64/configs/bcm2711_defconfig
 @@ -919,6 +919,7 @@ CONFIG_VIDEO_IMX290=m
@@ -450376,7 +450391,7 @@ index 656068a1bbb8c..59bf96c985fa6 100644
  CONFIG_VIDEO_MT9V011=m
  CONFIG_DRM=m
 diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig
-index 99ed08604d569..e238f963d1724 100644
+index 99ed08604d56..e238f963d172 100644
 --- a/arch/arm64/configs/bcmrpi3_defconfig
 +++ b/arch/arm64/configs/bcmrpi3_defconfig
 @@ -834,6 +834,7 @@ CONFIG_VIDEO_IMX290=m
@@ -450411,7 +450426,7 @@ Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
  1 file changed, 2 insertions(+)
 
 diff --git a/drivers/bluetooth/hci_bcm.c b/drivers/bluetooth/hci_bcm.c
-index 94ed734c1d7eb..f204ae626c693 100644
+index 94ed734c1d7e..f204ae626c69 100644
 --- a/drivers/bluetooth/hci_bcm.c
 +++ b/drivers/bluetooth/hci_bcm.c
 @@ -448,9 +448,11 @@ static int bcm_open(struct hci_uart *hu)
@@ -450449,7 +450464,7 @@ Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
  1 file changed, 1 insertion(+)
 
 diff --git a/drivers/bluetooth/hci_bcm.c b/drivers/bluetooth/hci_bcm.c
-index f204ae626c693..31943895b22e6 100644
+index f204ae626c69..31943895b22e 100644
 --- a/drivers/bluetooth/hci_bcm.c
 +++ b/drivers/bluetooth/hci_bcm.c
 @@ -1427,6 +1427,7 @@ static const struct of_device_id bcm_bluetooth_of_match[] = {
@@ -450503,7 +450518,7 @@ Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
  2 files changed, 2 insertions(+)
 
 diff --git a/drivers/bluetooth/btbcm.c b/drivers/bluetooth/btbcm.c
-index dd29d687cd380..15b7cafde0f7b 100644
+index dd29d687cd38..15b7cafde0f7 100644
 --- a/drivers/bluetooth/btbcm.c
 +++ b/drivers/bluetooth/btbcm.c
 @@ -340,6 +340,7 @@ static const struct bcm_subver_table bcm_uart_subver_table[] = {
@@ -450515,7 +450530,7 @@ index dd29d687cd380..15b7cafde0f7b 100644
  };
  
 diff --git a/drivers/bluetooth/hci_bcm.c b/drivers/bluetooth/hci_bcm.c
-index 31943895b22e6..d5b6467b0e9f3 100644
+index 31943895b22e..d5b6467b0e9f 100644
 --- a/drivers/bluetooth/hci_bcm.c
 +++ b/drivers/bluetooth/hci_bcm.c
 @@ -1428,6 +1428,7 @@ static const struct of_device_id bcm_bluetooth_of_match[] = {
@@ -450552,7 +450567,7 @@ Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
  1 file changed, 29 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/bluetooth/hci_bcm.c b/drivers/bluetooth/hci_bcm.c
-index d5b6467b0e9f3..84a32c58712ef 100644
+index d5b6467b0e9f..84a32c58712e 100644
 --- a/drivers/bluetooth/hci_bcm.c
 +++ b/drivers/bluetooth/hci_bcm.c
 @@ -47,6 +47,14 @@
@@ -450689,7 +450704,7 @@ Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
  2 files changed, 62 insertions(+)
 
 diff --git a/drivers/bluetooth/btbcm.c b/drivers/bluetooth/btbcm.c
-index 15b7cafde0f7b..5b0f8a0b87f2c 100644
+index 15b7cafde0f7..5b0f8a0b87f2 100644
 --- a/drivers/bluetooth/btbcm.c
 +++ b/drivers/bluetooth/btbcm.c
 @@ -105,6 +105,52 @@ int btbcm_set_bdaddr(struct hci_dev *hdev, const bdaddr_t *bdaddr)
@@ -450746,7 +450761,7 @@ index 15b7cafde0f7b..5b0f8a0b87f2c 100644
  {
  	const struct hci_command_hdr *cmd;
 diff --git a/drivers/bluetooth/btbcm.h b/drivers/bluetooth/btbcm.h
-index d204be8a84bfe..3c7dd07658374 100644
+index d204be8a84bf..3c7dd0765837 100644
 --- a/drivers/bluetooth/btbcm.h
 +++ b/drivers/bluetooth/btbcm.h
 @@ -54,6 +54,10 @@ struct bcm_set_pcm_format_params {
@@ -450802,7 +450817,7 @@ Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
  1 file changed, 19 insertions(+)
 
 diff --git a/drivers/bluetooth/hci_bcm.c b/drivers/bluetooth/hci_bcm.c
-index 84a32c58712ef..4f21b60a8a20f 100644
+index 84a32c58712e..4f21b60a8a20 100644
 --- a/drivers/bluetooth/hci_bcm.c
 +++ b/drivers/bluetooth/hci_bcm.c
 @@ -123,6 +123,7 @@ struct bcm_device {
@@ -450886,7 +450901,7 @@ Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
  1 file changed, 17 insertions(+), 4 deletions(-)
 
 diff --git a/drivers/bluetooth/hci_bcm.c b/drivers/bluetooth/hci_bcm.c
-index 4f21b60a8a20f..de05b14282890 100644
+index 4f21b60a8a20..de05b1428289 100644
 --- a/drivers/bluetooth/hci_bcm.c
 +++ b/drivers/bluetooth/hci_bcm.c
 @@ -53,6 +53,7 @@
@@ -450978,7 +450993,7 @@ Signed-off-by: Joerg Schambacher joerg@i2audio.com
  2 files changed, 67 insertions(+), 2 deletions(-)
 
 diff --git a/sound/soc/bcm/Kconfig b/sound/soc/bcm/Kconfig
-index fdaccbfd79ce5..5ec58ef9cbe66 100644
+index fdaccbfd79ce..5ec58ef9cbe6 100644
 --- a/sound/soc/bcm/Kconfig
 +++ b/sound/soc/bcm/Kconfig
 @@ -38,6 +38,7 @@ config SND_BCM2708_SOC_HIFIBERRY_DACPLUS
@@ -450990,7 +451005,7 @@ index fdaccbfd79ce5..5ec58ef9cbe66 100644
          help
           Say Y or M if you want to add support for HifiBerry DAC+.
 diff --git a/sound/soc/bcm/hifiberry_dacplus.c b/sound/soc/bcm/hifiberry_dacplus.c
-index 4cde60a5b6f6a..286a62c3ff487 100644
+index 4cde60a5b6f6..286a62c3ff48 100644
 --- a/sound/soc/bcm/hifiberry_dacplus.c
 +++ b/sound/soc/bcm/hifiberry_dacplus.c
 @@ -4,6 +4,7 @@
@@ -451114,7 +451129,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  1 file changed, 5 insertions(+)
 
 diff --git a/arch/arm/boot/dts/overlays/hifiberry-dacplus-overlay.dts b/arch/arm/boot/dts/overlays/hifiberry-dacplus-overlay.dts
-index 2ca3d886ebb7a..ff19015ba6561 100644
+index 2ca3d886ebb7..ff19015ba656 100644
 --- a/arch/arm/boot/dts/overlays/hifiberry-dacplus-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/hifiberry-dacplus-overlay.dts
 @@ -39,6 +39,11 @@
@@ -451152,7 +451167,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 8 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c
-index 9431c2b917ed5..0aa3940c577ea 100644
+index 9431c2b917ed..0aa3940c577e 100644
 --- a/drivers/media/i2c/imx290.c
 +++ b/drivers/media/i2c/imx290.c
 @@ -796,17 +796,23 @@ static int imx290_set_fmt(struct v4l2_subdev *sd,
@@ -451200,7 +451215,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 84 insertions(+)
 
 diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c
-index 0aa3940c577ea..5b7083b7050e9 100644
+index 0aa3940c577e..5b7083b7050e 100644
 --- a/drivers/media/i2c/imx290.c
 +++ b/drivers/media/i2c/imx290.c
 @@ -61,6 +61,13 @@ enum imx290_clk_index {
@@ -451362,7 +451377,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 8 insertions(+)
 
 diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c
-index 5b7083b7050e9..0057e0b989123 100644
+index 5b7083b7050e..0057e0b98912 100644
 --- a/drivers/media/i2c/imx290.c
 +++ b/drivers/media/i2c/imx290.c
 @@ -813,6 +813,14 @@ static int imx290_set_fmt(struct v4l2_subdev *sd,
@@ -451400,7 +451415,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-index 3b082587dd14d..6b7780ec8ec6c 100644
+index 3b082587dd14..6b7780ec8ec6 100644
 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
 +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
 @@ -2416,8 +2416,8 @@ static int register_node(struct unicam_device *unicam, struct unicam_node *node,
@@ -451433,7 +451448,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 6 insertions(+)
 
 diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-index 6b7780ec8ec6c..c2b9d89f0ae52 100644
+index 6b7780ec8ec6..c2b9d89f0ae5 100644
 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
 +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
 @@ -1880,6 +1880,9 @@ static int unicam_s_selection(struct file *file, void *priv,
@@ -451477,7 +451492,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  5 files changed, 5 insertions(+)
 
 diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig
-index 8269ac84d6fd3..42faa1b8f201e 100644
+index 8269ac84d6fd..42faa1b8f201 100644
 --- a/arch/arm/configs/bcm2709_defconfig
 +++ b/arch/arm/configs/bcm2709_defconfig
 @@ -409,6 +409,7 @@ CONFIG_CAN=m
@@ -451489,7 +451504,7 @@ index 8269ac84d6fd3..42faa1b8f201e 100644
  CONFIG_BT=m
  CONFIG_BT_RFCOMM=m
 diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig
-index d332041fffe60..ebe4b220dbd51 100644
+index d332041fffe6..ebe4b220dbd5 100644
 --- a/arch/arm/configs/bcm2711_defconfig
 +++ b/arch/arm/configs/bcm2711_defconfig
 @@ -412,6 +412,7 @@ CONFIG_CAN=m
@@ -451501,7 +451516,7 @@ index d332041fffe60..ebe4b220dbd51 100644
  CONFIG_BT=m
  CONFIG_BT_RFCOMM=m
 diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig
-index 1148f84893ed8..a257f554a8316 100644
+index 1148f84893ed..a257f554a831 100644
 --- a/arch/arm/configs/bcmrpi_defconfig
 +++ b/arch/arm/configs/bcmrpi_defconfig
 @@ -399,6 +399,7 @@ CONFIG_CAN=m
@@ -451513,7 +451528,7 @@ index 1148f84893ed8..a257f554a8316 100644
  CONFIG_BT=m
  CONFIG_BT_RFCOMM=m
 diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig
-index 59bf96c985fa6..667bf89d9553b 100644
+index 59bf96c985fa..667bf89d9553 100644
 --- a/arch/arm64/configs/bcm2711_defconfig
 +++ b/arch/arm64/configs/bcm2711_defconfig
 @@ -411,6 +411,7 @@ CONFIG_CAN=m
@@ -451525,7 +451540,7 @@ index 59bf96c985fa6..667bf89d9553b 100644
  CONFIG_BT=m
  CONFIG_BT_RFCOMM=m
 diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig
-index e238f963d1724..c028ffce473a6 100644
+index e238f963d172..c028ffce473a 100644
 --- a/arch/arm64/configs/bcmrpi3_defconfig
 +++ b/arch/arm64/configs/bcmrpi3_defconfig
 @@ -399,6 +399,7 @@ CONFIG_YAM=m
@@ -451557,7 +451572,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  create mode 100644 arch/arm/boot/dts/overlays/ov7251-overlay.dts
 
 diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile
-index e7db9daa89694..fa6db6eed3e2a 100644
+index e7db9daa8969..fa6db6eed3e2 100644
 --- a/arch/arm/boot/dts/overlays/Makefile
 +++ b/arch/arm/boot/dts/overlays/Makefile
 @@ -115,6 +115,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
@@ -451569,7 +451584,7 @@ index e7db9daa89694..fa6db6eed3e2a 100644
  	papirus.dtbo \
  	pibell.dtbo \
 diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
-index 4a3f201d185a5..eb561ef272e0f 100644
+index 4a3f201d185a..eb561ef272e0 100644
 --- a/arch/arm/boot/dts/overlays/README
 +++ b/arch/arm/boot/dts/overlays/README
 @@ -1813,6 +1813,14 @@ Load:   dtoverlay=ov5647
@@ -451589,7 +451604,7 @@ index 4a3f201d185a5..eb561ef272e0f 100644
          Uses Unicam 1, which is the standard camera connector on most Pi
 diff --git a/arch/arm/boot/dts/overlays/ov7251-overlay.dts b/arch/arm/boot/dts/overlays/ov7251-overlay.dts
 new file mode 100644
-index 0000000000000..f04eafd4adf99
+index 000000000000..f04eafd4adf9
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/ov7251-overlay.dts
 @@ -0,0 +1,111 @@
@@ -451724,7 +451739,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  5 files changed, 5 insertions(+)
 
 diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig
-index 42faa1b8f201e..cde54a9a89bf1 100644
+index 42faa1b8f201..cde54a9a89bf 100644
 --- a/arch/arm/configs/bcm2709_defconfig
 +++ b/arch/arm/configs/bcm2709_defconfig
 @@ -911,6 +911,7 @@ CONFIG_VIDEO_IMX219=m
@@ -451736,7 +451751,7 @@ index 42faa1b8f201e..cde54a9a89bf1 100644
  CONFIG_VIDEO_OV9281=m
  CONFIG_VIDEO_IRS1125=m
 diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig
-index ebe4b220dbd51..7d6eaa6822339 100644
+index ebe4b220dbd5..7d6eaa682233 100644
 --- a/arch/arm/configs/bcm2711_defconfig
 +++ b/arch/arm/configs/bcm2711_defconfig
 @@ -926,6 +926,7 @@ CONFIG_VIDEO_IMX219=m
@@ -451748,7 +451763,7 @@ index ebe4b220dbd51..7d6eaa6822339 100644
  CONFIG_VIDEO_OV9281=m
  CONFIG_VIDEO_IRS1125=m
 diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig
-index a257f554a8316..3957962a2134f 100644
+index a257f554a831..3957962a2134 100644
 --- a/arch/arm/configs/bcmrpi_defconfig
 +++ b/arch/arm/configs/bcmrpi_defconfig
 @@ -900,6 +900,7 @@ CONFIG_VIDEO_IMX219=m
@@ -451760,7 +451775,7 @@ index a257f554a8316..3957962a2134f 100644
  CONFIG_VIDEO_OV9281=m
  CONFIG_VIDEO_IRS1125=m
 diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig
-index 667bf89d9553b..d5ce9e70fb813 100644
+index 667bf89d9553..d5ce9e70fb81 100644
 --- a/arch/arm64/configs/bcm2711_defconfig
 +++ b/arch/arm64/configs/bcm2711_defconfig
 @@ -919,6 +919,7 @@ CONFIG_VIDEO_IMX219=m
@@ -451772,7 +451787,7 @@ index 667bf89d9553b..d5ce9e70fb813 100644
  CONFIG_VIDEO_OV9281=m
  CONFIG_VIDEO_IRS1125=m
 diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig
-index c028ffce473a6..1d42667e3c11f 100644
+index c028ffce473a..1d42667e3c11 100644
 --- a/arch/arm64/configs/bcmrpi3_defconfig
 +++ b/arch/arm64/configs/bcmrpi3_defconfig
 @@ -834,6 +834,7 @@ CONFIG_VIDEO_IMX219=m
@@ -451802,7 +451817,7 @@ Signed-off-by: Dom Cobley <popcornmix@gmail.com>
  2 files changed, 78 insertions(+)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
-index 994bcb027172d..f3e692b2ffa19 100644
+index 994bcb027172..f3e692b2ffa1 100644
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
 @@ -917,6 +917,45 @@ static void vc4_hdmi_audio_shutdown(struct snd_pcm_substream *substream,
@@ -451874,7 +451889,7 @@ index 994bcb027172d..f3e692b2ffa19 100644
  	audio_packet_config =
  		VC4_HDMI_AUDIO_PACKET_ZERO_DATA_ON_SAMPLE_FLAT |
 diff --git a/drivers/gpu/drm/vc4/vc4_regs.h b/drivers/gpu/drm/vc4/vc4_regs.h
-index 4d017572a5c28..a388a9265afc4 100644
+index 4d017572a5c2..a388a9265afc 100644
 --- a/drivers/gpu/drm/vc4/vc4_regs.h
 +++ b/drivers/gpu/drm/vc4/vc4_regs.h
 @@ -516,6 +516,37 @@
@@ -451938,7 +451953,7 @@ Signed-off-by: Matthias Reichl <hias@horus.com>
  2 files changed, 62 insertions(+)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
-index f3e692b2ffa19..913dbcc7a7dd9 100644
+index f3e692b2ffa1..913dbcc7a7dd 100644
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
 @@ -43,6 +43,7 @@
@@ -452030,7 +452045,7 @@ index f3e692b2ffa19..913dbcc7a7dd9 100644
  	if (ret) {
  		dev_err(dev, "Could not register PCM component: %d\n", ret);
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.h b/drivers/gpu/drm/vc4/vc4_hdmi.h
-index 60f7bf99e06ef..5914de41705c4 100644
+index 60f7bf99e06e..5914de41705c 100644
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.h
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.h
 @@ -115,6 +115,8 @@ struct vc4_hdmi_audio {
@@ -452061,7 +452076,7 @@ Signed-off-by: Matthias Reichl <hias@horus.com>
  1 file changed, 10 insertions(+), 8 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
-index 913dbcc7a7dd9..d6961466e2eb4 100644
+index 913dbcc7a7dd..d6961466e2eb 100644
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
 @@ -958,8 +958,7 @@ static int sample_rate_to_mai_fmt(int samplerate)
@@ -452119,7 +452134,7 @@ Signed-off-by: Matthias Reichl <hias@horus.com>
  1 file changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
-index d6961466e2eb4..3108e0a1eacdc 100644
+index d6961466e2eb..3108e0a1eacd 100644
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
 @@ -991,7 +991,11 @@ static int vc4_hdmi_audio_prepare(struct snd_pcm_substream *substream,
@@ -452156,7 +452171,7 @@ Signed-off-by: Dom Cobley <popcornmix@gmail.com>
  1 file changed, 6 insertions(+), 16 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
-index 3108e0a1eacdc..19a243c9d805d 100644
+index 3108e0a1eacd..19a243c9d805 100644
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
 @@ -1010,22 +1010,12 @@ static int vc4_hdmi_audio_prepare(struct snd_pcm_substream *substream,
@@ -452207,7 +452222,7 @@ Signed-off-by: Dom Cobley <popcornmix@gmail.com>
  1 file changed, 1 insertion(+)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
-index 19a243c9d805d..5e74a6ca0c992 100644
+index 19a243c9d805..5e74a6ca0c99 100644
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
 @@ -1019,6 +1019,7 @@ static int vc4_hdmi_audio_prepare(struct snd_pcm_substream *substream,
@@ -452237,7 +452252,7 @@ Signed-off-by: Dom Cobley <popcornmix@gmail.com>
  2 files changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/arch/arm/boot/dts/bcm2711-rpi.dtsi b/arch/arm/boot/dts/bcm2711-rpi.dtsi
-index 4a3659d21997b..9c62edc2330b7 100644
+index 4a3659d21997..9c62edc2330b 100644
 --- a/arch/arm/boot/dts/bcm2711-rpi.dtsi
 +++ b/arch/arm/boot/dts/bcm2711-rpi.dtsi
 @@ -74,7 +74,7 @@
@@ -452259,7 +452274,7 @@ index 4a3659d21997b..9c62edc2330b7 100644
  			interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>;
  			status = "disabled";
 diff --git a/arch/arm/boot/dts/bcm2835-common.dtsi b/arch/arm/boot/dts/bcm2835-common.dtsi
-index e269e75f0f57d..e39577e90cc15 100644
+index e269e75f0f57..e39577e90cc1 100644
 --- a/arch/arm/boot/dts/bcm2835-common.dtsi
 +++ b/arch/arm/boot/dts/bcm2835-common.dtsi
 @@ -117,7 +117,7 @@
@@ -452292,7 +452307,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  4 files changed, 5 insertions(+), 21 deletions(-)
 
 diff --git a/arch/arm/boot/dts/bcm2709-rpi.dtsi b/arch/arm/boot/dts/bcm2709-rpi.dtsi
-index 624e2bdc8733f..babfa41cd9f78 100644
+index 624e2bdc8733..babfa41cd9f7 100644
 --- a/arch/arm/boot/dts/bcm2709-rpi.dtsi
 +++ b/arch/arm/boot/dts/bcm2709-rpi.dtsi
 @@ -3,10 +3,3 @@
@@ -452307,7 +452322,7 @@ index 624e2bdc8733f..babfa41cd9f78 100644
 -	};
 -};
 diff --git a/arch/arm/boot/dts/bcm2711-rpi.dtsi b/arch/arm/boot/dts/bcm2711-rpi.dtsi
-index 9c62edc2330b7..444a3d74e8f2d 100644
+index 9c62edc2330b..444a3d74e8f2 100644
 --- a/arch/arm/boot/dts/bcm2711-rpi.dtsi
 +++ b/arch/arm/boot/dts/bcm2711-rpi.dtsi
 @@ -309,10 +309,3 @@
@@ -452322,7 +452337,7 @@ index 9c62edc2330b7..444a3d74e8f2d 100644
 -	};
 -};
 diff --git a/arch/arm/boot/dts/bcm2835-rpi.dtsi b/arch/arm/boot/dts/bcm2835-rpi.dtsi
-index c011b7914688b..e01ad15ea3e67 100644
+index c011b7914688..e01ad15ea3e6 100644
 --- a/arch/arm/boot/dts/bcm2835-rpi.dtsi
 +++ b/arch/arm/boot/dts/bcm2835-rpi.dtsi
 @@ -16,6 +16,11 @@
@@ -452338,7 +452353,7 @@ index c011b7914688b..e01ad15ea3e67 100644
  
  		power: power {
 diff --git a/arch/arm/boot/dts/bcm2836-rpi.dtsi b/arch/arm/boot/dts/bcm2836-rpi.dtsi
-index 52b47038ca822..c4c858b984c6b 100644
+index 52b47038ca82..c4c858b984c6 100644
 --- a/arch/arm/boot/dts/bcm2836-rpi.dtsi
 +++ b/arch/arm/boot/dts/bcm2836-rpi.dtsi
 @@ -4,10 +4,3 @@
@@ -452373,7 +452388,7 @@ Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
  2 files changed, 50 insertions(+), 9 deletions(-)
 
 diff --git a/arch/arm/boot/dts/bcm270x.dtsi b/arch/arm/boot/dts/bcm270x.dtsi
-index bf90fd585364c..b74a9df1390e1 100644
+index bf90fd585364..b74a9df1390e 100644
 --- a/arch/arm/boot/dts/bcm270x.dtsi
 +++ b/arch/arm/boot/dts/bcm270x.dtsi
 @@ -88,8 +88,9 @@
@@ -452401,7 +452416,7 @@ index bf90fd585364c..b74a9df1390e1 100644
  			#address-cells = <1>;
  			#size-cells = <0>;
 diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-index c2b9d89f0ae52..57c3c5f5db56f 100644
+index c2b9d89f0ae5..57c3c5f5db56 100644
 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
 +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
 @@ -88,6 +88,11 @@ MODULE_PARM_DESC(debug, "Debug level 0-3");
@@ -452533,7 +452548,7 @@ Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/Documentation/devicetree/bindings/media/bcm2835-unicam.txt b/Documentation/devicetree/bindings/media/bcm2835-unicam.txt
-index 7714fb374b34d..164d0377dcd24 100644
+index 7714fb374b34..164d0377dcd2 100644
 --- a/Documentation/devicetree/bindings/media/bcm2835-unicam.txt
 +++ b/Documentation/devicetree/bindings/media/bcm2835-unicam.txt
 @@ -20,7 +20,7 @@ Required properties:
@@ -452573,7 +452588,7 @@ Signed-off-by: AMuszkat <ariel.muszkat@gmail.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/sound/soc/bcm/rpi-simple-soundcard.c b/sound/soc/bcm/rpi-simple-soundcard.c
-index 41965c71c9120..db43239d29c95 100644
+index 41965c71c912..db43239d29c9 100644
 --- a/sound/soc/bcm/rpi-simple-soundcard.c
 +++ b/sound/soc/bcm/rpi-simple-soundcard.c
 @@ -235,7 +235,7 @@ static struct snd_rpi_simple_drvdata drvdata_rpi_dac = {
@@ -452613,7 +452628,7 @@ Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
  1 file changed, 11 insertions(+)
 
 diff --git a/Documentation/devicetree/bindings/media/video-interfaces.txt b/Documentation/devicetree/bindings/media/video-interfaces.txt
-index f884ada0bffc8..b1ff492c7da7a 100644
+index f884ada0bffc..b1ff492c7da7 100644
 --- a/Documentation/devicetree/bindings/media/video-interfaces.txt
 +++ b/Documentation/devicetree/bindings/media/video-interfaces.txt
 @@ -89,6 +89,17 @@ Optional properties
@@ -452661,7 +452676,7 @@ Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
  1 file changed, 356 insertions(+), 3 deletions(-)
 
 diff --git a/Documentation/devicetree/bindings/media/video-interfaces.txt b/Documentation/devicetree/bindings/media/video-interfaces.txt
-index b1ff492c7da7a..3920f25a91235 100644
+index b1ff492c7da7..3920f25a9123 100644
 --- a/Documentation/devicetree/bindings/media/video-interfaces.txt
 +++ b/Documentation/devicetree/bindings/media/video-interfaces.txt
 @@ -85,9 +85,362 @@ Optional properties
@@ -453057,7 +453072,7 @@ Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
  1 file changed, 30 insertions(+)
 
 diff --git a/Documentation/media/uapi/v4l/ext-ctrls-camera.rst b/Documentation/media/uapi/v4l/ext-ctrls-camera.rst
-index 51c1d5c9eb002..c65a2b66232e1 100644
+index 51c1d5c9eb00..c65a2b66232e 100644
 --- a/Documentation/media/uapi/v4l/ext-ctrls-camera.rst
 +++ b/Documentation/media/uapi/v4l/ext-ctrls-camera.rst
 @@ -510,6 +510,36 @@ enum v4l2_scene_mode -
@@ -453123,7 +453138,7 @@ Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
  1 file changed, 121 insertions(+)
 
 diff --git a/Documentation/media/uapi/v4l/ext-ctrls-camera.rst b/Documentation/media/uapi/v4l/ext-ctrls-camera.rst
-index c65a2b66232e1..e64c1b2c01e84 100644
+index c65a2b66232e..e64c1b2c01e8 100644
 --- a/Documentation/media/uapi/v4l/ext-ctrls-camera.rst
 +++ b/Documentation/media/uapi/v4l/ext-ctrls-camera.rst
 @@ -540,6 +540,127 @@ enum v4l2_scene_mode -
@@ -453282,7 +453297,7 @@ Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
  2 files changed, 20 insertions(+)
 
 diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c
-index b733ada15e551..302ed58ce6dce 100644
+index 412e972a17cd..2d54cbac643d 100644
 --- a/drivers/media/v4l2-core/v4l2-ctrls.c
 +++ b/drivers/media/v4l2-core/v4l2-ctrls.c
 @@ -577,6 +577,12 @@ const char * const *v4l2_ctrl_get_menu(u32 id)
@@ -453334,7 +453349,7 @@ index b733ada15e551..302ed58ce6dce 100644
  		break;
  	case V4L2_CID_RF_TUNER_PLL_LOCK:
 diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-controls.h
-index 660574b1b4e7a..b6173d8c38f18 100644
+index 660574b1b4e7..b6173d8c38f1 100644
 --- a/include/uapi/linux/v4l2-controls.h
 +++ b/include/uapi/linux/v4l2-controls.h
 @@ -917,6 +917,13 @@ enum v4l2_auto_focus_range {
@@ -453380,7 +453395,7 @@ Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
  2 files changed, 89 insertions(+)
 
 diff --git a/drivers/media/v4l2-core/v4l2-fwnode.c b/drivers/media/v4l2-core/v4l2-fwnode.c
-index 48c3b9f72722a..26f644d3ef60d 100644
+index 48c3b9f72722..26f644d3ef60 100644
 --- a/drivers/media/v4l2-core/v4l2-fwnode.c
 +++ b/drivers/media/v4l2-core/v4l2-fwnode.c
 @@ -599,6 +599,48 @@ void v4l2_fwnode_put_link(struct v4l2_fwnode_link *link)
@@ -453433,7 +453448,7 @@ index 48c3b9f72722a..26f644d3ef60d 100644
  v4l2_async_notifier_fwnode_parse_endpoint(struct device *dev,
  					  struct v4l2_async_notifier *notifier,
 diff --git a/include/media/v4l2-fwnode.h b/include/media/v4l2-fwnode.h
-index f6a7bcd131977..7bb8da2092f69 100644
+index f6a7bcd13197..7bb8da2092f6 100644
 --- a/include/media/v4l2-fwnode.h
 +++ b/include/media/v4l2-fwnode.h
 @@ -109,6 +109,36 @@ struct v4l2_fwnode_endpoint {
@@ -453523,7 +453538,7 @@ Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
  2 files changed, 66 insertions(+)
 
 diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c
-index 302ed58ce6dce..20814e721eb94 100644
+index 2d54cbac643d..464293e393d5 100644
 --- a/drivers/media/v4l2-core/v4l2-ctrls.c
 +++ b/drivers/media/v4l2-core/v4l2-ctrls.c
 @@ -17,6 +17,7 @@
@@ -453534,7 +453549,7 @@ index 302ed58ce6dce..20814e721eb94 100644
  
  #define dprintk(vdev, fmt, arg...) do {					\
  	if (!WARN_ON(!(vdev)) && ((vdev)->dev_debug & V4L2_DEV_DEBUG_CTRL)) \
-@@ -4578,3 +4579,42 @@ __poll_t v4l2_ctrl_poll(struct file *file, struct poll_table_struct *wait)
+@@ -4589,3 +4590,42 @@ __poll_t v4l2_ctrl_poll(struct file *file, struct poll_table_struct *wait)
  	return 0;
  }
  EXPORT_SYMBOL(v4l2_ctrl_poll);
@@ -453578,7 +453593,7 @@ index 302ed58ce6dce..20814e721eb94 100644
 +}
 +EXPORT_SYMBOL(v4l2_ctrl_new_fwnode_properties);
 diff --git a/include/media/v4l2-ctrls.h b/include/media/v4l2-ctrls.h
-index 65575e9b5a2b1..162859aa21389 100644
+index 65575e9b5a2b..162859aa2138 100644
 --- a/include/media/v4l2-ctrls.h
 +++ b/include/media/v4l2-ctrls.h
 @@ -29,6 +29,7 @@ struct v4l2_ctrl_handler;
@@ -453637,7 +453652,7 @@ Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
  1 file changed, 12 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/media/i2c/ov5647.c b/drivers/media/i2c/ov5647.c
-index 6d84d2785f740..86a821a172b3d 100644
+index 6d84d2785f74..86a821a172b3 100644
 --- a/drivers/media/i2c/ov5647.c
 +++ b/drivers/media/i2c/ov5647.c
 @@ -1501,6 +1501,7 @@ static int ov5647_probe(struct i2c_client *client)
@@ -453698,7 +453713,7 @@ Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
  1 file changed, 11 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/media/i2c/imx219.c b/drivers/media/i2c/imx219.c
-index b84fc19e9ff75..812323107f36c 100644
+index b84fc19e9ff7..812323107f36 100644
 --- a/drivers/media/i2c/imx219.c
 +++ b/drivers/media/i2c/imx219.c
 @@ -1348,11 +1348,12 @@ static int imx219_init_controls(struct imx219 *imx219)
@@ -453749,7 +453764,7 @@ Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
  1 file changed, 11 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/media/i2c/imx477.c b/drivers/media/i2c/imx477.c
-index e42a8633087d4..3fbb173fa0796 100644
+index e42a8633087d..3fbb173fa079 100644
 --- a/drivers/media/i2c/imx477.c
 +++ b/drivers/media/i2c/imx477.c
 @@ -1957,11 +1957,12 @@ static int imx477_init_controls(struct imx477 *imx477)
@@ -453802,7 +453817,7 @@ Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
  2 files changed, 9 insertions(+), 2 deletions(-)
 
 diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
-index eb561ef272e0f..651acea3194b3 100644
+index eb561ef272e0..651acea3194b 100644
 --- a/arch/arm/boot/dts/overlays/README
 +++ b/arch/arm/boot/dts/overlays/README
 @@ -1809,8 +1809,9 @@ Name:   ov5647
@@ -453818,7 +453833,7 @@ index eb561ef272e0f..651acea3194b3 100644
  
  Name:   ov7251
 diff --git a/arch/arm/boot/dts/overlays/ov5647-overlay.dts b/arch/arm/boot/dts/overlays/ov5647-overlay.dts
-index 5eba3cb9fb91d..fd1e7a457f697 100644
+index 5eba3cb9fb91..fd1e7a457f69 100644
 --- a/arch/arm/boot/dts/overlays/ov5647-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/ov5647-overlay.dts
 @@ -21,6 +21,8 @@
@@ -453860,7 +453875,7 @@ Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
  2 files changed, 9 insertions(+), 2 deletions(-)
 
 diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
-index 651acea3194b3..61fe868172927 100644
+index 651acea3194b..61fe86817292 100644
 --- a/arch/arm/boot/dts/overlays/README
 +++ b/arch/arm/boot/dts/overlays/README
 @@ -1433,8 +1433,9 @@ Name:   imx219
@@ -453876,7 +453891,7 @@ index 651acea3194b3..61fe868172927 100644
  
  Name:   imx290
 diff --git a/arch/arm/boot/dts/overlays/imx219-overlay.dts b/arch/arm/boot/dts/overlays/imx219-overlay.dts
-index 3c2d3fac93d21..dce07b335c4e8 100644
+index 3c2d3fac93d2..dce07b335c4e 100644
 --- a/arch/arm/boot/dts/overlays/imx219-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/imx219-overlay.dts
 @@ -27,6 +27,8 @@
@@ -453918,7 +453933,7 @@ Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
  2 files changed, 9 insertions(+), 2 deletions(-)
 
 diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
-index 61fe868172927..69892d01faae1 100644
+index 61fe86817292..69892d01faae 100644
 --- a/arch/arm/boot/dts/overlays/README
 +++ b/arch/arm/boot/dts/overlays/README
 @@ -1458,8 +1458,9 @@ Name:   imx477
@@ -453934,7 +453949,7 @@ index 61fe868172927..69892d01faae1 100644
  
  Name:   iqaudio-codec
 diff --git a/arch/arm/boot/dts/overlays/imx477-overlay.dts b/arch/arm/boot/dts/overlays/imx477-overlay.dts
-index 73d4f79d54e6f..1a97eaaf4c826 100644
+index 73d4f79d54e6..1a97eaaf4c82 100644
 --- a/arch/arm/boot/dts/overlays/imx477-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/imx477-overlay.dts
 @@ -27,6 +27,8 @@
@@ -453976,7 +453991,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 10 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
-index ec5c223033c8d..31982bda0062d 100644
+index ec5c223033c8..31982bda0062 100644
 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 @@ -158,6 +158,8 @@ struct set_timings {
@@ -454037,7 +454052,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  create mode 100644 drivers/leds/trigger/ledtrig-actpwr.c
 
 diff --git a/drivers/leds/trigger/Kconfig b/drivers/leds/trigger/Kconfig
-index 03e3f1c267dd7..d45aba3e1d13b 100644
+index 03e3f1c267dd..d45aba3e1d13 100644
 --- a/drivers/leds/trigger/Kconfig
 +++ b/drivers/leds/trigger/Kconfig
 @@ -151,4 +151,15 @@ config LEDS_TRIGGER_AUDIO
@@ -454057,7 +454072,7 @@ index 03e3f1c267dd7..d45aba3e1d13b 100644
 +
  endif # LEDS_TRIGGERS
 diff --git a/drivers/leds/trigger/Makefile b/drivers/leds/trigger/Makefile
-index f2d085c672333..1083b35cbe8b6 100644
+index f2d085c67233..1083b35cbe8b 100644
 --- a/drivers/leds/trigger/Makefile
 +++ b/drivers/leds/trigger/Makefile
 @@ -16,3 +16,4 @@ obj-$(CONFIG_LEDS_TRIGGER_PANIC)	+= ledtrig-panic.o
@@ -454067,7 +454082,7 @@ index f2d085c672333..1083b35cbe8b6 100644
 +obj-$(CONFIG_LEDS_TRIGGER_ACTPWR)	+= ledtrig-actpwr.o
 diff --git a/drivers/leds/trigger/ledtrig-actpwr.c b/drivers/leds/trigger/ledtrig-actpwr.c
 new file mode 100644
-index 0000000000000..4e89fb314e2c9
+index 000000000000..4e89fb314e2c
 --- /dev/null
 +++ b/drivers/leds/trigger/ledtrig-actpwr.c
 @@ -0,0 +1,191 @@
@@ -454283,7 +454298,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  5 files changed, 5 insertions(+)
 
 diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig
-index cde54a9a89bf1..77feb47ce9fbc 100644
+index cde54a9a89bf..77feb47ce9fb 100644
 --- a/arch/arm/configs/bcm2709_defconfig
 +++ b/arch/arm/configs/bcm2709_defconfig
 @@ -1208,6 +1208,7 @@ CONFIG_LEDS_TRIGGER_CAMERA=m
@@ -454295,7 +454310,7 @@ index cde54a9a89bf1..77feb47ce9fbc 100644
  # CONFIG_RTC_HCTOSYS is not set
  CONFIG_RTC_DRV_ABX80X=m
 diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig
-index 7d6eaa6822339..95934186bfb8e 100644
+index 7d6eaa682233..95934186bfb8 100644
 --- a/arch/arm/configs/bcm2711_defconfig
 +++ b/arch/arm/configs/bcm2711_defconfig
 @@ -1245,6 +1245,7 @@ CONFIG_LEDS_TRIGGER_CAMERA=m
@@ -454307,7 +454322,7 @@ index 7d6eaa6822339..95934186bfb8e 100644
  # CONFIG_RTC_HCTOSYS is not set
  CONFIG_RTC_DRV_ABX80X=m
 diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig
-index 3957962a2134f..bf6e9ba085d71 100644
+index 3957962a2134..bf6e9ba085d7 100644
 --- a/arch/arm/configs/bcmrpi_defconfig
 +++ b/arch/arm/configs/bcmrpi_defconfig
 @@ -1214,6 +1214,7 @@ CONFIG_LEDS_TRIGGER_CAMERA=m
@@ -454319,7 +454334,7 @@ index 3957962a2134f..bf6e9ba085d71 100644
  # CONFIG_RTC_HCTOSYS is not set
  CONFIG_RTC_DRV_ABX80X=m
 diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig
-index d5ce9e70fb813..b9b2ef66f297e 100644
+index d5ce9e70fb81..b9b2ef66f297 100644
 --- a/arch/arm64/configs/bcm2711_defconfig
 +++ b/arch/arm64/configs/bcm2711_defconfig
 @@ -1238,6 +1238,7 @@ CONFIG_LEDS_TRIGGER_CAMERA=m
@@ -454331,7 +454346,7 @@ index d5ce9e70fb813..b9b2ef66f297e 100644
  # CONFIG_RTC_HCTOSYS is not set
  CONFIG_RTC_DRV_ABX80X=m
 diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig
-index 1d42667e3c11f..c7e5eeacb27c4 100644
+index 1d42667e3c11..c7e5eeacb27c 100644
 --- a/arch/arm64/configs/bcmrpi3_defconfig
 +++ b/arch/arm64/configs/bcmrpi3_defconfig
 @@ -1093,6 +1093,7 @@ CONFIG_LEDS_TRIGGER_CAMERA=m
@@ -454362,7 +454377,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  2 files changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts b/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts
-index 111f61915947a..0060c9bfe2e68 100644
+index 111f61915947..0060c9bfe2e6 100644
 --- a/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts
 +++ b/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts
 @@ -144,8 +144,8 @@
@@ -454377,7 +454392,7 @@ index 111f61915947a..0060c9bfe2e68 100644
  };
  
 diff --git a/arch/arm/boot/dts/bcm2708-rpi-zero.dts b/arch/arm/boot/dts/bcm2708-rpi-zero.dts
-index c2f58e84eb323..5655eb4769ea9 100644
+index c2f58e84eb32..5655eb4769ea 100644
 --- a/arch/arm/boot/dts/bcm2708-rpi-zero.dts
 +++ b/arch/arm/boot/dts/bcm2708-rpi-zero.dts
 @@ -98,8 +98,8 @@
@@ -454410,7 +454425,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  2 files changed, 35 insertions(+), 5 deletions(-)
 
 diff --git a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
-index 424e7e6da1d6f..db38649124b77 100644
+index 424e7e6da1d6..db38649124b7 100644
 --- a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
 +++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
 @@ -21,6 +21,8 @@
@@ -454465,7 +454480,7 @@ index 424e7e6da1d6f..db38649124b77 100644
  		ret = set_isp_param(node, MMAL_PARAMETER_BLACK_LEVEL,
  				    ctrl->p_new.p_u8,
 diff --git a/include/uapi/linux/bcm2835-isp.h b/include/uapi/linux/bcm2835-isp.h
-index bb16dcbcb40f5..cf8c0437f1597 100644
+index bb16dcbcb40f..cf8c0437f159 100644
 --- a/include/uapi/linux/bcm2835-isp.h
 +++ b/include/uapi/linux/bcm2835-isp.h
 @@ -108,7 +108,7 @@ enum bcm2835_isp_gain_format {
@@ -454501,7 +454516,7 @@ Subject: [PATCH 1043/1225] Mute bug fix for the Audioinjector.net isolated
  1 file changed, 3 insertions(+), 23 deletions(-)
 
 diff --git a/sound/soc/bcm/audioinjector-isolated-soundcard.c b/sound/soc/bcm/audioinjector-isolated-soundcard.c
-index 652464658fef9..27e1316e387df 100644
+index 652464658fef..27e1316e387d 100644
 --- a/sound/soc/bcm/audioinjector-isolated-soundcard.c
 +++ b/sound/soc/bcm/audioinjector-isolated-soundcard.c
 @@ -42,41 +42,20 @@ static int audioinjector_isolated_dai_init(struct snd_soc_pcm_runtime *rtd)
@@ -454577,7 +454592,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  5 files changed, 5 insertions(+)
 
 diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig
-index 77feb47ce9fbc..e087265da2462 100644
+index 77feb47ce9fb..e087265da246 100644
 --- a/arch/arm/configs/bcm2709_defconfig
 +++ b/arch/arm/configs/bcm2709_defconfig
 @@ -1319,6 +1319,7 @@ CONFIG_APDS9960=m
@@ -454589,7 +454604,7 @@ index 77feb47ce9fbc..e087265da2462 100644
  CONFIG_PWM_PCA9685=m
  CONFIG_RPI_AXIPERF=m
 diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig
-index 95934186bfb8e..9aeb3aa1a618c 100644
+index 95934186bfb8..9aeb3aa1a618 100644
 --- a/arch/arm/configs/bcm2711_defconfig
 +++ b/arch/arm/configs/bcm2711_defconfig
 @@ -1357,6 +1357,7 @@ CONFIG_APDS9960=m
@@ -454601,7 +454616,7 @@ index 95934186bfb8e..9aeb3aa1a618c 100644
  CONFIG_PWM_PCA9685=m
  CONFIG_GENERIC_PHY=y
 diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig
-index bf6e9ba085d71..18e7506a25314 100644
+index bf6e9ba085d7..18e7506a2531 100644
 --- a/arch/arm/configs/bcmrpi_defconfig
 +++ b/arch/arm/configs/bcmrpi_defconfig
 @@ -1325,6 +1325,7 @@ CONFIG_APDS9960=m
@@ -454613,7 +454628,7 @@ index bf6e9ba085d71..18e7506a25314 100644
  CONFIG_PWM_PCA9685=m
  CONFIG_RPI_AXIPERF=m
 diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig
-index b9b2ef66f297e..e8eee3446fc08 100644
+index b9b2ef66f297..e8eee3446fc0 100644
 --- a/arch/arm64/configs/bcm2711_defconfig
 +++ b/arch/arm64/configs/bcm2711_defconfig
 @@ -1349,6 +1349,7 @@ CONFIG_APDS9960=m
@@ -454625,7 +454640,7 @@ index b9b2ef66f297e..e8eee3446fc08 100644
  CONFIG_PWM_PCA9685=m
  CONFIG_GENERIC_PHY=y
 diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig
-index c7e5eeacb27c4..04128417383a9 100644
+index c7e5eeacb27c..04128417383a 100644
 --- a/arch/arm64/configs/bcmrpi3_defconfig
 +++ b/arch/arm64/configs/bcmrpi3_defconfig
 @@ -1194,6 +1194,7 @@ CONFIG_BME680=m
@@ -454660,7 +454675,7 @@ Signed-off-by: Dom Cobley <popcornmix@gmail.com>
  2 files changed, 418 insertions(+)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
-index 5e74a6ca0c992..2f6730983183a 100644
+index 5e74a6ca0c99..2f6730983183 100644
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
 @@ -48,6 +48,7 @@
@@ -455135,7 +455150,7 @@ index 5e74a6ca0c992..2f6730983183a 100644
  
  static const struct snd_soc_dapm_widget vc4_hdmi_audio_widgets[] = {
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.h b/drivers/gpu/drm/vc4/vc4_hdmi.h
-index 5914de41705c4..e866979a6df59 100644
+index 5914de41705c..e866979a6df5 100644
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.h
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.h
 @@ -117,6 +117,9 @@ struct vc4_hdmi_audio {
@@ -455163,7 +455178,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  1 file changed, 1 deletion(-)
 
 diff --git a/drivers/leds/trigger/ledtrig-actpwr.c b/drivers/leds/trigger/ledtrig-actpwr.c
-index 4e89fb314e2c9..1a52107ceb03b 100644
+index 4e89fb314e2c..1a52107ceb03 100644
 --- a/drivers/leds/trigger/ledtrig-actpwr.c
 +++ b/drivers/leds/trigger/ledtrig-actpwr.c
 @@ -94,7 +94,6 @@ static void actpwr_trig_cycle(struct timer_list *t)
@@ -455194,7 +455209,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  1 file changed, 10 insertions(+)
 
 diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
-index d55f038637fc4..4edfca26410ed 100644
+index d55f038637fc..4edfca26410e 100644
 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
 +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
 @@ -3205,8 +3205,18 @@ vchiq_register_child(struct platform_device *pdev, const char *name)
@@ -455234,7 +455249,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  1 file changed, 1 insertion(+), 2 deletions(-)
 
 diff --git a/arch/arm/boot/dts/bcm2711-rpi.dtsi b/arch/arm/boot/dts/bcm2711-rpi.dtsi
-index 444a3d74e8f2d..c2c63bbef338d 100644
+index 444a3d74e8f2..c2c63bbef338 100644
 --- a/arch/arm/boot/dts/bcm2711-rpi.dtsi
 +++ b/arch/arm/boot/dts/bcm2711-rpi.dtsi
 @@ -193,8 +193,7 @@
@@ -455265,7 +455280,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  1 file changed, 15 insertions(+), 3 deletions(-)
 
 diff --git a/drivers/dma/bcm2835-dma.c b/drivers/dma/bcm2835-dma.c
-index 9fec52489421a..5a9b18edc2b73 100644
+index 9fec52489421..5a9b18edc2b7 100644
 --- a/drivers/dma/bcm2835-dma.c
 +++ b/drivers/dma/bcm2835-dma.c
 @@ -41,6 +41,7 @@
@@ -455348,7 +455363,7 @@ Subject: [PATCH 1050/1225] add CONFIG_CRYPTO_USER_API_HASH=m
  5 files changed, 5 insertions(+)
 
 diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig
-index e087265da2462..5eaa8be6b458c 100644
+index e087265da246..5eaa8be6b458 100644
 --- a/arch/arm/configs/bcm2709_defconfig
 +++ b/arch/arm/configs/bcm2709_defconfig
 @@ -1443,6 +1443,7 @@ CONFIG_CRYPTO_WP512=m
@@ -455360,7 +455375,7 @@ index e087265da2462..5eaa8be6b458c 100644
  # CONFIG_CRYPTO_HW is not set
  CONFIG_CRC_ITU_T=y
 diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig
-index 9aeb3aa1a618c..8f261cec85c30 100644
+index 9aeb3aa1a618..8f261cec85c3 100644
 --- a/arch/arm/configs/bcm2711_defconfig
 +++ b/arch/arm/configs/bcm2711_defconfig
 @@ -1482,6 +1482,7 @@ CONFIG_CRYPTO_WP512=m
@@ -455372,7 +455387,7 @@ index 9aeb3aa1a618c..8f261cec85c30 100644
  # CONFIG_CRYPTO_HW is not set
  CONFIG_CRC_ITU_T=y
 diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig
-index 18e7506a25314..e593c41ba6464 100644
+index 18e7506a2531..e593c41ba646 100644
 --- a/arch/arm/configs/bcmrpi_defconfig
 +++ b/arch/arm/configs/bcmrpi_defconfig
 @@ -1452,6 +1452,7 @@ CONFIG_CRYPTO_WP512=m
@@ -455384,7 +455399,7 @@ index 18e7506a25314..e593c41ba6464 100644
  # CONFIG_CRYPTO_HW is not set
  CONFIG_CRC_ITU_T=y
 diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig
-index e8eee3446fc08..e9eb3a88cbbe4 100644
+index e8eee3446fc0..e9eb3a88cbbe 100644
 --- a/arch/arm64/configs/bcm2711_defconfig
 +++ b/arch/arm64/configs/bcm2711_defconfig
 @@ -1474,6 +1474,7 @@ CONFIG_CRYPTO_WP512=m
@@ -455396,7 +455411,7 @@ index e8eee3446fc08..e9eb3a88cbbe4 100644
  # CONFIG_CRYPTO_HW is not set
  CONFIG_CRC_ITU_T=y
 diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig
-index 04128417383a9..05459f731972a 100644
+index 04128417383a..05459f731972 100644
 --- a/arch/arm64/configs/bcmrpi3_defconfig
 +++ b/arch/arm64/configs/bcmrpi3_defconfig
 @@ -1317,6 +1317,7 @@ CONFIG_CRYPTO_WP512=m
@@ -455432,7 +455447,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  5 files changed, 10 insertions(+)
 
 diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig
-index 5eaa8be6b458c..079ce5cf796be 100644
+index 5eaa8be6b458..079ce5cf796b 100644
 --- a/arch/arm/configs/bcm2709_defconfig
 +++ b/arch/arm/configs/bcm2709_defconfig
 @@ -1445,6 +1445,8 @@ CONFIG_CRYPTO_DES=y
@@ -455445,7 +455460,7 @@ index 5eaa8be6b458c..079ce5cf796be 100644
  CONFIG_CRC_ITU_T=y
  CONFIG_LIBCRC32C=y
 diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig
-index 8f261cec85c30..53bbdd37e3b13 100644
+index 8f261cec85c3..53bbdd37e3b1 100644
 --- a/arch/arm/configs/bcm2711_defconfig
 +++ b/arch/arm/configs/bcm2711_defconfig
 @@ -1484,6 +1484,8 @@ CONFIG_CRYPTO_DES=y
@@ -455458,7 +455473,7 @@ index 8f261cec85c30..53bbdd37e3b13 100644
  CONFIG_CRC_ITU_T=y
  CONFIG_LIBCRC32C=y
 diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig
-index e593c41ba6464..269df029e3988 100644
+index e593c41ba646..269df029e398 100644
 --- a/arch/arm/configs/bcmrpi_defconfig
 +++ b/arch/arm/configs/bcmrpi_defconfig
 @@ -1454,6 +1454,8 @@ CONFIG_CRYPTO_DES=y
@@ -455471,7 +455486,7 @@ index e593c41ba6464..269df029e3988 100644
  CONFIG_CRC_ITU_T=y
  CONFIG_LIBCRC32C=y
 diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig
-index e9eb3a88cbbe4..c30be2d0ddd8a 100644
+index e9eb3a88cbbe..c30be2d0ddd8 100644
 --- a/arch/arm64/configs/bcm2711_defconfig
 +++ b/arch/arm64/configs/bcm2711_defconfig
 @@ -1476,6 +1476,8 @@ CONFIG_CRYPTO_DES=y
@@ -455484,7 +455499,7 @@ index e9eb3a88cbbe4..c30be2d0ddd8a 100644
  CONFIG_CRC_ITU_T=y
  CONFIG_LIBCRC32C=y
 diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig
-index 05459f731972a..11f3ff5d60f8e 100644
+index 05459f731972..11f3ff5d60f8 100644
 --- a/arch/arm64/configs/bcmrpi3_defconfig
 +++ b/arch/arm64/configs/bcmrpi3_defconfig
 @@ -1319,6 +1319,8 @@ CONFIG_CRYPTO_DES=y
@@ -455515,7 +455530,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  3 files changed, 6 insertions(+)
 
 diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig
-index 079ce5cf796be..3658272f1cf74 100644
+index 079ce5cf796b..3658272f1cf7 100644
 --- a/arch/arm/configs/bcm2709_defconfig
 +++ b/arch/arm/configs/bcm2709_defconfig
 @@ -14,6 +14,8 @@ CONFIG_TASK_XACCT=y
@@ -455528,7 +455543,7 @@ index 079ce5cf796be..3658272f1cf74 100644
  CONFIG_CGROUP_FREEZER=y
  CONFIG_CPUSETS=y
 diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig
-index 269df029e3988..95ad3fce074ac 100644
+index 269df029e398..95ad3fce074a 100644
 --- a/arch/arm/configs/bcmrpi_defconfig
 +++ b/arch/arm/configs/bcmrpi_defconfig
 @@ -13,6 +13,8 @@ CONFIG_TASK_XACCT=y
@@ -455541,7 +455556,7 @@ index 269df029e3988..95ad3fce074ac 100644
  CONFIG_CGROUP_DEVICE=y
  CONFIG_CGROUP_CPUACCT=y
 diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig
-index 11f3ff5d60f8e..feca764ecd749 100644
+index 11f3ff5d60f8..feca764ecd74 100644
 --- a/arch/arm64/configs/bcmrpi3_defconfig
 +++ b/arch/arm64/configs/bcmrpi3_defconfig
 @@ -13,6 +13,8 @@ CONFIG_TASK_XACCT=y
@@ -455576,7 +455591,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  1 file changed, 8 insertions(+)
 
 diff --git a/arch/arm/boot/dts/bcm270x-rpi.dtsi b/arch/arm/boot/dts/bcm270x-rpi.dtsi
-index e3d90b4262f1f..68a7e1c09db1d 100644
+index e3d90b4262f1..68a7e1c09db1 100644
 --- a/arch/arm/boot/dts/bcm270x-rpi.dtsi
 +++ b/arch/arm/boot/dts/bcm270x-rpi.dtsi
 @@ -102,6 +102,14 @@
@@ -455618,7 +455633,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 1 deletion(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
-index 31982bda0062d..7802020cc3c0e 100644
+index 31982bda0062..7802020cc3c0 100644
 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 @@ -718,7 +718,6 @@ static bool vc4_fkms_format_mod_supported(struct drm_plane *plane,
@@ -455665,7 +455680,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  1 file changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S
-index c4e8006a1a8cd..d5d63b9fbe225 100644
+index c4e8006a1a8c..d5d63b9fbe22 100644
 --- a/arch/arm/mm/proc-v7.S
 +++ b/arch/arm/mm/proc-v7.S
 @@ -287,6 +287,8 @@ __v7_ca17mp_setup:
@@ -455723,7 +455738,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  4 files changed, 45 insertions(+), 32 deletions(-)
 
 diff --git a/arch/arm/boot/dts/overlays/sc16is750-i2c-overlay.dts b/arch/arm/boot/dts/overlays/sc16is750-i2c-overlay.dts
-index 16fe0d08cef1b..04d74d62897b9 100644
+index 16fe0d08cef1..04d74d62897b 100644
 --- a/arch/arm/boot/dts/overlays/sc16is750-i2c-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/sc16is750-i2c-overlay.dts
 @@ -13,26 +13,31 @@
@@ -455768,7 +455783,7 @@ index 16fe0d08cef1b..04d74d62897b9 100644
 -
  };
 diff --git a/arch/arm/boot/dts/overlays/sc16is752-i2c-overlay.dts b/arch/arm/boot/dts/overlays/sc16is752-i2c-overlay.dts
-index 57ae35c384425..da05e981314c4 100644
+index 57ae35c38442..da05e981314c 100644
 --- a/arch/arm/boot/dts/overlays/sc16is752-i2c-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/sc16is752-i2c-overlay.dts
 @@ -5,29 +5,32 @@
@@ -455817,7 +455832,7 @@ index 57ae35c384425..da05e981314c4 100644
  		};
  	};
 diff --git a/arch/arm/boot/dts/overlays/sc16is752-spi0-overlay.dts b/arch/arm/boot/dts/overlays/sc16is752-spi0-overlay.dts
-index ccce7ad599bc1..a49a04722b996 100644
+index ccce7ad599bc..a49a04722b99 100644
 --- a/arch/arm/boot/dts/overlays/sc16is752-spi0-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/sc16is752-spi0-overlay.dts
 @@ -17,15 +17,9 @@
@@ -455859,7 +455874,7 @@ index ccce7ad599bc1..a49a04722b996 100644
  	};
  };
 diff --git a/arch/arm/boot/dts/overlays/sc16is752-spi1-overlay.dts b/arch/arm/boot/dts/overlays/sc16is752-spi1-overlay.dts
-index ffdea106434a2..730c6e8cd6142 100644
+index ffdea106434a..730c6e8cd614 100644
 --- a/arch/arm/boot/dts/overlays/sc16is752-spi1-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/sc16is752-spi1-overlay.dts
 @@ -21,7 +21,7 @@
@@ -455914,7 +455929,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  delete mode 100644 arch/arm/boot/dts/overlays/spi0-hw-cs-overlay.dts
 
 diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile
-index fa6db6eed3e2a..afe0125760c09 100644
+index fa6db6eed3e2..afe0125760c0 100644
 --- a/arch/arm/boot/dts/overlays/Makefile
 +++ b/arch/arm/boot/dts/overlays/Makefile
 @@ -159,7 +159,6 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
@@ -455926,7 +455941,7 @@ index fa6db6eed3e2a..afe0125760c09 100644
  	spi1-2cs.dtbo \
  	spi1-3cs.dtbo \
 diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
-index 69892d01faae1..81b1a1ffa7fa7 100644
+index 69892d01faae..81b1a1ffa7fa 100644
 --- a/arch/arm/boot/dts/overlays/README
 +++ b/arch/arm/boot/dts/overlays/README
 @@ -2346,9 +2346,9 @@ Params: cs0_pin                 GPIO pin for CS0 (default 8)
@@ -455943,7 +455958,7 @@ index 69892d01faae1..81b1a1ffa7fa7 100644
  
  Name:   spi1-1cs
 diff --git a/arch/arm/boot/dts/overlays/overlay_map.dts b/arch/arm/boot/dts/overlays/overlay_map.dts
-index 1287964c15bf1..b15ecc68c149f 100644
+index 1287964c15bf..b15ecc68c149 100644
 --- a/arch/arm/boot/dts/overlays/overlay_map.dts
 +++ b/arch/arm/boot/dts/overlays/overlay_map.dts
 @@ -61,6 +61,10 @@
@@ -455959,7 +455974,7 @@ index 1287964c15bf1..b15ecc68c149f 100644
  	};
 diff --git a/arch/arm/boot/dts/overlays/spi0-hw-cs-overlay.dts b/arch/arm/boot/dts/overlays/spi0-hw-cs-overlay.dts
 deleted file mode 100644
-index 168a0dc80ad1a..0000000000000
+index 168a0dc80ad1..000000000000
 --- a/arch/arm/boot/dts/overlays/spi0-hw-cs-overlay.dts
 +++ /dev/null
 @@ -1,26 +0,0 @@
@@ -456021,7 +456036,7 @@ Signed-off-by: Lee Jones <lee.jones@linaro.org>
  1 file changed, 18 insertions(+), 5 deletions(-)
 
 diff --git a/drivers/video/backlight/gpio_backlight.c b/drivers/video/backlight/gpio_backlight.c
-index 18e053e4716c4..40e94eb7a7b39 100644
+index 18e053e4716c..40e94eb7a7b3 100644
 --- a/drivers/video/backlight/gpio_backlight.c
 +++ b/drivers/video/backlight/gpio_backlight.c
 @@ -26,9 +26,8 @@ struct gpio_backlight {
@@ -456108,7 +456123,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  create mode 100644 arch/arm/boot/dts/overlays/maxtherm-overlay.dts
 
 diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile
-index afe0125760c09..f2e6ea5ffb5ea 100644
+index afe0125760c0..f2e6ea5ffb5e 100644
 --- a/arch/arm/boot/dts/overlays/Makefile
 +++ b/arch/arm/boot/dts/overlays/Makefile
 @@ -98,6 +98,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
@@ -456120,7 +456135,7 @@ index afe0125760c09..f2e6ea5ffb5ea 100644
  	mcp23017.dtbo \
  	mcp23s17.dtbo \
 diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
-index 81b1a1ffa7fa7..0feef88065431 100644
+index 81b1a1ffa7fa..0feef8806543 100644
 --- a/arch/arm/boot/dts/overlays/README
 +++ b/arch/arm/boot/dts/overlays/README
 @@ -1622,6 +1622,36 @@ Params: no-sdmode               Driver does not manage the state of the DAC's
@@ -456162,7 +456177,7 @@ index 81b1a1ffa7fa7..0feef88065431 100644
  Load:   dtoverlay=mbed-dac
 diff --git a/arch/arm/boot/dts/overlays/maxtherm-overlay.dts b/arch/arm/boot/dts/overlays/maxtherm-overlay.dts
 new file mode 100644
-index 0000000000000..34d5727069ece
+index 000000000000..34d5727069ec
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/maxtherm-overlay.dts
 @@ -0,0 +1,166 @@
@@ -456356,7 +456371,7 @@ Signed-off-by: Annaliese McDermond <nh6z@nh6z.net>
  5 files changed, 5 insertions(+)
 
 diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig
-index 3658272f1cf74..7860c8e1ffa77 100644
+index 3658272f1cf7..7860c8e1ffa7 100644
 --- a/arch/arm/configs/bcm2709_defconfig
 +++ b/arch/arm/configs/bcm2709_defconfig
 @@ -712,6 +712,7 @@ CONFIG_BATTERY_MAX17040=m
@@ -456368,7 +456383,7 @@ index 3658272f1cf74..7860c8e1ffa77 100644
  CONFIG_SENSORS_LM75=m
  CONFIG_SENSORS_RASPBERRYPI_HWMON=m
 diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig
-index 53bbdd37e3b13..e98d0009a2272 100644
+index 53bbdd37e3b1..e98d0009a227 100644
 --- a/arch/arm/configs/bcm2711_defconfig
 +++ b/arch/arm/configs/bcm2711_defconfig
 @@ -722,6 +722,7 @@ CONFIG_BATTERY_MAX17040=m
@@ -456380,7 +456395,7 @@ index 53bbdd37e3b13..e98d0009a2272 100644
  CONFIG_SENSORS_LM75=m
  CONFIG_SENSORS_RASPBERRYPI_HWMON=m
 diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig
-index 95ad3fce074ac..e8b8a09a0eedc 100644
+index 95ad3fce074a..e8b8a09a0eed 100644
 --- a/arch/arm/configs/bcmrpi_defconfig
 +++ b/arch/arm/configs/bcmrpi_defconfig
 @@ -701,6 +701,7 @@ CONFIG_BATTERY_MAX17040=m
@@ -456392,7 +456407,7 @@ index 95ad3fce074ac..e8b8a09a0eedc 100644
  CONFIG_SENSORS_LM75=m
  CONFIG_SENSORS_RASPBERRYPI_HWMON=m
 diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig
-index c30be2d0ddd8a..0855074345211 100644
+index c30be2d0ddd8..085507434521 100644
 --- a/arch/arm64/configs/bcm2711_defconfig
 +++ b/arch/arm64/configs/bcm2711_defconfig
 @@ -716,6 +716,7 @@ CONFIG_BATTERY_MAX17040=m
@@ -456404,7 +456419,7 @@ index c30be2d0ddd8a..0855074345211 100644
  CONFIG_SENSORS_LM75=m
  CONFIG_SENSORS_RASPBERRYPI_HWMON=m
 diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig
-index feca764ecd749..497a14e0a6aa4 100644
+index feca764ecd74..497a14e0a6aa 100644
 --- a/arch/arm64/configs/bcmrpi3_defconfig
 +++ b/arch/arm64/configs/bcmrpi3_defconfig
 @@ -681,6 +681,7 @@ CONFIG_W1_SLAVE_DS28E17=m
@@ -456436,7 +456451,7 @@ Signed-off-by: Annaliese McDermond <nh6z@nh6z.net>
  1 file changed, 8 insertions(+)
 
 diff --git a/arch/arm/boot/dts/overlays/draws-overlay.dts b/arch/arm/boot/dts/overlays/draws-overlay.dts
-index 08bfce0edb239..d18187d7f3437 100644
+index 08bfce0edb23..d18187d7f343 100644
 --- a/arch/arm/boot/dts/overlays/draws-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/draws-overlay.dts
 @@ -45,6 +45,13 @@
@@ -456487,7 +456502,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  2 files changed, 11 insertions(+), 42 deletions(-)
 
 diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.c b/drivers/net/wireless/ath/ath9k/hif_usb.c
-index 2ed98aaed6fb5..edaafa2d4715a 100644
+index 2ed98aaed6fb..edaafa2d4715 100644
 --- a/drivers/net/wireless/ath/ath9k/hif_usb.c
 +++ b/drivers/net/wireless/ath/ath9k/hif_usb.c
 @@ -652,9 +652,9 @@ static void ath9k_hif_usb_rx_stream(struct hif_device_usb *hif_dev,
@@ -456637,7 +456652,7 @@ index 2ed98aaed6fb5..edaafa2d4715a 100644
  	return ret;
  }
 diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.h b/drivers/net/wireless/ath/ath9k/hif_usb.h
-index 5985aa15ca931..a94e7e1c86e98 100644
+index 5985aa15ca93..a94e7e1c86e9 100644
 --- a/drivers/net/wireless/ath/ath9k/hif_usb.h
 +++ b/drivers/net/wireless/ath/ath9k/hif_usb.h
 @@ -86,11 +86,6 @@ struct tx_buf {
@@ -456675,7 +456690,7 @@ Add a fragment to re-enable this in vc4-kms-v3d-pi4-overlay
  2 files changed, 8 insertions(+)
 
 diff --git a/arch/arm/boot/dts/bcm2711-rpi.dtsi b/arch/arm/boot/dts/bcm2711-rpi.dtsi
-index c2c63bbef338d..0d804cc824e0c 100644
+index c2c63bbef338..0d804cc824e0 100644
 --- a/arch/arm/boot/dts/bcm2711-rpi.dtsi
 +++ b/arch/arm/boot/dts/bcm2711-rpi.dtsi
 @@ -46,6 +46,7 @@
@@ -456687,7 +456702,7 @@ index c2c63bbef338d..0d804cc824e0c 100644
  
  		hdmi0: hdmi@7ef00700 {
 diff --git a/arch/arm/boot/dts/overlays/vc4-kms-v3d-pi4-overlay.dts b/arch/arm/boot/dts/overlays/vc4-kms-v3d-pi4-overlay.dts
-index 935e9469e318a..3c662cea4e1f0 100644
+index 935e9469e318..3c662cea4e1f 100644
 --- a/arch/arm/boot/dts/overlays/vc4-kms-v3d-pi4-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/vc4-kms-v3d-pi4-overlay.dts
 @@ -145,6 +145,13 @@
@@ -456720,7 +456735,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  2 files changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig
-index e98d0009a2272..bdad251281a04 100644
+index e98d0009a227..bdad251281a0 100644
 --- a/arch/arm/configs/bcm2711_defconfig
 +++ b/arch/arm/configs/bcm2711_defconfig
 @@ -1187,7 +1187,8 @@ CONFIG_USB_SPEEDTOUCH=m
@@ -456742,7 +456757,7 @@ index e98d0009a2272..bdad251281a04 100644
  CONFIG_IIO=m
  CONFIG_IIO_BUFFER_CB=m
 diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig
-index 0855074345211..7ea2b663bdc06 100644
+index 085507434521..7ea2b663bdc0 100644
 --- a/arch/arm64/configs/bcm2711_defconfig
 +++ b/arch/arm64/configs/bcm2711_defconfig
 @@ -1180,7 +1180,8 @@ CONFIG_USB_SPEEDTOUCH=m
@@ -456782,7 +456797,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  1 file changed, 1 insertion(+)
 
 diff --git a/arch/arm/boot/dts/bcm2711-rpi.dtsi b/arch/arm/boot/dts/bcm2711-rpi.dtsi
-index 0d804cc824e0c..b624ab54ad059 100644
+index 0d804cc824e0..b624ab54ad05 100644
 --- a/arch/arm/boot/dts/bcm2711-rpi.dtsi
 +++ b/arch/arm/boot/dts/bcm2711-rpi.dtsi
 @@ -217,6 +217,7 @@
@@ -456811,7 +456826,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  1 file changed, 6 insertions(+)
 
 diff --git a/arch/arm/boot/dts/overlays/upstream-pi4-overlay.dts b/arch/arm/boot/dts/overlays/upstream-pi4-overlay.dts
-index 30130f09fbc66..d88bbcfc36d10 100644
+index 30130f09fbc6..d88bbcfc36d1 100644
 --- a/arch/arm/boot/dts/overlays/upstream-pi4-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/upstream-pi4-overlay.dts
 @@ -128,6 +128,12 @@
@@ -456887,7 +456902,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  2 files changed, 42 insertions(+), 11 deletions(-)
 
 diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.c b/drivers/net/wireless/ath/ath9k/hif_usb.c
-index edaafa2d4715a..2ed98aaed6fb5 100644
+index edaafa2d4715..2ed98aaed6fb 100644
 --- a/drivers/net/wireless/ath/ath9k/hif_usb.c
 +++ b/drivers/net/wireless/ath/ath9k/hif_usb.c
 @@ -652,9 +652,9 @@ static void ath9k_hif_usb_rx_stream(struct hif_device_usb *hif_dev,
@@ -457037,7 +457052,7 @@ index edaafa2d4715a..2ed98aaed6fb5 100644
  	return ret;
  }
 diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.h b/drivers/net/wireless/ath/ath9k/hif_usb.h
-index a94e7e1c86e98..5985aa15ca931 100644
+index a94e7e1c86e9..5985aa15ca93 100644
 --- a/drivers/net/wireless/ath/ath9k/hif_usb.h
 +++ b/drivers/net/wireless/ath/ath9k/hif_usb.h
 @@ -86,6 +86,11 @@ struct tx_buf {
@@ -457076,7 +457091,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 21 insertions(+), 33 deletions(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
-index 7802020cc3c0e..bafdd12652899 100644
+index 7802020cc3c0..bafdd1265289 100644
 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 @@ -48,7 +48,7 @@ struct vc4_fkms {
@@ -457186,7 +457201,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
-index bafdd12652899..0063d78a1b4a4 100644
+index bafdd1265289..0063d78a1b4a 100644
 --- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
 @@ -816,7 +816,7 @@ static struct drm_plane *vc4_fkms_plane_init(struct drm_device *dev,
@@ -457233,7 +457248,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 1 insertion(+), 16 deletions(-)
 
 diff --git a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-index 3fe81979aaa16..b6c5a66b4b4aa 100644
+index 3fe81979aaa1..b6c5a66b4b4a 100644
 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 @@ -2320,10 +2320,7 @@ static void bcm2835_codec_stop_streaming(struct vb2_queue *q)
@@ -457289,7 +457304,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 19 insertions(+), 4 deletions(-)
 
 diff --git a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-index b6c5a66b4b4aa..427048c0ea31d 100644
+index b6c5a66b4b4a..427048c0ea31 100644
 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 @@ -2268,6 +2268,7 @@ static int bcm2835_codec_start_streaming(struct vb2_queue *q,
@@ -457367,7 +457382,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-index 427048c0ea31d..14c47e2ea9955 100644
+index 427048c0ea31..14c47e2ea995 100644
 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 @@ -2377,13 +2377,15 @@ static void bcm2835_codec_stop_streaming(struct vb2_queue *q)
@@ -457404,7 +457419,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  1 file changed, 1 insertion(+)
 
 diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig
-index 497a14e0a6aa4..65432c8552026 100644
+index 497a14e0a6aa..65432c855202 100644
 --- a/arch/arm64/configs/bcmrpi3_defconfig
 +++ b/arch/arm64/configs/bcmrpi3_defconfig
 @@ -1069,6 +1069,7 @@ CONFIG_USB_SPEEDTOUCH=m
@@ -457429,7 +457444,7 @@ Subject: [PATCH 1074/1225] update rpi-display-overlay.dts pins for 5.4
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/arch/arm/boot/dts/overlays/rpi-display-overlay.dts b/arch/arm/boot/dts/overlays/rpi-display-overlay.dts
-index a5eed07d6a4b4..de87432ff2bea 100644
+index a5eed07d6a4b..de87432ff2be 100644
 --- a/arch/arm/boot/dts/overlays/rpi-display-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/rpi-display-overlay.dts
 @@ -59,9 +59,9 @@
@@ -457504,7 +457519,7 @@ Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
  1 file changed, 9 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/bluetooth/btrtl.c b/drivers/bluetooth/btrtl.c
-index 0dfaf90a31b06..6cfdef7fc4b18 100644
+index 0dfaf90a31b0..6cfdef7fc4b1 100644
 --- a/drivers/bluetooth/btrtl.c
 +++ b/drivers/bluetooth/btrtl.c
 @@ -130,12 +130,19 @@ static const struct id_table ic_id_table[] = {
@@ -457558,7 +457573,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  create mode 100644 arch/arm/boot/dts/overlays/pca953x-overlay.dts
 
 diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile
-index f2e6ea5ffb5ea..91ba5cab2ad36 100644
+index f2e6ea5ffb5e..91ba5cab2ad3 100644
 --- a/arch/arm/boot/dts/overlays/Makefile
 +++ b/arch/arm/boot/dts/overlays/Makefile
 @@ -119,6 +119,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
@@ -457570,7 +457585,7 @@ index f2e6ea5ffb5ea..91ba5cab2ad36 100644
  	piglow.dtbo \
  	piscreen.dtbo \
 diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
-index 0feef88065431..c17128789dbc6 100644
+index 0feef8806543..c17128789dbc 100644
 --- a/arch/arm/boot/dts/overlays/README
 +++ b/arch/arm/boot/dts/overlays/README
 @@ -1873,6 +1873,42 @@ Params: panel                   Display panel (required):
@@ -457618,7 +457633,7 @@ index 0feef88065431..c17128789dbc6 100644
  
 diff --git a/arch/arm/boot/dts/overlays/pca953x-overlay.dts b/arch/arm/boot/dts/overlays/pca953x-overlay.dts
 new file mode 100644
-index 0000000000000..8b6ee44665cee
+index 000000000000..8b6ee44665ce
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/pca953x-overlay.dts
 @@ -0,0 +1,240 @@
@@ -457886,7 +457901,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  1 file changed, 43 insertions(+), 17 deletions(-)
 
 diff --git a/drivers/rtc/rtc-rv3028.c b/drivers/rtc/rtc-rv3028.c
-index 8b2446909a1bb..e02ae4b1cbc2a 100644
+index 8b2446909a1b..e02ae4b1cbc2 100644
 --- a/drivers/rtc/rtc-rv3028.c
 +++ b/drivers/rtc/rtc-rv3028.c
 @@ -18,6 +18,7 @@
@@ -458006,7 +458021,7 @@ Signed-off-by: Einar Vading <einar.vading@rhimagnesita.com>
  1 file changed, 56 insertions(+)
 
 diff --git a/drivers/rtc/rtc-rv3028.c b/drivers/rtc/rtc-rv3028.c
-index e02ae4b1cbc2a..99d10d7ead2f4 100644
+index e02ae4b1cbc2..99d10d7ead2f 100644
 --- a/drivers/rtc/rtc-rv3028.c
 +++ b/drivers/rtc/rtc-rv3028.c
 @@ -66,6 +66,7 @@
@@ -458116,7 +458131,7 @@ Signed-off-by: Thomas Preston <thomas.preston@codethink.co.uk>
  create mode 100644 arch/arm/boot/dts/overlays/pifacedigital-overlay.dts
 
 diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile
-index 91ba5cab2ad36..875532b2fd3c3 100644
+index 91ba5cab2ad3..875532b2fd3c 100644
 --- a/arch/arm/boot/dts/overlays/Makefile
 +++ b/arch/arm/boot/dts/overlays/Makefile
 @@ -121,6 +121,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
@@ -458128,7 +458143,7 @@ index 91ba5cab2ad36..875532b2fd3c3 100644
  	piscreen.dtbo \
  	piscreen2r.dtbo \
 diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
-index c17128789dbc6..253a52b6113d1 100644
+index c17128789dbc..253a52b6113d 100644
 --- a/arch/arm/boot/dts/overlays/README
 +++ b/arch/arm/boot/dts/overlays/README
 @@ -1949,6 +1949,14 @@ Params: alsaname                Set the name as it appears in ALSA (default
@@ -458148,7 +458163,7 @@ index c17128789dbc6..253a52b6113d1 100644
  Load:   dtoverlay=piglow
 diff --git a/arch/arm/boot/dts/overlays/pifacedigital-overlay.dts b/arch/arm/boot/dts/overlays/pifacedigital-overlay.dts
 new file mode 100644
-index 0000000000000..532a858683d6f
+index 000000000000..532a858683d6
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/pifacedigital-overlay.dts
 @@ -0,0 +1,144 @@
@@ -458317,7 +458332,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  5 files changed, 5 insertions(+)
 
 diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig
-index 7860c8e1ffa77..b8aa20368b803 100644
+index 7860c8e1ffa7..b8aa20368b80 100644
 --- a/arch/arm/configs/bcm2709_defconfig
 +++ b/arch/arm/configs/bcm2709_defconfig
 @@ -441,6 +441,7 @@ CONFIG_RFKILL=m
@@ -458329,7 +458344,7 @@ index 7860c8e1ffa77..b8aa20368b803 100644
  CONFIG_DEVTMPFS_MOUNT=y
  CONFIG_MTD=m
 diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig
-index bdad251281a04..c169476f4b5b3 100644
+index bdad251281a0..c169476f4b5b 100644
 --- a/arch/arm/configs/bcm2711_defconfig
 +++ b/arch/arm/configs/bcm2711_defconfig
 @@ -447,6 +447,7 @@ CONFIG_PCIEPORTBUS=y
@@ -458341,7 +458356,7 @@ index bdad251281a04..c169476f4b5b3 100644
  CONFIG_DEVTMPFS_MOUNT=y
  CONFIG_MTD=m
 diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig
-index e8b8a09a0eedc..8e157f06a9f49 100644
+index e8b8a09a0eed..8e157f06a9f4 100644
 --- a/arch/arm/configs/bcmrpi_defconfig
 +++ b/arch/arm/configs/bcmrpi_defconfig
 @@ -431,6 +431,7 @@ CONFIG_RFKILL=m
@@ -458353,7 +458368,7 @@ index e8b8a09a0eedc..8e157f06a9f49 100644
  CONFIG_DEVTMPFS_MOUNT=y
  CONFIG_MTD=m
 diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig
-index 7ea2b663bdc06..1ea1af34c55b6 100644
+index 7ea2b663bdc0..1ea1af34c55b 100644
 --- a/arch/arm64/configs/bcm2711_defconfig
 +++ b/arch/arm64/configs/bcm2711_defconfig
 @@ -443,6 +443,7 @@ CONFIG_NET_9P=m
@@ -458365,7 +458380,7 @@ index 7ea2b663bdc06..1ea1af34c55b6 100644
  CONFIG_DEVTMPFS_MOUNT=y
  CONFIG_MTD=m
 diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig
-index 65432c8552026..9c6ada12bebf3 100644
+index 65432c855202..9c6ada12bebf 100644
 --- a/arch/arm64/configs/bcmrpi3_defconfig
 +++ b/arch/arm64/configs/bcmrpi3_defconfig
 @@ -430,6 +430,7 @@ CONFIG_RFKILL=m
@@ -458391,7 +458406,7 @@ Used recommended ones from Documentation/devicetree/bindings/iio/adc/mcp320x.txt
  1 file changed, 8 insertions(+), 8 deletions(-)
 
 diff --git a/arch/arm/boot/dts/overlays/mcp3008-overlay.dts b/arch/arm/boot/dts/overlays/mcp3008-overlay.dts
-index 0b7d9f75546ef..957fdb9310af4 100755
+index 0b7d9f75546e..957fdb9310af 100755
 --- a/arch/arm/boot/dts/overlays/mcp3008-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/mcp3008-overlay.dts
 @@ -72,7 +72,7 @@
@@ -458481,7 +458496,7 @@ Subject: [PATCH 1082/1225] RESET_CONTROLLER needs to be activated to compile
  1 file changed, 1 insertion(+)
 
 diff --git a/drivers/clk/bcm/Kconfig b/drivers/clk/bcm/Kconfig
-index 03bbd80404514..2d32eeca01538 100644
+index 03bbd8040451..2d32eeca0153 100644
 --- a/drivers/clk/bcm/Kconfig
 +++ b/drivers/clk/bcm/Kconfig
 @@ -5,6 +5,7 @@ config CLK_BCM2835
@@ -458517,7 +458532,7 @@ Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
  1 file changed, 8 insertions(+), 8 deletions(-)
 
 diff --git a/drivers/media/usb/dvb-usb-v2/dvbsky.c b/drivers/media/usb/dvb-usb-v2/dvbsky.c
-index dc380c0c95369..199ba6a8201f8 100644
+index dc380c0c9536..199ba6a8201f 100644
 --- a/drivers/media/usb/dvb-usb-v2/dvbsky.c
 +++ b/drivers/media/usb/dvb-usb-v2/dvbsky.c
 @@ -22,7 +22,6 @@ MODULE_PARM_DESC(disable_rc, "Disable inbuilt IR receiver.");
@@ -458579,7 +458594,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  1 file changed, 4 insertions(+)
 
 diff --git a/arch/arm/boot/dts/bcm2711-rpi.dtsi b/arch/arm/boot/dts/bcm2711-rpi.dtsi
-index b624ab54ad059..0556c73e332aa 100644
+index b624ab54ad05..0556c73e332a 100644
 --- a/arch/arm/boot/dts/bcm2711-rpi.dtsi
 +++ b/arch/arm/boot/dts/bcm2711-rpi.dtsi
 @@ -310,3 +310,7 @@
@@ -458609,7 +458624,7 @@ Signed-off-by: Paul Elder <paul.elder@ideasonboard.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
-index db38649124b77..f3703f2a01438 100644
+index db38649124b7..f3703f2a0143 100644
 --- a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
 +++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
 @@ -733,7 +733,7 @@ static int bcm2835_isp_s_ctrl(struct v4l2_ctrl *ctrl)
@@ -458641,7 +458656,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  1 file changed, 2 deletions(-)
 
 diff --git a/arch/arm/boot/dts/bcm2708.dtsi b/arch/arm/boot/dts/bcm2708.dtsi
-index a32ff21613eda..36ec4989403f5 100644
+index a32ff21613ed..36ec4989403f 100644
 --- a/arch/arm/boot/dts/bcm2708.dtsi
 +++ b/arch/arm/boot/dts/bcm2708.dtsi
 @@ -2,8 +2,6 @@
@@ -458671,7 +458686,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  2 files changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
-index 21b20e334b1a7..5469f5ad4bb37 100644
+index 21b20e334b1a..5469f5ad4bb3 100644
 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
 +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
 @@ -173,6 +173,7 @@
@@ -458683,7 +458698,7 @@ index 21b20e334b1a7..5469f5ad4bb37 100644
  	status = "okay";
  };
 diff --git a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
-index d4ea928e30ce6..823aeeca393de 100644
+index d4ea928e30ce..823aeeca393d 100644
 --- a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
 +++ b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
 @@ -109,9 +109,10 @@
@@ -458721,7 +458736,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  5 files changed, 5 insertions(+)
 
 diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig
-index b8aa20368b803..170d0870a3b0f 100644
+index b8aa20368b80..170d0870a3b0 100644
 --- a/arch/arm/configs/bcm2709_defconfig
 +++ b/arch/arm/configs/bcm2709_defconfig
 @@ -1073,6 +1073,7 @@ CONFIG_HID_ZEROPLUS=m
@@ -458733,7 +458748,7 @@ index b8aa20368b803..170d0870a3b0f 100644
  CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
  CONFIG_USB_MON=m
 diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig
-index c169476f4b5b3..dbeeff9c2a5da 100644
+index c169476f4b5b..dbeeff9c2a5d 100644
 --- a/arch/arm/configs/bcm2711_defconfig
 +++ b/arch/arm/configs/bcm2711_defconfig
 @@ -1087,6 +1087,7 @@ CONFIG_HID_ZEROPLUS=m
@@ -458745,7 +458760,7 @@ index c169476f4b5b3..dbeeff9c2a5da 100644
  CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
  CONFIG_USB_MON=m
 diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig
-index 8e157f06a9f49..41265fbe8ab21 100644
+index 8e157f06a9f4..41265fbe8ab2 100644
 --- a/arch/arm/configs/bcmrpi_defconfig
 +++ b/arch/arm/configs/bcmrpi_defconfig
 @@ -1061,6 +1061,7 @@ CONFIG_HID_ZEROPLUS=m
@@ -458757,7 +458772,7 @@ index 8e157f06a9f49..41265fbe8ab21 100644
  CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
  CONFIG_USB_MON=m
 diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig
-index 1ea1af34c55b6..e8889a89b3c5f 100644
+index 1ea1af34c55b..e8889a89b3c5 100644
 --- a/arch/arm64/configs/bcm2711_defconfig
 +++ b/arch/arm64/configs/bcm2711_defconfig
 @@ -1080,6 +1080,7 @@ CONFIG_HID_ZEROPLUS=m
@@ -458769,7 +458784,7 @@ index 1ea1af34c55b6..e8889a89b3c5f 100644
  CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
  CONFIG_USB_MON=m
 diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig
-index 9c6ada12bebf3..f278668e178d7 100644
+index 9c6ada12bebf..f278668e178d 100644
 --- a/arch/arm64/configs/bcmrpi3_defconfig
 +++ b/arch/arm64/configs/bcmrpi3_defconfig
 @@ -972,6 +972,7 @@ CONFIG_HID_ZEROPLUS=m
@@ -458800,7 +458815,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  2 files changed, 1 insertion(+), 3 deletions(-)
 
 diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
-index 5469f5ad4bb37..21b20e334b1a7 100644
+index 5469f5ad4bb3..21b20e334b1a 100644
 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
 +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
 @@ -173,7 +173,6 @@
@@ -458812,7 +458827,7 @@ index 5469f5ad4bb37..21b20e334b1a7 100644
  	status = "okay";
  };
 diff --git a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
-index 823aeeca393de..d4ea928e30ce6 100644
+index 823aeeca393d..d4ea928e30ce 100644
 --- a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
 +++ b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
 @@ -109,10 +109,9 @@
@@ -458852,7 +458867,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  5 files changed, 5 insertions(+)
 
 diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig
-index 170d0870a3b0f..c6d146029bad5 100644
+index 170d0870a3b0..c6d146029bad 100644
 --- a/arch/arm/configs/bcm2709_defconfig
 +++ b/arch/arm/configs/bcm2709_defconfig
 @@ -1316,6 +1316,7 @@ CONFIG_MCP320X=m
@@ -458864,7 +458879,7 @@ index 170d0870a3b0f..c6d146029bad5 100644
  CONFIG_HDC100X=m
  CONFIG_HTU21=m
 diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig
-index dbeeff9c2a5da..c4620ef40ebd2 100644
+index dbeeff9c2a5d..c4620ef40ebd 100644
 --- a/arch/arm/configs/bcm2711_defconfig
 +++ b/arch/arm/configs/bcm2711_defconfig
 @@ -1352,6 +1352,7 @@ CONFIG_MCP320X=m
@@ -458876,7 +458891,7 @@ index dbeeff9c2a5da..c4620ef40ebd2 100644
  CONFIG_HDC100X=m
  CONFIG_HTU21=m
 diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig
-index 41265fbe8ab21..9789478cc4d17 100644
+index 41265fbe8ab2..9789478cc4d1 100644
 --- a/arch/arm/configs/bcmrpi_defconfig
 +++ b/arch/arm/configs/bcmrpi_defconfig
 @@ -1322,6 +1322,7 @@ CONFIG_MCP320X=m
@@ -458888,7 +458903,7 @@ index 41265fbe8ab21..9789478cc4d17 100644
  CONFIG_HDC100X=m
  CONFIG_HTU21=m
 diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig
-index e8889a89b3c5f..e75e32b63bdae 100644
+index e8889a89b3c5..e75e32b63bda 100644
 --- a/arch/arm64/configs/bcm2711_defconfig
 +++ b/arch/arm64/configs/bcm2711_defconfig
 @@ -1344,6 +1344,7 @@ CONFIG_MCP320X=m
@@ -458900,7 +458915,7 @@ index e8889a89b3c5f..e75e32b63bdae 100644
  CONFIG_HDC100X=m
  CONFIG_HTU21=m
 diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig
-index f278668e178d7..a69ed1899039c 100644
+index f278668e178d..a69ed1899039 100644
 --- a/arch/arm64/configs/bcmrpi3_defconfig
 +++ b/arch/arm64/configs/bcmrpi3_defconfig
 @@ -1197,6 +1197,7 @@ CONFIG_IIO_BUFFER_CB=m
@@ -458927,7 +458942,7 @@ This reverts commit f44019c198fdfea0c880f5e64641b8a43c13e829.
  1 file changed, 1 insertion(+), 6 deletions(-)
 
 diff --git a/drivers/cpufreq/raspberrypi-cpufreq.c b/drivers/cpufreq/raspberrypi-cpufreq.c
-index 8bcfab2749a8d..2bc7d9734272a 100644
+index 8bcfab2749a8..2bc7d9734272 100644
 --- a/drivers/cpufreq/raspberrypi-cpufreq.c
 +++ b/drivers/cpufreq/raspberrypi-cpufreq.c
 @@ -8,7 +8,6 @@
@@ -458973,7 +458988,7 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
  1 file changed, 3 insertions(+)
 
 diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig
-index 9789478cc4d17..d681885c1d2b8 100644
+index 9789478cc4d1..d681885c1d2b 100644
 --- a/arch/arm/configs/bcmrpi_defconfig
 +++ b/arch/arm/configs/bcmrpi_defconfig
 @@ -46,6 +46,9 @@ CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
@@ -459010,7 +459025,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/arch/arm/boot/dts/bcm2835.dtsi b/arch/arm/boot/dts/bcm2835.dtsi
-index 53bf4579cc224..b94d5ec3f332c 100644
+index 53bf4579cc22..b94d5ec3f332 100644
 --- a/arch/arm/boot/dts/bcm2835.dtsi
 +++ b/arch/arm/boot/dts/bcm2835.dtsi
 @@ -18,7 +18,7 @@
@@ -459045,7 +459060,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 7 deletions(-)
 
 diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-index 57c3c5f5db56f..6501fb205e205 100644
+index 57c3c5f5db56..6501fb205e20 100644
 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
 +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
 @@ -708,13 +708,6 @@ static void unicam_wr_dma_addr(struct unicam_device *dev, dma_addr_t dmaaddr,
@@ -459082,7 +459097,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/media/i2c/tc358743.c b/drivers/media/i2c/tc358743.c
-index b3b8d6e15ea2b..eef6ab823c6cb 100644
+index b69eb9fd02c8..3c62eb3b3a1d 100644
 --- a/drivers/media/i2c/tc358743.c
 +++ b/drivers/media/i2c/tc358743.c
 @@ -1731,8 +1731,10 @@ static int tc358743_set_fmt(struct v4l2_subdev *sd,
@@ -459116,7 +459131,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 52 insertions(+), 14 deletions(-)
 
 diff --git a/drivers/media/i2c/ov9281.c b/drivers/media/i2c/ov9281.c
-index bb8efc3d3cba8..9610c24ceff18 100644
+index bb8efc3d3cba..9610c24ceff1 100644
 --- a/drivers/media/i2c/ov9281.c
 +++ b/drivers/media/i2c/ov9281.c
 @@ -29,11 +29,12 @@
@@ -459321,7 +459336,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  rename arch/arm/boot/dts/overlays/{spi0-cs-overlay.dts => spi0-2cs-overlay.dts} (79%)
 
 diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile
-index 875532b2fd3c3..fa92793b2e7f1 100644
+index 875532b2fd3c..fa92793b2e7f 100644
 --- a/arch/arm/boot/dts/overlays/Makefile
 +++ b/arch/arm/boot/dts/overlays/Makefile
 @@ -161,7 +161,8 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
@@ -459335,7 +459350,7 @@ index 875532b2fd3c3..fa92793b2e7f1 100644
  	spi1-2cs.dtbo \
  	spi1-3cs.dtbo \
 diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
-index 253a52b6113d1..a0adf476eafae 100644
+index 253a52b6113d..a0adf476eafa 100644
 --- a/arch/arm/boot/dts/overlays/README
 +++ b/arch/arm/boot/dts/overlays/README
 @@ -2412,11 +2412,27 @@ Load:   dtoverlay=spi-rtc,<param>=<val>
@@ -459370,7 +459385,7 @@ index 253a52b6113d1..a0adf476eafae 100644
  
  Name:   spi0-hw-cs
 diff --git a/arch/arm/boot/dts/overlays/overlay_map.dts b/arch/arm/boot/dts/overlays/overlay_map.dts
-index b15ecc68c149f..22b0ad1738ec6 100644
+index b15ecc68c149..22b0ad1738ec 100644
 --- a/arch/arm/boot/dts/overlays/overlay_map.dts
 +++ b/arch/arm/boot/dts/overlays/overlay_map.dts
 @@ -61,6 +61,10 @@
@@ -459386,7 +459401,7 @@ index b15ecc68c149f..22b0ad1738ec6 100644
  	};
 diff --git a/arch/arm/boot/dts/overlays/spi0-1cs-overlay.dts b/arch/arm/boot/dts/overlays/spi0-1cs-overlay.dts
 new file mode 100644
-index 0000000000000..e6eb66e2076aa
+index 000000000000..e6eb66e2076a
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/spi0-1cs-overlay.dts
 @@ -0,0 +1,42 @@
@@ -459436,7 +459451,7 @@ diff --git a/arch/arm/boot/dts/overlays/spi0-cs-overlay.dts b/arch/arm/boot/dts/
 similarity index 79%
 rename from arch/arm/boot/dts/overlays/spi0-cs-overlay.dts
 rename to arch/arm/boot/dts/overlays/spi0-2cs-overlay.dts
-index ff41439a483af..df6519537c3a8 100644
+index ff41439a483a..df6519537c3a 100644
 --- a/arch/arm/boot/dts/overlays/spi0-cs-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/spi0-2cs-overlay.dts
 @@ -20,10 +20,18 @@
@@ -459475,7 +459490,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
-index a0adf476eafae..e2d90595c3c04 100644
+index a0adf476eafa..e2d90595c3c0 100644
 --- a/arch/arm/boot/dts/overlays/README
 +++ b/arch/arm/boot/dts/overlays/README
 @@ -2430,7 +2430,7 @@ Params: cs0_pin                 GPIO pin for CS0 (default 8)
@@ -459513,7 +459528,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  5 files changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig
-index c6d146029bad5..27baef62e942b 100644
+index c6d146029bad..27baef62e942 100644
 --- a/arch/arm/configs/bcm2709_defconfig
 +++ b/arch/arm/configs/bcm2709_defconfig
 @@ -595,7 +595,7 @@ CONFIG_IEEE802154_MRF24J40=m
@@ -459526,7 +459541,7 @@ index c6d146029bad5..27baef62e942b 100644
  CONFIG_KEYBOARD_GPIO=m
  CONFIG_KEYBOARD_MATRIX=m
 diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig
-index c4620ef40ebd2..165afd913a4ac 100644
+index c4620ef40ebd..165afd913a4a 100644
 --- a/arch/arm/configs/bcm2711_defconfig
 +++ b/arch/arm/configs/bcm2711_defconfig
 @@ -604,7 +604,7 @@ CONFIG_IEEE802154_MRF24J40=m
@@ -459539,7 +459554,7 @@ index c4620ef40ebd2..165afd913a4ac 100644
  CONFIG_KEYBOARD_GPIO=m
  CONFIG_KEYBOARD_MATRIX=m
 diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig
-index d681885c1d2b8..65283969c6f28 100644
+index d681885c1d2b..65283969c6f2 100644
 --- a/arch/arm/configs/bcmrpi_defconfig
 +++ b/arch/arm/configs/bcmrpi_defconfig
 @@ -588,7 +588,7 @@ CONFIG_IEEE802154_MRF24J40=m
@@ -459552,7 +459567,7 @@ index d681885c1d2b8..65283969c6f28 100644
  CONFIG_KEYBOARD_GPIO=m
  CONFIG_KEYBOARD_MATRIX=m
 diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig
-index e75e32b63bdae..977b5ac32fa14 100644
+index e75e32b63bda..977b5ac32fa1 100644
 --- a/arch/arm64/configs/bcm2711_defconfig
 +++ b/arch/arm64/configs/bcm2711_defconfig
 @@ -600,7 +600,7 @@ CONFIG_IEEE802154_MRF24J40=m
@@ -459565,7 +459580,7 @@ index e75e32b63bdae..977b5ac32fa14 100644
  CONFIG_KEYBOARD_GPIO=m
  CONFIG_KEYBOARD_MATRIX=m
 diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig
-index a69ed1899039c..93c935bc9fb64 100644
+index a69ed1899039..93c935bc9fb6 100644
 --- a/arch/arm64/configs/bcmrpi3_defconfig
 +++ b/arch/arm64/configs/bcmrpi3_defconfig
 @@ -579,7 +579,7 @@ CONFIG_IEEE802154_AT86RF230=m
@@ -459608,7 +459623,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  5 files changed, 32 insertions(+), 3 deletions(-)
 
 diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig
-index 27baef62e942b..6f8de700a3b9c 100644
+index 27baef62e942..6f8de700a3b9 100644
 --- a/arch/arm/configs/bcm2709_defconfig
 +++ b/arch/arm/configs/bcm2709_defconfig
 @@ -16,11 +16,13 @@ CONFIG_IKCONFIG=m
@@ -459645,7 +459660,7 @@ index 27baef62e942b..6f8de700a3b9c 100644
  CONFIG_CRYPTO_XCBC=m
  CONFIG_CRYPTO_TGR192=m
 diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig
-index 165afd913a4ac..f0a7ef5d2e673 100644
+index 165afd913a4a..f0a7ef5d2e67 100644
 --- a/arch/arm/configs/bcm2711_defconfig
 +++ b/arch/arm/configs/bcm2711_defconfig
 @@ -16,11 +16,13 @@ CONFIG_IKCONFIG=m
@@ -459681,7 +459696,7 @@ index 165afd913a4ac..f0a7ef5d2e673 100644
  CONFIG_CRYPTO_XCBC=m
  CONFIG_CRYPTO_TGR192=m
 diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig
-index 65283969c6f28..b5585e7c5e6b8 100644
+index 65283969c6f2..b5585e7c5e6b 100644
 --- a/arch/arm/configs/bcmrpi_defconfig
 +++ b/arch/arm/configs/bcmrpi_defconfig
 @@ -15,9 +15,12 @@ CONFIG_IKCONFIG=m
@@ -459717,7 +459732,7 @@ index 65283969c6f28..b5585e7c5e6b8 100644
  CONFIG_CRYPTO_CRYPTD=m
  CONFIG_CRYPTO_CBC=y
 diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig
-index 977b5ac32fa14..1dac44488fe02 100644
+index 977b5ac32fa1..1dac44488fe0 100644
 --- a/arch/arm64/configs/bcm2711_defconfig
 +++ b/arch/arm64/configs/bcm2711_defconfig
 @@ -16,11 +16,13 @@ CONFIG_IKCONFIG=m
@@ -459753,7 +459768,7 @@ index 977b5ac32fa14..1dac44488fe02 100644
  CONFIG_CRYPTO_XCBC=m
  CONFIG_CRYPTO_TGR192=m
 diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig
-index 93c935bc9fb64..e5696e1c86c20 100644
+index 93c935bc9fb6..e5696e1c86c2 100644
 --- a/arch/arm64/configs/bcmrpi3_defconfig
 +++ b/arch/arm64/configs/bcmrpi3_defconfig
 @@ -15,10 +15,13 @@ CONFIG_IKCONFIG=m
@@ -459804,7 +459819,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
-index e2d90595c3c04..9662d297ac6fd 100644
+index e2d90595c3c0..9662d297ac6f 100644
 --- a/arch/arm/boot/dts/overlays/README
 +++ b/arch/arm/boot/dts/overlays/README
 @@ -134,7 +134,7 @@ Params:
@@ -459841,7 +459856,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  3 files changed, 73 insertions(+), 8 deletions(-)
 
 diff --git a/drivers/staging/fbtft/fb_st7735r.c b/drivers/staging/fbtft/fb_st7735r.c
-index 9670a8989b917..1a3219657cbb2 100644
+index 9670a8989b91..1a3219657cbb 100644
 --- a/drivers/staging/fbtft/fb_st7735r.c
 +++ b/drivers/staging/fbtft/fb_st7735r.c
 @@ -16,6 +16,10 @@
@@ -459909,7 +459924,7 @@ index 9670a8989b917..1a3219657cbb2 100644
  MODULE_DESCRIPTION("FB driver for the ST7735R LCD Controller");
  MODULE_AUTHOR("Noralf Tronnes");
 diff --git a/drivers/staging/fbtft/fbtft-core.c b/drivers/staging/fbtft/fbtft-core.c
-index 61f0286fb157e..132692211717c 100644
+index 61f0286fb157..132692211717 100644
 --- a/drivers/staging/fbtft/fbtft-core.c
 +++ b/drivers/staging/fbtft/fbtft-core.c
 @@ -24,6 +24,7 @@
@@ -459961,7 +459976,7 @@ index 61f0286fb157e..132692211717c 100644
  
  	info = fbtft_framebuffer_alloc(display, dev, pdata);
 diff --git a/drivers/staging/fbtft/fbtft.h b/drivers/staging/fbtft/fbtft.h
-index 9b6bdb62093d7..c5703cd5ec7d8 100644
+index 9b6bdb62093d..c5703cd5ec7d 100644
 --- a/drivers/staging/fbtft/fbtft.h
 +++ b/drivers/staging/fbtft/fbtft.h
 @@ -251,7 +251,8 @@ void fbtft_register_backlight(struct fbtft_par *par);
@@ -460053,7 +460068,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  create mode 100644 arch/arm/boot/dts/overlays/sainsmart18-overlay.dts
 
 diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile
-index fa92793b2e7f1..104b0a908f3c2 100644
+index fa92793b2e7f..104b0a908f3c 100644
 --- a/arch/arm/boot/dts/overlays/Makefile
 +++ b/arch/arm/boot/dts/overlays/Makefile
 @@ -4,6 +4,7 @@ dtb-$(CONFIG_ARCH_BCM2835) += overlay_map.dtb
@@ -460073,7 +460088,7 @@ index fa92793b2e7f1..104b0a908f3c2 100644
  	sc16is752-i2c.dtbo \
  	sc16is752-spi0.dtbo \
 diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
-index 9662d297ac6fd..9b28b88fe60f0 100644
+index 9662d297ac6f..9b28b88fe60f 100644
 --- a/arch/arm/boot/dts/overlays/README
 +++ b/arch/arm/boot/dts/overlays/README
 @@ -261,6 +261,14 @@ Params: activelow               Set to "on" to invert the sense of the LED
@@ -460107,7 +460122,7 @@ index 9662d297ac6fd..9b28b88fe60f0 100644
          Enables the chip on I2C1 at 0x48 (or the "addr" parameter value). To
 diff --git a/arch/arm/boot/dts/overlays/adafruit18-overlay.dts b/arch/arm/boot/dts/overlays/adafruit18-overlay.dts
 new file mode 100644
-index 0000000000000..bd2b1315d4441
+index 000000000000..bd2b1315d444
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/adafruit18-overlay.dts
 @@ -0,0 +1,49 @@
@@ -460162,7 +460177,7 @@ index 0000000000000..bd2b1315d4441
 +};
 diff --git a/arch/arm/boot/dts/overlays/sainsmart18-overlay.dts b/arch/arm/boot/dts/overlays/sainsmart18-overlay.dts
 new file mode 100644
-index 0000000000000..38bbe2cfc207a
+index 000000000000..38bbe2cfc207
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/sainsmart18-overlay.dts
 @@ -0,0 +1,47 @@
@@ -460233,7 +460248,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  1 file changed, 4 insertions(+)
 
 diff --git a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
-index e833915a7854d..7dc3ef47e78fd 100644
+index e833915a7854..7dc3ef47e78f 100644
 --- a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
 +++ b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
 @@ -117,6 +117,10 @@
@@ -460273,7 +460288,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  5 files changed, 5 insertions(+)
 
 diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig
-index 6f8de700a3b9c..53557cce75845 100644
+index 6f8de700a3b9..53557cce7584 100644
 --- a/arch/arm/configs/bcm2709_defconfig
 +++ b/arch/arm/configs/bcm2709_defconfig
 @@ -1448,6 +1448,7 @@ CONFIG_SECURITY=y
@@ -460285,7 +460300,7 @@ index 6f8de700a3b9c..53557cce75845 100644
  CONFIG_CRYPTO_TGR192=m
  CONFIG_CRYPTO_WP512=m
 diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig
-index f0a7ef5d2e673..2014e5451ad36 100644
+index f0a7ef5d2e67..2014e5451ad3 100644
 --- a/arch/arm/configs/bcm2711_defconfig
 +++ b/arch/arm/configs/bcm2711_defconfig
 @@ -1486,6 +1486,7 @@ CONFIG_SECURITY=y
@@ -460297,7 +460312,7 @@ index f0a7ef5d2e673..2014e5451ad36 100644
  CONFIG_CRYPTO_TGR192=m
  CONFIG_CRYPTO_WP512=m
 diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig
-index b5585e7c5e6b8..d112db106414f 100644
+index b5585e7c5e6b..d112db106414 100644
 --- a/arch/arm/configs/bcmrpi_defconfig
 +++ b/arch/arm/configs/bcmrpi_defconfig
 @@ -1458,6 +1458,7 @@ CONFIG_SECURITY_APPARMOR=y
@@ -460309,7 +460324,7 @@ index b5585e7c5e6b8..d112db106414f 100644
  CONFIG_CRYPTO_CTS=m
  CONFIG_CRYPTO_XTS=m
 diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig
-index 1dac44488fe02..ba3afaa902b7a 100644
+index 1dac44488fe0..ba3afaa902b7 100644
 --- a/arch/arm64/configs/bcm2711_defconfig
 +++ b/arch/arm64/configs/bcm2711_defconfig
 @@ -1478,6 +1478,7 @@ CONFIG_SECURITY=y
@@ -460321,7 +460336,7 @@ index 1dac44488fe02..ba3afaa902b7a 100644
  CONFIG_CRYPTO_TGR192=m
  CONFIG_CRYPTO_WP512=m
 diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig
-index e5696e1c86c20..a32bad78a0a34 100644
+index e5696e1c86c2..a32bad78a0a3 100644
 --- a/arch/arm64/configs/bcmrpi3_defconfig
 +++ b/arch/arm64/configs/bcmrpi3_defconfig
 @@ -1324,6 +1324,7 @@ CONFIG_SECURITY=y
@@ -460360,7 +460375,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  2 files changed, 21 insertions(+), 1 deletion(-)
 
 diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
-index 9b28b88fe60f0..50d62cef14879 100644
+index 9b28b88fe60f..50d62cef1487 100644
 --- a/arch/arm/boot/dts/overlays/README
 +++ b/arch/arm/boot/dts/overlays/README
 @@ -1354,6 +1354,13 @@ Name:   i2c0
@@ -460378,7 +460393,7 @@ index 9b28b88fe60f0..50d62cef14879 100644
  Params: pins_0_1                Use pins 0 and 1 (default)
          pins_28_29              Use pins 28 and 29
 diff --git a/arch/arm/boot/dts/overlays/i2c0-overlay.dts b/arch/arm/boot/dts/overlays/i2c0-overlay.dts
-index 6b1f9ec6c8782..7c6771f84d8ed 100644
+index 6b1f9ec6c878..7c6771f84d8e 100644
 --- a/arch/arm/boot/dts/overlays/i2c0-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/i2c0-overlay.dts
 @@ -5,7 +5,7 @@
@@ -460440,7 +460455,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  10 files changed, 40 deletions(-)
 
 diff --git a/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts b/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts
-index 0e137d85897b6..98581eec4bdc2 100644
+index 0e137d85897b..98581eec4bdc 100644
 --- a/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts
 +++ b/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts
 @@ -73,10 +73,6 @@
@@ -460455,7 +460470,7 @@ index 0e137d85897b6..98581eec4bdc2 100644
  	pinctrl-names = "default";
  	pinctrl-0 = <&i2c1_pins>;
 diff --git a/arch/arm/boot/dts/bcm2708-rpi-b.dts b/arch/arm/boot/dts/bcm2708-rpi-b.dts
-index 47c093364683b..305f1dbde60fd 100644
+index 47c093364683..305f1dbde60f 100644
 --- a/arch/arm/boot/dts/bcm2708-rpi-b.dts
 +++ b/arch/arm/boot/dts/bcm2708-rpi-b.dts
 @@ -73,10 +73,6 @@
@@ -460470,7 +460485,7 @@ index 47c093364683b..305f1dbde60fd 100644
  	pinctrl-names = "default";
  	pinctrl-0 = <&i2c1_pins>;
 diff --git a/arch/arm/boot/dts/bcm2708-rpi-cm.dts b/arch/arm/boot/dts/bcm2708-rpi-cm.dts
-index 5dcdf8888ec12..93062c4ffad20 100644
+index 5dcdf8888ec1..93062c4ffad2 100644
 --- a/arch/arm/boot/dts/bcm2708-rpi-cm.dts
 +++ b/arch/arm/boot/dts/bcm2708-rpi-cm.dts
 @@ -72,10 +72,6 @@
@@ -460485,7 +460500,7 @@ index 5dcdf8888ec12..93062c4ffad20 100644
  	pinctrl-names = "default";
  	pinctrl-0 = <&i2c1_pins>;
 diff --git a/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts b/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts
-index 0060c9bfe2e68..f1bbed9fbf73c 100644
+index 0060c9bfe2e6..f1bbed9fbf73 100644
 --- a/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts
 +++ b/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts
 @@ -122,10 +122,6 @@
@@ -460500,7 +460515,7 @@ index 0060c9bfe2e68..f1bbed9fbf73c 100644
  	pinctrl-names = "default";
  	pinctrl-0 = <&i2c1_pins>;
 diff --git a/arch/arm/boot/dts/bcm2708-rpi-zero.dts b/arch/arm/boot/dts/bcm2708-rpi-zero.dts
-index 5655eb4769ea9..e7578788b8393 100644
+index 5655eb4769ea..e7578788b839 100644
 --- a/arch/arm/boot/dts/bcm2708-rpi-zero.dts
 +++ b/arch/arm/boot/dts/bcm2708-rpi-zero.dts
 @@ -76,10 +76,6 @@
@@ -460515,7 +460530,7 @@ index 5655eb4769ea9..e7578788b8393 100644
  	pinctrl-names = "default";
  	pinctrl-0 = <&i2c1_pins>;
 diff --git a/arch/arm/boot/dts/bcm2709-rpi-2-b.dts b/arch/arm/boot/dts/bcm2709-rpi-2-b.dts
-index 77678a3d7ef91..6b2e3c291d721 100644
+index 77678a3d7ef9..6b2e3c291d72 100644
 --- a/arch/arm/boot/dts/bcm2709-rpi-2-b.dts
 +++ b/arch/arm/boot/dts/bcm2709-rpi-2-b.dts
 @@ -73,10 +73,6 @@
@@ -460530,7 +460545,7 @@ index 77678a3d7ef91..6b2e3c291d721 100644
  	pinctrl-names = "default";
  	pinctrl-0 = <&i2c1_pins>;
 diff --git a/arch/arm/boot/dts/bcm2710-rpi-2-b.dts b/arch/arm/boot/dts/bcm2710-rpi-2-b.dts
-index dd7e1897ea456..49cfda63606e1 100644
+index dd7e1897ea45..49cfda63606e 100644
 --- a/arch/arm/boot/dts/bcm2710-rpi-2-b.dts
 +++ b/arch/arm/boot/dts/bcm2710-rpi-2-b.dts
 @@ -73,10 +73,6 @@
@@ -460545,7 +460560,7 @@ index dd7e1897ea456..49cfda63606e1 100644
  	pinctrl-names = "default";
  	pinctrl-0 = <&i2c1_pins>;
 diff --git a/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts b/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts
-index 0d6a47118b83e..4e4e471008315 100644
+index 0d6a47118b83..4e4e47100831 100644
 --- a/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts
 +++ b/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts
 @@ -132,10 +132,6 @@
@@ -460560,7 +460575,7 @@ index 0d6a47118b83e..4e4e471008315 100644
  	pinctrl-names = "default";
  	pinctrl-0 = <&i2c1_pins>;
 diff --git a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
-index 7dc3ef47e78fd..8989c00b03e54 100644
+index 7dc3ef47e78f..8989c00b03e5 100644
 --- a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
 +++ b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
 @@ -147,10 +147,6 @@
@@ -460575,7 +460590,7 @@ index 7dc3ef47e78fd..8989c00b03e54 100644
  	pinctrl-names = "default";
  	pinctrl-0 = <&i2c1_pins>;
 diff --git a/arch/arm/boot/dts/bcm2710-rpi-cm3.dts b/arch/arm/boot/dts/bcm2710-rpi-cm3.dts
-index 88f7fe53b97f2..f972979281f52 100644
+index 88f7fe53b97f..f972979281f5 100644
 --- a/arch/arm/boot/dts/bcm2710-rpi-cm3.dts
 +++ b/arch/arm/boot/dts/bcm2710-rpi-cm3.dts
 @@ -92,10 +92,6 @@
@@ -460613,7 +460628,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  2 files changed, 28 insertions(+)
 
 diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
-index 50d62cef14879..3e583922ac0dd 100644
+index 50d62cef1487..3e583922ac0d 100644
 --- a/arch/arm/boot/dts/overlays/README
 +++ b/arch/arm/boot/dts/overlays/README
 @@ -2924,6 +2924,8 @@ Params: cma-256                 CMA is 256MB
@@ -460626,7 +460641,7 @@ index 50d62cef14879..3e583922ac0dd 100644
  
  Name:   vga666
 diff --git a/arch/arm/boot/dts/overlays/vc4-kms-v3d-pi4-overlay.dts b/arch/arm/boot/dts/overlays/vc4-kms-v3d-pi4-overlay.dts
-index 3c662cea4e1f0..f721f12d729d0 100644
+index 3c662cea4e1f..f721f12d729d 100644
 --- a/arch/arm/boot/dts/overlays/vc4-kms-v3d-pi4-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/vc4-kms-v3d-pi4-overlay.dts
 @@ -152,9 +152,35 @@
@@ -460679,7 +460694,7 @@ Subject: [PATCH 1109/1225] minor typo in directions
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/arch/arm/boot/dts/overlays/gpio-fan-overlay.dts b/arch/arm/boot/dts/overlays/gpio-fan-overlay.dts
-index 0b14981b4824e..77a7bbb41e3bd 100644
+index 0b14981b4824..77a7bbb41e3b 100644
 --- a/arch/arm/boot/dts/overlays/gpio-fan-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/gpio-fan-overlay.dts
 @@ -31,7 +31,7 @@
@@ -460706,7 +460721,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  1 file changed, 12 insertions(+)
 
 diff --git a/arch/arm/boot/dts/overlays/upstream-pi4-overlay.dts b/arch/arm/boot/dts/overlays/upstream-pi4-overlay.dts
-index d88bbcfc36d10..5673f61b79518 100644
+index d88bbcfc36d1..5673f61b7951 100644
 --- a/arch/arm/boot/dts/overlays/upstream-pi4-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/upstream-pi4-overlay.dts
 @@ -134,6 +134,18 @@
@@ -460747,7 +460762,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  3 files changed, 30 insertions(+), 4 deletions(-)
 
 diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
-index 3e583922ac0dd..9d21a3eb21dce 100644
+index 3e583922ac0d..9d21a3eb21dc 100644
 --- a/arch/arm/boot/dts/overlays/README
 +++ b/arch/arm/boot/dts/overlays/README
 @@ -267,6 +267,13 @@ Info:   Overlay for the SPI-connected Adafruit 1.8" display (based on the
@@ -460778,7 +460793,7 @@ index 3e583922ac0dd..9d21a3eb21dce 100644
  
  Name:   sc16is750-i2c
 diff --git a/arch/arm/boot/dts/overlays/adafruit18-overlay.dts b/arch/arm/boot/dts/overlays/adafruit18-overlay.dts
-index bd2b1315d4441..aae485ab7d6ce 100644
+index bd2b1315d444..aae485ab7d6c 100644
 --- a/arch/arm/boot/dts/overlays/adafruit18-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/adafruit18-overlay.dts
 @@ -33,7 +33,7 @@
@@ -460806,7 +460821,7 @@ index bd2b1315d4441..aae485ab7d6ce 100644
  	};
  };
 diff --git a/arch/arm/boot/dts/overlays/sainsmart18-overlay.dts b/arch/arm/boot/dts/overlays/sainsmart18-overlay.dts
-index 38bbe2cfc207a..ce2f942ba3162 100644
+index 38bbe2cfc207..ce2f942ba316 100644
 --- a/arch/arm/boot/dts/overlays/sainsmart18-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/sainsmart18-overlay.dts
 @@ -33,7 +33,7 @@
@@ -460847,7 +460862,7 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/staging/media/rpivid/rpivid_h265.c b/drivers/staging/media/rpivid/rpivid_h265.c
-index 47d4de42c5844..b677910e237c6 100644
+index 47d4de42c584..b677910e237c 100644
 --- a/drivers/staging/media/rpivid/rpivid_h265.c
 +++ b/drivers/staging/media/rpivid/rpivid_h265.c
 @@ -2178,7 +2178,7 @@ static int rpivid_h265_start(struct rpivid_ctx *ctx)
@@ -460875,7 +460890,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  2 files changed, 24 insertions(+), 4 deletions(-)
 
 diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
-index 9d21a3eb21dce..afd40f84a342d 100644
+index 9d21a3eb21dc..afd40f84a342 100644
 --- a/arch/arm/boot/dts/overlays/README
 +++ b/arch/arm/boot/dts/overlays/README
 @@ -582,7 +582,11 @@ Name:   cma
@@ -460931,7 +460946,7 @@ index 9d21a3eb21dce..afd40f84a342d 100644
          cma-128                 CMA is 128MB
          cma-96                  CMA is 96MB
 diff --git a/arch/arm/boot/dts/overlays/cma-overlay.dts b/arch/arm/boot/dts/overlays/cma-overlay.dts
-index 4fbdf161672e3..1d87c599f909d 100644
+index 4fbdf161672e..1d87c599f909 100644
 --- a/arch/arm/boot/dts/overlays/cma-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/cma-overlay.dts
 @@ -21,6 +21,10 @@
@@ -460960,7 +460975,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  1 file changed, 16 insertions(+), 16 deletions(-)
 
 diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
-index afd40f84a342d..5118f477cc13e 100644
+index afd40f84a342..5118f477cc13 100644
 --- a/arch/arm/boot/dts/overlays/README
 +++ b/arch/arm/boot/dts/overlays/README
 @@ -1403,7 +1403,7 @@ Load:   <Deprecated>
@@ -461119,7 +461134,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  3 files changed, 2 insertions(+), 4 deletions(-)
 
 diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
-index 5118f477cc13e..8df8283a7677f 100644
+index 5118f477cc13..8df8283a7677 100644
 --- a/arch/arm/boot/dts/overlays/README
 +++ b/arch/arm/boot/dts/overlays/README
 @@ -269,7 +269,7 @@ Params: green                   Use the adafruit18_green variant.
@@ -461141,7 +461156,7 @@ index 5118f477cc13e..8df8283a7677f 100644
          dc_pin                  GPIO pin for D/C (default 24)
          reset_pin               GPIO pin for RESET (default 25)
 diff --git a/arch/arm/boot/dts/overlays/adafruit18-overlay.dts b/arch/arm/boot/dts/overlays/adafruit18-overlay.dts
-index aae485ab7d6ce..e1ce94a8cd3e2 100644
+index aae485ab7d6c..e1ce94a8cd3e 100644
 --- a/arch/arm/boot/dts/overlays/adafruit18-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/adafruit18-overlay.dts
 @@ -36,7 +36,6 @@
@@ -461153,7 +461168,7 @@ index aae485ab7d6ce..e1ce94a8cd3e2 100644
  			};
  		};
 diff --git a/arch/arm/boot/dts/overlays/sainsmart18-overlay.dts b/arch/arm/boot/dts/overlays/sainsmart18-overlay.dts
-index ce2f942ba3162..c51f1c030a557 100644
+index ce2f942ba316..c51f1c030a55 100644
 --- a/arch/arm/boot/dts/overlays/sainsmart18-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/sainsmart18-overlay.dts
 @@ -35,7 +35,6 @@
@@ -461186,7 +461201,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  5 files changed, 5 insertions(+)
 
 diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig
-index 53557cce75845..d2e674b2637e8 100644
+index 53557cce7584..d2e674b2637e 100644
 --- a/arch/arm/configs/bcm2709_defconfig
 +++ b/arch/arm/configs/bcm2709_defconfig
 @@ -671,6 +671,7 @@ CONFIG_I2C_MUX_PCA954x=m
@@ -461198,7 +461213,7 @@ index 53557cce75845..d2e674b2637e8 100644
  CONFIG_I2C_ROBOTFUZZ_OSIF=m
  CONFIG_I2C_TINY_USB=m
 diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig
-index 2014e5451ad36..be6b167f6b4f3 100644
+index 2014e5451ad3..be6b167f6b4f 100644
 --- a/arch/arm/configs/bcm2711_defconfig
 +++ b/arch/arm/configs/bcm2711_defconfig
 @@ -681,6 +681,7 @@ CONFIG_I2C_MUX_PCA954x=m
@@ -461210,7 +461225,7 @@ index 2014e5451ad36..be6b167f6b4f3 100644
  CONFIG_I2C_ROBOTFUZZ_OSIF=m
  CONFIG_I2C_TINY_USB=m
 diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig
-index d112db106414f..23a0cb2d3ee32 100644
+index d112db106414..23a0cb2d3ee3 100644
 --- a/arch/arm/configs/bcmrpi_defconfig
 +++ b/arch/arm/configs/bcmrpi_defconfig
 @@ -665,6 +665,7 @@ CONFIG_I2C_MUX_PCA954x=m
@@ -461222,7 +461237,7 @@ index d112db106414f..23a0cb2d3ee32 100644
  CONFIG_I2C_ROBOTFUZZ_OSIF=m
  CONFIG_I2C_TINY_USB=m
 diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig
-index ba3afaa902b7a..31655187154fb 100644
+index ba3afaa902b7..31655187154f 100644
 --- a/arch/arm64/configs/bcm2711_defconfig
 +++ b/arch/arm64/configs/bcm2711_defconfig
 @@ -676,6 +676,7 @@ CONFIG_I2C_MUX_PCA954x=m
@@ -461234,7 +461249,7 @@ index ba3afaa902b7a..31655187154fb 100644
  CONFIG_I2C_ROBOTFUZZ_OSIF=m
  CONFIG_I2C_TINY_USB=m
 diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig
-index a32bad78a0a34..7f159969011eb 100644
+index a32bad78a0a3..7f159969011e 100644
 --- a/arch/arm64/configs/bcmrpi3_defconfig
 +++ b/arch/arm64/configs/bcmrpi3_defconfig
 @@ -652,6 +652,7 @@ CONFIG_I2C_MUX_PCA954x=m
@@ -461274,7 +461289,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  1 file changed, 12 insertions(+), 4 deletions(-)
 
 diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
-index aba145a144b46..d17f2a229ab9f 100644
+index aba145a144b4..d17f2a229ab9 100644
 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
 +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
 @@ -2789,7 +2789,7 @@ static void bcmgenet_set_hw_addr(struct bcmgenet_priv *priv,
@@ -461345,7 +461360,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/sound/soc/codecs/cs42xx8-i2c.c b/sound/soc/codecs/cs42xx8-i2c.c
-index a4586ea4acf6e..b8b15b886c224 100644
+index a4586ea4acf6..b8b15b886c22 100644
 --- a/sound/soc/codecs/cs42xx8-i2c.c
 +++ b/sound/soc/codecs/cs42xx8-i2c.c
 @@ -45,18 +45,18 @@ static struct i2c_device_id cs42xx8_i2c_id[] = {
@@ -461387,7 +461402,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  3 files changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig
-index d2e674b2637e8..0862670c700c3 100644
+index d2e674b2637e..0862670c700c 100644
 --- a/arch/arm/configs/bcm2709_defconfig
 +++ b/arch/arm/configs/bcm2709_defconfig
 @@ -671,7 +671,7 @@ CONFIG_I2C_MUX_PCA954x=m
@@ -461400,7 +461415,7 @@ index d2e674b2637e8..0862670c700c3 100644
  CONFIG_I2C_ROBOTFUZZ_OSIF=m
  CONFIG_I2C_TINY_USB=m
 diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig
-index 23a0cb2d3ee32..1dbac6d45cfea 100644
+index 23a0cb2d3ee3..1dbac6d45cfe 100644
 --- a/arch/arm/configs/bcmrpi_defconfig
 +++ b/arch/arm/configs/bcmrpi_defconfig
 @@ -665,7 +665,7 @@ CONFIG_I2C_MUX_PCA954x=m
@@ -461413,7 +461428,7 @@ index 23a0cb2d3ee32..1dbac6d45cfea 100644
  CONFIG_I2C_ROBOTFUZZ_OSIF=m
  CONFIG_I2C_TINY_USB=m
 diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig
-index 7f159969011eb..c838461038e6d 100644
+index 7f159969011e..c838461038e6 100644
 --- a/arch/arm64/configs/bcmrpi3_defconfig
 +++ b/arch/arm64/configs/bcmrpi3_defconfig
 @@ -652,7 +652,7 @@ CONFIG_I2C_MUX_PCA954x=m
@@ -461443,7 +461458,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-index 14c47e2ea9955..f3dfc7fda8849 100644
+index 14c47e2ea995..f3dfc7fda884 100644
 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 @@ -89,6 +89,9 @@ static const char * const components[] = {
@@ -461490,7 +461505,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-index f3dfc7fda8849..b1e00e65ce186 100644
+index f3dfc7fda884..b1e00e65ce18 100644
 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 @@ -2290,7 +2290,7 @@ static int bcm2835_codec_start_streaming(struct vb2_queue *q,
@@ -461517,10 +461532,10 @@ When operating as a USB device, when the device is disconnected the suspend inte
  1 file changed, 4 insertions(+), 7 deletions(-)
 
 diff --git a/drivers/usb/dwc2/core_intr.c b/drivers/usb/dwc2/core_intr.c
-index 6272b4ae4740f..11c8893fbc1ab 100644
+index 44d74584c727..081d3493fbea 100644
 --- a/drivers/usb/dwc2/core_intr.c
 +++ b/drivers/usb/dwc2/core_intr.c
-@@ -538,14 +538,11 @@ static void dwc2_handle_usb_suspend_intr(struct dwc2_hsotg *hsotg)
+@@ -546,14 +546,11 @@ static void dwc2_handle_usb_suspend_intr(struct dwc2_hsotg *hsotg)
  						__func__);
  			}
  skip_power_saving:
@@ -461559,7 +461574,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  1 file changed, 17 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/usb/gadget/function/f_hid.c b/drivers/usb/gadget/function/f_hid.c
-index f3816a5c861ee..00fae22e941a9 100644
+index 0586229ac83d..2dbd5b4b29ef 100644
 --- a/drivers/usb/gadget/function/f_hid.c
 +++ b/drivers/usb/gadget/function/f_hid.c
 @@ -344,6 +344,11 @@ static ssize_t f_hidg_write(struct file *file, const char __user *buffer,
@@ -461616,7 +461631,7 @@ My hy28b TFT stopped working on upgrade to 5.4 kernel.  I had a whitescreen but 
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/arch/arm/boot/dts/overlays/hy28b-overlay.dts b/arch/arm/boot/dts/overlays/hy28b-overlay.dts
-index 2e5e20f327a3c..9edd0848d5550 100644
+index 2e5e20f327a3..9edd0848d555 100644
 --- a/arch/arm/boot/dts/overlays/hy28b-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/hy28b-overlay.dts
 @@ -61,7 +61,7 @@
@@ -461661,7 +461676,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  11 files changed, 16 insertions(+), 16 deletions(-)
 
 diff --git a/arch/arm/boot/dts/overlays/goodix-overlay.dts b/arch/arm/boot/dts/overlays/goodix-overlay.dts
-index 8571527de49a6..a11d65f81c5ed 100644
+index 8571527de49a..a11d65f81c5e 100644
 --- a/arch/arm/boot/dts/overlays/goodix-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/goodix-overlay.dts
 @@ -31,7 +31,7 @@
@@ -461674,7 +461689,7 @@ index 8571527de49a6..a11d65f81c5ed 100644
  		};
  	};
 diff --git a/arch/arm/boot/dts/overlays/hy28a-overlay.dts b/arch/arm/boot/dts/overlays/hy28a-overlay.dts
-index aa6463e6e7497..5843a5e9c86a4 100644
+index aa6463e6e749..5843a5e9c86a 100644
 --- a/arch/arm/boot/dts/overlays/hy28a-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/hy28a-overlay.dts
 @@ -61,7 +61,7 @@
@@ -461687,7 +461702,7 @@ index aa6463e6e7497..5843a5e9c86a4 100644
  				debug = <0>;
  			};
 diff --git a/arch/arm/boot/dts/overlays/hy28b-2017-overlay.dts b/arch/arm/boot/dts/overlays/hy28b-2017-overlay.dts
-index 42b68b684bd0a..95bfb1eadc208 100644
+index 42b68b684bd0..95bfb1eadc20 100644
 --- a/arch/arm/boot/dts/overlays/hy28b-2017-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/hy28b-2017-overlay.dts
 @@ -61,7 +61,7 @@
@@ -461700,7 +461715,7 @@ index 42b68b684bd0a..95bfb1eadc208 100644
  
  				init = <0x10000e5 0x78F0
 diff --git a/arch/arm/boot/dts/overlays/media-center-overlay.dts b/arch/arm/boot/dts/overlays/media-center-overlay.dts
-index 0fcdcfa18eb3b..1b56963f4f16b 100644
+index 0fcdcfa18eb3..1b56963f4f16 100644
 --- a/arch/arm/boot/dts/overlays/media-center-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/media-center-overlay.dts
 @@ -53,9 +53,9 @@
@@ -461725,7 +461740,7 @@ index 0fcdcfa18eb3b..1b56963f4f16b 100644
  				ti,pressure-max = /bits/ 16 <255>;
  			};
 diff --git a/arch/arm/boot/dts/overlays/mz61581-overlay.dts b/arch/arm/boot/dts/overlays/mz61581-overlay.dts
-index 32686968c0d65..6e00e8b2ddf2a 100644
+index 32686968c0d6..6e00e8b2ddf2 100644
 --- a/arch/arm/boot/dts/overlays/mz61581-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/mz61581-overlay.dts
 @@ -65,7 +65,7 @@
@@ -461738,7 +461753,7 @@ index 32686968c0d65..6e00e8b2ddf2a 100644
  				led-gpios = <&gpio 18 0>;
  
 diff --git a/arch/arm/boot/dts/overlays/piscreen-overlay.dts b/arch/arm/boot/dts/overlays/piscreen-overlay.dts
-index ae1af76d3923f..1ac75a248fab5 100644
+index ae1af76d3923..1ac75a248fab 100644
 --- a/arch/arm/boot/dts/overlays/piscreen-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/piscreen-overlay.dts
 @@ -59,9 +59,9 @@
@@ -461754,7 +461769,7 @@ index ae1af76d3923f..1ac75a248fab5 100644
  
  				init = <0x10000b0 0x00
 diff --git a/arch/arm/boot/dts/overlays/piscreen2r-overlay.dts b/arch/arm/boot/dts/overlays/piscreen2r-overlay.dts
-index 93b85be3f7c15..9d2b51101969e 100644
+index 93b85be3f7c1..9d2b51101969 100644
 --- a/arch/arm/boot/dts/overlays/piscreen2r-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/piscreen2r-overlay.dts
 @@ -59,9 +59,9 @@
@@ -461770,7 +461785,7 @@ index 93b85be3f7c15..9d2b51101969e 100644
  
                                  init = <0x10000b0 0x00
 diff --git a/arch/arm/boot/dts/overlays/sh1106-spi-overlay.dts b/arch/arm/boot/dts/overlays/sh1106-spi-overlay.dts
-index 70d7bb6faee94..57a0cc9b17410 100644
+index 70d7bb6faee9..57a0cc9b1741 100644
 --- a/arch/arm/boot/dts/overlays/sh1106-spi-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/sh1106-spi-overlay.dts
 @@ -59,7 +59,7 @@
@@ -461783,7 +461798,7 @@ index 70d7bb6faee94..57a0cc9b17410 100644
  				debug = <0>;
  
 diff --git a/arch/arm/boot/dts/overlays/ssd1306-spi-overlay.dts b/arch/arm/boot/dts/overlays/ssd1306-spi-overlay.dts
-index 74635705273eb..ffc90c7cecf66 100644
+index 74635705273e..ffc90c7cecf6 100644
 --- a/arch/arm/boot/dts/overlays/ssd1306-spi-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/ssd1306-spi-overlay.dts
 @@ -59,7 +59,7 @@
@@ -461796,7 +461811,7 @@ index 74635705273eb..ffc90c7cecf66 100644
  				debug = <0>;
  
 diff --git a/arch/arm/boot/dts/overlays/ssd1351-spi-overlay.dts b/arch/arm/boot/dts/overlays/ssd1351-spi-overlay.dts
-index 0eb1451b36c07..ffc872c60648f 100644
+index 0eb1451b36c0..ffc872c60648 100644
 --- a/arch/arm/boot/dts/overlays/ssd1351-spi-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/ssd1351-spi-overlay.dts
 @@ -59,7 +59,7 @@
@@ -461809,7 +461824,7 @@ index 0eb1451b36c07..ffc872c60648f 100644
  				debug = <0>;
  
 diff --git a/arch/arm/boot/dts/overlays/tinylcd35-overlay.dts b/arch/arm/boot/dts/overlays/tinylcd35-overlay.dts
-index 254ac2e0a2144..a102b09e3ab56 100644
+index 254ac2e0a214..a102b09e3ab5 100644
 --- a/arch/arm/boot/dts/overlays/tinylcd35-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/tinylcd35-overlay.dts
 @@ -85,9 +85,9 @@
@@ -461844,7 +461859,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  1 file changed, 2 deletions(-)
 
 diff --git a/drivers/usb/gadget/function/f_hid.c b/drivers/usb/gadget/function/f_hid.c
-index 00fae22e941a9..4670ad21402db 100644
+index 2dbd5b4b29ef..3f7f6adc3867 100644
 --- a/drivers/usb/gadget/function/f_hid.c
 +++ b/drivers/usb/gadget/function/f_hid.c
 @@ -411,8 +411,6 @@ static ssize_t f_hidg_write(struct file *file, const char __user *buffer,
@@ -461879,7 +461894,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  5 files changed, 5 insertions(+)
 
 diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig
-index 0862670c700c3..2c44682484bf5 100644
+index 0862670c700c..2c44682484bf 100644
 --- a/arch/arm/configs/bcm2709_defconfig
 +++ b/arch/arm/configs/bcm2709_defconfig
 @@ -1241,6 +1241,7 @@ CONFIG_RTC_DRV_RX8581=m
@@ -461891,7 +461906,7 @@ index 0862670c700c3..2c44682484bf5 100644
  CONFIG_RTC_DRV_M41T94=m
  CONFIG_RTC_DRV_DS1302=m
 diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig
-index be6b167f6b4f3..9e1b4b9a19a5f 100644
+index be6b167f6b4f..9e1b4b9a19a5 100644
 --- a/arch/arm/configs/bcm2711_defconfig
 +++ b/arch/arm/configs/bcm2711_defconfig
 @@ -1277,6 +1277,7 @@ CONFIG_RTC_DRV_RX8581=m
@@ -461903,7 +461918,7 @@ index be6b167f6b4f3..9e1b4b9a19a5f 100644
  CONFIG_RTC_DRV_M41T94=m
  CONFIG_RTC_DRV_DS1302=m
 diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig
-index 1dbac6d45cfea..e3b5ef7aa8765 100644
+index 1dbac6d45cfe..e3b5ef7aa876 100644
 --- a/arch/arm/configs/bcmrpi_defconfig
 +++ b/arch/arm/configs/bcmrpi_defconfig
 @@ -1251,6 +1251,7 @@ CONFIG_RTC_DRV_RX8581=m
@@ -461915,7 +461930,7 @@ index 1dbac6d45cfea..e3b5ef7aa8765 100644
  CONFIG_RTC_DRV_M41T94=m
  CONFIG_RTC_DRV_DS1302=m
 diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig
-index 31655187154fb..006cc2f760b3e 100644
+index 31655187154f..006cc2f760b3 100644
 --- a/arch/arm64/configs/bcm2711_defconfig
 +++ b/arch/arm64/configs/bcm2711_defconfig
 @@ -1270,6 +1270,7 @@ CONFIG_RTC_DRV_RX8581=m
@@ -461927,7 +461942,7 @@ index 31655187154fb..006cc2f760b3e 100644
  CONFIG_RTC_DRV_M41T94=m
  CONFIG_RTC_DRV_DS1302=m
 diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig
-index c838461038e6d..ee15660f83061 100644
+index c838461038e6..ee15660f8306 100644
 --- a/arch/arm64/configs/bcmrpi3_defconfig
 +++ b/arch/arm64/configs/bcmrpi3_defconfig
 @@ -1128,6 +1128,7 @@ CONFIG_RTC_DRV_RX8581=m
@@ -461958,7 +461973,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  2 files changed, 18 insertions(+)
 
 diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
-index 8df8283a7677f..0c33d39f6f3aa 100644
+index 8df8283a7677..0c33d39f6f3a 100644
 --- a/arch/arm/boot/dts/overlays/README
 +++ b/arch/arm/boot/dts/overlays/README
 @@ -1232,6 +1232,8 @@ Params: abx80x                  Select one of the ABx80x family:
@@ -461971,7 +461986,7 @@ index 8df8283a7677f..0c33d39f6f3aa 100644
                                  device must be configured to use the specified
                                  address.
 diff --git a/arch/arm/boot/dts/overlays/i2c-rtc-overlay.dts b/arch/arm/boot/dts/overlays/i2c-rtc-overlay.dts
-index df59d93cd759b..735ca303e4fa7 100644
+index df59d93cd759..735ca303e4fa 100644
 --- a/arch/arm/boot/dts/overlays/i2c-rtc-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/i2c-rtc-overlay.dts
 @@ -220,6 +220,21 @@
@@ -462029,7 +462044,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  5 files changed, 10 insertions(+)
 
 diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig
-index 2c44682484bf5..021985dcc1fd6 100644
+index 2c44682484bf..021985dcc1fd 100644
 --- a/arch/arm/configs/bcm2709_defconfig
 +++ b/arch/arm/configs/bcm2709_defconfig
 @@ -953,6 +953,8 @@ CONFIG_LOGO=y
@@ -462042,7 +462057,7 @@ index 2c44682484bf5..021985dcc1fd6 100644
  CONFIG_SND_SEQUENCER=m
  CONFIG_SND_SEQ_DUMMY=m
 diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig
-index 9e1b4b9a19a5f..52129a7606798 100644
+index 9e1b4b9a19a5..52129a760679 100644
 --- a/arch/arm/configs/bcm2711_defconfig
 +++ b/arch/arm/configs/bcm2711_defconfig
 @@ -967,6 +967,8 @@ CONFIG_LOGO=y
@@ -462055,7 +462070,7 @@ index 9e1b4b9a19a5f..52129a7606798 100644
  CONFIG_SND_SEQUENCER=m
  CONFIG_SND_SEQ_DUMMY=m
 diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig
-index e3b5ef7aa8765..985fa8a129264 100644
+index e3b5ef7aa876..985fa8a12926 100644
 --- a/arch/arm/configs/bcmrpi_defconfig
 +++ b/arch/arm/configs/bcmrpi_defconfig
 @@ -945,6 +945,8 @@ CONFIG_LOGO=y
@@ -462068,7 +462083,7 @@ index e3b5ef7aa8765..985fa8a129264 100644
  CONFIG_SND_SEQUENCER=m
  CONFIG_SND_SEQ_DUMMY=m
 diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig
-index 006cc2f760b3e..9557b03fac1b4 100644
+index 006cc2f760b3..9557b03fac1b 100644
 --- a/arch/arm64/configs/bcm2711_defconfig
 +++ b/arch/arm64/configs/bcm2711_defconfig
 @@ -960,6 +960,8 @@ CONFIG_LOGO=y
@@ -462081,7 +462096,7 @@ index 006cc2f760b3e..9557b03fac1b4 100644
  CONFIG_SND_SEQUENCER=m
  CONFIG_SND_SEQ_DUMMY=m
 diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig
-index ee15660f83061..32fbcba060987 100644
+index ee15660f8306..32fbcba06098 100644
 --- a/arch/arm64/configs/bcmrpi3_defconfig
 +++ b/arch/arm64/configs/bcmrpi3_defconfig
 @@ -869,6 +869,8 @@ CONFIG_LOGO=y
@@ -462113,10 +462128,10 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  1 file changed, 7 insertions(+), 4 deletions(-)
 
 diff --git a/drivers/usb/dwc2/core_intr.c b/drivers/usb/dwc2/core_intr.c
-index 11c8893fbc1ab..6272b4ae4740f 100644
+index 081d3493fbea..44d74584c727 100644
 --- a/drivers/usb/dwc2/core_intr.c
 +++ b/drivers/usb/dwc2/core_intr.c
-@@ -538,11 +538,14 @@ static void dwc2_handle_usb_suspend_intr(struct dwc2_hsotg *hsotg)
+@@ -546,11 +546,14 @@ static void dwc2_handle_usb_suspend_intr(struct dwc2_hsotg *hsotg)
  						__func__);
  			}
  skip_power_saving:
@@ -462159,7 +462174,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  5 files changed, 10 insertions(+)
 
 diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig
-index 021985dcc1fd6..7368dff25c5c6 100644
+index 021985dcc1fd..7368dff25c5c 100644
 --- a/arch/arm/configs/bcm2709_defconfig
 +++ b/arch/arm/configs/bcm2709_defconfig
 @@ -15,6 +15,8 @@ CONFIG_TASK_IO_ACCOUNTING=y
@@ -462172,7 +462187,7 @@ index 021985dcc1fd6..7368dff25c5c6 100644
  CONFIG_CFS_BANDWIDTH=y
  CONFIG_CGROUP_PIDS=y
 diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig
-index 52129a7606798..efacba968d3fe 100644
+index 52129a760679..efacba968d3f 100644
 --- a/arch/arm/configs/bcm2711_defconfig
 +++ b/arch/arm/configs/bcm2711_defconfig
 @@ -15,6 +15,8 @@ CONFIG_TASK_IO_ACCOUNTING=y
@@ -462185,7 +462200,7 @@ index 52129a7606798..efacba968d3fe 100644
  CONFIG_CFS_BANDWIDTH=y
  CONFIG_CGROUP_PIDS=y
 diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig
-index 985fa8a129264..e2e2168cd3f22 100644
+index 985fa8a12926..e2e2168cd3f2 100644
 --- a/arch/arm/configs/bcmrpi_defconfig
 +++ b/arch/arm/configs/bcmrpi_defconfig
 @@ -14,6 +14,8 @@ CONFIG_TASK_IO_ACCOUNTING=y
@@ -462198,7 +462213,7 @@ index 985fa8a129264..e2e2168cd3f22 100644
  CONFIG_CFS_BANDWIDTH=y
  CONFIG_CGROUP_PIDS=y
 diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig
-index 9557b03fac1b4..3dcc4ead364e5 100644
+index 9557b03fac1b..3dcc4ead364e 100644
 --- a/arch/arm64/configs/bcm2711_defconfig
 +++ b/arch/arm64/configs/bcm2711_defconfig
 @@ -15,6 +15,8 @@ CONFIG_TASK_IO_ACCOUNTING=y
@@ -462211,7 +462226,7 @@ index 9557b03fac1b4..3dcc4ead364e5 100644
  CONFIG_CFS_BANDWIDTH=y
  CONFIG_CGROUP_PIDS=y
 diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig
-index 32fbcba060987..6d9c9978ccb7e 100644
+index 32fbcba06098..6d9c9978ccb7 100644
 --- a/arch/arm64/configs/bcmrpi3_defconfig
 +++ b/arch/arm64/configs/bcmrpi3_defconfig
 @@ -14,6 +14,8 @@ CONFIG_TASK_IO_ACCOUNTING=y
@@ -462247,7 +462262,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
  1 file changed, 4 insertions(+)
 
 diff --git a/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c b/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c
-index 2823dc9af63f1..4503af692aefe 100644
+index 2823dc9af63f..4503af692aef 100644
 --- a/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c
 +++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c
 @@ -689,7 +689,11 @@ int dwc_otg_hcd_qh_add(dwc_otg_hcd_t * hcd, dwc_otg_qh_t * qh)
@@ -462280,7 +462295,7 @@ Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
  2 files changed, 2 insertions(+)
 
 diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig
-index 3dcc4ead364e5..7d7a62f805873 100644
+index 3dcc4ead364e..7d7a62f80587 100644
 --- a/arch/arm64/configs/bcm2711_defconfig
 +++ b/arch/arm64/configs/bcm2711_defconfig
 @@ -899,6 +899,7 @@ CONFIG_VIDEO_EM28XX_V4L2=m
@@ -462292,7 +462307,7 @@ index 3dcc4ead364e5..7d7a62f805873 100644
  CONFIG_USB_SI470X=m
  CONFIG_I2C_SI470X=m
 diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig
-index 6d9c9978ccb7e..fceaba1e6630e 100644
+index 6d9c9978ccb7..fceaba1e6630 100644
 --- a/arch/arm64/configs/bcmrpi3_defconfig
 +++ b/arch/arm64/configs/bcmrpi3_defconfig
 @@ -817,6 +817,7 @@ CONFIG_VIDEO_EM28XX_V4L2=m
@@ -462321,7 +462336,7 @@ Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
  2 files changed, 10 insertions(+)
 
 diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig
-index 7d7a62f805873..78233d8d2e350 100644
+index 7d7a62f80587..78233d8d2e35 100644
 --- a/arch/arm64/configs/bcm2711_defconfig
 +++ b/arch/arm64/configs/bcm2711_defconfig
 @@ -900,6 +900,11 @@ CONFIG_VIDEO_EM28XX_ALSA=m
@@ -462337,7 +462352,7 @@ index 7d7a62f805873..78233d8d2e350 100644
  CONFIG_USB_SI470X=m
  CONFIG_I2C_SI470X=m
 diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig
-index fceaba1e6630e..a4db167942854 100644
+index fceaba1e6630..a4db16794285 100644
 --- a/arch/arm64/configs/bcmrpi3_defconfig
 +++ b/arch/arm64/configs/bcmrpi3_defconfig
 @@ -818,6 +818,11 @@ CONFIG_VIDEO_EM28XX_ALSA=m
@@ -462376,7 +462391,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
-index b7214741fa613..da14f1fb86640 100644
+index b7214741fa61..da14f1fb8664 100644
 --- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
 +++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
 @@ -175,7 +175,7 @@ static struct mmal_fmt formats[] = {
@@ -462409,7 +462424,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
-index b1e00e65ce186..eefe8e101f96a 100644
+index b1e00e65ce18..eefe8e101f96 100644
 --- a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c
 @@ -207,7 +207,7 @@ static const struct bcm2835_codec_fmt supported_formats[] = {
@@ -462442,7 +462457,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  1 file changed, 1 insertion(+), 6 deletions(-)
 
 diff --git a/arch/arm/boot/dts/bcm2711-rpi.dtsi b/arch/arm/boot/dts/bcm2711-rpi.dtsi
-index 0556c73e332aa..0c586d9ea6f8d 100644
+index 0556c73e332a..0c586d9ea6f8 100644
 --- a/arch/arm/boot/dts/bcm2711-rpi.dtsi
 +++ b/arch/arm/boot/dts/bcm2711-rpi.dtsi
 @@ -246,13 +246,8 @@
@@ -462489,7 +462504,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  create mode 100644 include/dt-bindings/gpio/gpio-fsm.h
 
 diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
-index a4fe9a954b882..7f9c5df745e95 100644
+index a4fe9a954b88..7f9c5df745e9 100644
 --- a/drivers/gpio/Kconfig
 +++ b/drivers/gpio/Kconfig
 @@ -1071,6 +1071,15 @@ config HTC_EGPIO
@@ -462509,7 +462524,7 @@ index a4fe9a954b882..7f9c5df745e95 100644
  	tristate "Janz VMOD-TTL Digital IO Module"
  	depends on MFD_JANZ_CMODIO
 diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile
-index 86edbc79e5956..49a763681c05f 100644
+index 86edbc79e595..49a763681c05 100644
 --- a/drivers/gpio/Makefile
 +++ b/drivers/gpio/Makefile
 @@ -55,6 +55,7 @@ obj-$(CONFIG_GPIO_EP93XX)		+= gpio-ep93xx.o
@@ -462522,7 +462537,7 @@ index 86edbc79e5956..49a763681c05f 100644
  obj-$(CONFIG_GPIO_GRGPIO)		+= gpio-grgpio.o
 diff --git a/drivers/gpio/gpio-fsm.c b/drivers/gpio/gpio-fsm.c
 new file mode 100644
-index 0000000000000..eb8b4d58d2d0a
+index 000000000000..eb8b4d58d2d0
 --- /dev/null
 +++ b/drivers/gpio/gpio-fsm.c
 @@ -0,0 +1,1103 @@
@@ -463631,7 +463646,7 @@ index 0000000000000..eb8b4d58d2d0a
 +MODULE_ALIAS("platform:gpio-fsm");
 diff --git a/include/dt-bindings/gpio/gpio-fsm.h b/include/dt-bindings/gpio/gpio-fsm.h
 new file mode 100644
-index 0000000000000..eb40cfdc71dfe
+index 000000000000..eb40cfdc71df
 --- /dev/null
 +++ b/include/dt-bindings/gpio/gpio-fsm.h
 @@ -0,0 +1,21 @@
@@ -463677,7 +463692,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  5 files changed, 5 insertions(+)
 
 diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig
-index 7368dff25c5c6..350461728d8f6 100644
+index 7368dff25c5c..350461728d8f 100644
 --- a/arch/arm/configs/bcm2709_defconfig
 +++ b/arch/arm/configs/bcm2709_defconfig
 @@ -692,6 +692,7 @@ CONFIG_GPIO_BCM_VIRT=y
@@ -463689,7 +463704,7 @@ index 7368dff25c5c6..350461728d8f6 100644
  CONFIG_GPIO_MOCKUP=m
  CONFIG_W1=m
 diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig
-index efacba968d3fe..d9dc636eb222a 100644
+index efacba968d3f..d9dc636eb222 100644
 --- a/arch/arm/configs/bcm2711_defconfig
 +++ b/arch/arm/configs/bcm2711_defconfig
 @@ -702,6 +702,7 @@ CONFIG_GPIO_BCM_VIRT=y
@@ -463701,7 +463716,7 @@ index efacba968d3fe..d9dc636eb222a 100644
  CONFIG_GPIO_MOCKUP=m
  CONFIG_W1=m
 diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig
-index e2e2168cd3f22..67d7bb17b5961 100644
+index e2e2168cd3f2..67d7bb17b596 100644
 --- a/arch/arm/configs/bcmrpi_defconfig
 +++ b/arch/arm/configs/bcmrpi_defconfig
 @@ -685,6 +685,7 @@ CONFIG_GPIO_SYSFS=y
@@ -463713,7 +463728,7 @@ index e2e2168cd3f22..67d7bb17b5961 100644
  CONFIG_GPIO_MOCKUP=m
  CONFIG_W1=m
 diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig
-index 78233d8d2e350..60e1cb88fe8cf 100644
+index 78233d8d2e35..60e1cb88fe8c 100644
 --- a/arch/arm64/configs/bcm2711_defconfig
 +++ b/arch/arm64/configs/bcm2711_defconfig
 @@ -697,6 +697,7 @@ CONFIG_GPIO_BCM_VIRT=y
@@ -463725,7 +463740,7 @@ index 78233d8d2e350..60e1cb88fe8cf 100644
  CONFIG_GPIO_MOCKUP=m
  CONFIG_W1=m
 diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig
-index a4db167942854..54579a7451765 100644
+index a4db16794285..54579a745176 100644
 --- a/arch/arm64/configs/bcmrpi3_defconfig
 +++ b/arch/arm64/configs/bcmrpi3_defconfig
 @@ -667,6 +667,7 @@ CONFIG_GPIO_SYSFS=y
@@ -463758,7 +463773,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  create mode 100644 arch/arm/boot/dts/overlays/fsm-demo-overlay.dts
 
 diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile
-index 104b0a908f3c2..90c9baefc41df 100644
+index 104b0a908f3c..90c9baefc41d 100644
 --- a/arch/arm/boot/dts/overlays/Makefile
 +++ b/arch/arm/boot/dts/overlays/Makefile
 @@ -44,6 +44,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
@@ -463770,7 +463785,7 @@ index 104b0a908f3c2..90c9baefc41df 100644
  	googlevoicehat-soundcard.dtbo \
  	gpio-fan.dtbo \
 diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
-index 0c33d39f6f3aa..6b61b0255fd76 100644
+index 0c33d39f6f3a..6b61b0255fd7 100644
 --- a/arch/arm/boot/dts/overlays/README
 +++ b/arch/arm/boot/dts/overlays/README
 @@ -767,6 +767,14 @@ Load:   dtoverlay=fe-pi-audio
@@ -463790,7 +463805,7 @@ index 0c33d39f6f3aa..6b61b0255fd76 100644
          GPIOs 4 and 17 (pins 7 and 11 on GPIO header) for interrupt and reset.
 diff --git a/arch/arm/boot/dts/overlays/fsm-demo-overlay.dts b/arch/arm/boot/dts/overlays/fsm-demo-overlay.dts
 new file mode 100644
-index 0000000000000..9e06e388e4d32
+index 000000000000..9e06e388e4d3
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/fsm-demo-overlay.dts
 @@ -0,0 +1,104 @@
@@ -463918,7 +463933,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  create mode 100644 arch/arm/boot/dts/overlays/ghost-amp-overlay.dts
 
 diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile
-index 90c9baefc41df..ab9fa47c8876c 100644
+index 90c9baefc41d..ab9fa47c8876 100644
 --- a/arch/arm/boot/dts/overlays/Makefile
 +++ b/arch/arm/boot/dts/overlays/Makefile
 @@ -45,6 +45,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
@@ -463930,7 +463945,7 @@ index 90c9baefc41df..ab9fa47c8876c 100644
  	googlevoicehat-soundcard.dtbo \
  	gpio-fan.dtbo \
 diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
-index 6b61b0255fd76..eff90baed4068 100644
+index 6b61b0255fd7..eff90baed406 100644
 --- a/arch/arm/boot/dts/overlays/README
 +++ b/arch/arm/boot/dts/overlays/README
 @@ -775,6 +775,13 @@ Load:   dtoverlay=fsm-demo,<param>=<val>
@@ -463949,7 +463964,7 @@ index 6b61b0255fd76..eff90baed4068 100644
          GPIOs 4 and 17 (pins 7 and 11 on GPIO header) for interrupt and reset.
 diff --git a/arch/arm/boot/dts/overlays/ghost-amp-overlay.dts b/arch/arm/boot/dts/overlays/ghost-amp-overlay.dts
 new file mode 100644
-index 0000000000000..afc9f034b5fcb
+index 000000000000..afc9f034b5fc
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/ghost-amp-overlay.dts
 @@ -0,0 +1,119 @@
@@ -464093,7 +464108,7 @@ Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
  1 file changed, 1 deletion(-)
 
 diff --git a/net/bluetooth/Kconfig b/net/bluetooth/Kconfig
-index 3803135c88ff4..340f169f6d547 100644
+index 3803135c88ff..340f169f6d54 100644
 --- a/net/bluetooth/Kconfig
 +++ b/net/bluetooth/Kconfig
 @@ -64,7 +64,6 @@ source "net/bluetooth/hidp/Kconfig"
@@ -464125,7 +464140,7 @@ Signed-off-by: Joerg Schambacher <joerg@i2audio.com>
  1 file changed, 7 insertions(+), 2 deletions(-)
 
 diff --git a/sound/soc/bcm/hifiberry_dacplus.c b/sound/soc/bcm/hifiberry_dacplus.c
-index 286a62c3ff487..2f1b1ef4191a5 100644
+index 286a62c3ff48..2f1b1ef4191a 100644
 --- a/sound/soc/bcm/hifiberry_dacplus.c
 +++ b/sound/soc/bcm/hifiberry_dacplus.c
 @@ -315,12 +315,14 @@ static int hb_hp_detect(void)
@@ -464183,7 +464198,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 7 insertions(+), 1 deletion(-)
 
 diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-controls.h
-index b6173d8c38f18..9afecc81b883b 100644
+index b6173d8c38f1..9afecc81b883 100644
 --- a/include/uapi/linux/v4l2-controls.h
 +++ b/include/uapi/linux/v4l2-controls.h
 @@ -192,9 +192,15 @@ enum v4l2_colorfx {
@@ -464225,7 +464240,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/arch/arm/boot/dts/overlays/ov9281-overlay.dts b/arch/arm/boot/dts/overlays/ov9281-overlay.dts
-index 4411c9d965646..40b298d3dd86d 100644
+index 4411c9d96564..40b298d3dd86 100644
 --- a/arch/arm/boot/dts/overlays/ov9281-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/ov9281-overlay.dts
 @@ -34,7 +34,7 @@
@@ -464262,7 +464277,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  create mode 100644 arch/arm64/boot/dts/broadcom/bcm2711-rpi-cm4.dts
 
 diff --git a/arch/arm64/boot/dts/broadcom/Makefile b/arch/arm64/boot/dts/broadcom/Makefile
-index c3eaf8d63ee4a..1e861e2bf2e0e 100644
+index c3eaf8d63ee4..1e861e2bf2e0 100644
 --- a/arch/arm64/boot/dts/broadcom/Makefile
 +++ b/arch/arm64/boot/dts/broadcom/Makefile
 @@ -7,7 +7,8 @@ dtb-$(CONFIG_ARCH_BCM2709) += bcm2710-rpi-2-b.dtb
@@ -464277,7 +464292,7 @@ index c3eaf8d63ee4a..1e861e2bf2e0e 100644
  dtb-$(CONFIG_ARCH_BCM2835) += bcm2710-rpi-cm3.dtb
 diff --git a/arch/arm64/boot/dts/broadcom/bcm2711-rpi-cm4.dts b/arch/arm64/boot/dts/broadcom/bcm2711-rpi-cm4.dts
 new file mode 100644
-index 0000000000000..8064a58155f1b
+index 000000000000..8064a58155f1
 --- /dev/null
 +++ b/arch/arm64/boot/dts/broadcom/bcm2711-rpi-cm4.dts
 @@ -0,0 +1 @@
@@ -464298,7 +464313,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  2 files changed, 3 insertions(+), 6 deletions(-)
 
 diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
-index 477108fe04043..325f1ceccad97 100644
+index 477108fe0404..325f1ceccad9 100644
 --- a/arch/arm/boot/dts/Makefile
 +++ b/arch/arm/boot/dts/Makefile
 @@ -10,8 +10,8 @@ dtb-$(CONFIG_ARCH_BCM2835) += \
@@ -464312,7 +464327,7 @@ index 477108fe04043..325f1ceccad97 100644
  	bcm2711-rpi-cm4.dtb
  
 diff --git a/arch/arm64/boot/dts/broadcom/Makefile b/arch/arm64/boot/dts/broadcom/Makefile
-index 1e861e2bf2e0e..996e670a60183 100644
+index 1e861e2bf2e0..996e670a6018 100644
 --- a/arch/arm64/boot/dts/broadcom/Makefile
 +++ b/arch/arm64/boot/dts/broadcom/Makefile
 @@ -3,15 +3,12 @@ dtb-$(CONFIG_ARCH_BCM2835) += bcm2837-rpi-3-a-plus.dtb \
@@ -464351,7 +464366,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  1 file changed, 7 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c
-index a0cba3823e5ef..ccda115ab9e04 100644
+index a0cba3823e5e..ccda115ab9e0 100644
 --- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c
 +++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c
 @@ -381,11 +381,16 @@ static int snd_bcm2835_alsa_probe(struct platform_device *pdev)
@@ -464390,7 +464405,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  3 files changed, 3 insertions(+)
 
 diff --git a/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts b/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts
-index f1bbed9fbf73c..80263a42aebf3 100644
+index f1bbed9fbf73..80263a42aebf 100644
 --- a/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts
 +++ b/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts
 @@ -152,6 +152,7 @@
@@ -464402,7 +464417,7 @@ index f1bbed9fbf73c..80263a42aebf3 100644
  
  / {
 diff --git a/arch/arm/boot/dts/bcm2708-rpi-zero.dts b/arch/arm/boot/dts/bcm2708-rpi-zero.dts
-index e7578788b8393..5b1332ace9b8a 100644
+index e7578788b839..5b1332ace9b8 100644
 --- a/arch/arm/boot/dts/bcm2708-rpi-zero.dts
 +++ b/arch/arm/boot/dts/bcm2708-rpi-zero.dts
 @@ -106,6 +106,7 @@
@@ -464414,7 +464429,7 @@ index e7578788b8393..5b1332ace9b8a 100644
  
  / {
 diff --git a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
-index d4ea928e30ce6..3ff0be02cb34c 100644
+index d4ea928e30ce..3ff0be02cb34 100644
 --- a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
 +++ b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
 @@ -460,6 +460,7 @@
@@ -464440,7 +464455,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  1 file changed, 7 insertions(+)
 
 diff --git a/arch/arm/boot/dts/overlays/audremap-overlay.dts b/arch/arm/boot/dts/overlays/audremap-overlay.dts
-index d624bb3a3feaf..7324890ead869 100644
+index d624bb3a3fea..7324890ead86 100644
 --- a/arch/arm/boot/dts/overlays/audremap-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/audremap-overlay.dts
 @@ -26,6 +26,13 @@
@@ -464473,7 +464488,7 @@ Signed-off-by: Serge Schneider <serge@raspberrypi.com>
  1 file changed, 3 insertions(+)
 
 diff --git a/drivers/video/fbdev/rpisense-fb.c b/drivers/video/fbdev/rpisense-fb.c
-index 26432a5a0b4b4..325977def5311 100644
+index 26432a5a0b4b..325977def531 100644
 --- a/drivers/video/fbdev/rpisense-fb.c
 +++ b/drivers/video/fbdev/rpisense-fb.c
 @@ -52,6 +52,8 @@ static u8 gamma_low[32] = {0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
@@ -464512,7 +464527,7 @@ Signed-off-by: David Knell <david.knell@gmail.com>
  5 files changed, 5 insertions(+)
 
 diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig
-index 350461728d8f6..6b3d27193be43 100644
+index 350461728d8f..6b3d27193be4 100644
 --- a/arch/arm/configs/bcm2709_defconfig
 +++ b/arch/arm/configs/bcm2709_defconfig
 @@ -984,6 +984,7 @@ CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSADCPRO=m
@@ -464524,7 +464539,7 @@ index 350461728d8f6..6b3d27193be43 100644
  CONFIG_SND_BCM2708_SOC_RPI_DAC=m
  CONFIG_SND_BCM2708_SOC_RPI_PROTO=m
 diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig
-index d9dc636eb222a..5b826bc26c309 100644
+index d9dc636eb222..5b826bc26c30 100644
 --- a/arch/arm/configs/bcm2711_defconfig
 +++ b/arch/arm/configs/bcm2711_defconfig
 @@ -998,6 +998,7 @@ CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSADCPRO=m
@@ -464536,7 +464551,7 @@ index d9dc636eb222a..5b826bc26c309 100644
  CONFIG_SND_BCM2708_SOC_RPI_DAC=m
  CONFIG_SND_BCM2708_SOC_RPI_PROTO=m
 diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig
-index 67d7bb17b5961..1beb2c61e519e 100644
+index 67d7bb17b596..1beb2c61e519 100644
 --- a/arch/arm/configs/bcmrpi_defconfig
 +++ b/arch/arm/configs/bcmrpi_defconfig
 @@ -976,6 +976,7 @@ CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSADCPRO=m
@@ -464548,7 +464563,7 @@ index 67d7bb17b5961..1beb2c61e519e 100644
  CONFIG_SND_BCM2708_SOC_RPI_DAC=m
  CONFIG_SND_BCM2708_SOC_RPI_PROTO=m
 diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig
-index 60e1cb88fe8cf..22ba4d32f7862 100644
+index 60e1cb88fe8c..22ba4d32f786 100644
 --- a/arch/arm64/configs/bcm2711_defconfig
 +++ b/arch/arm64/configs/bcm2711_defconfig
 @@ -997,6 +997,7 @@ CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSADCPRO=m
@@ -464560,7 +464575,7 @@ index 60e1cb88fe8cf..22ba4d32f7862 100644
  CONFIG_SND_BCM2708_SOC_RPI_DAC=m
  CONFIG_SND_BCM2708_SOC_RPI_PROTO=m
 diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig
-index 54579a7451765..a91f46b4a45c7 100644
+index 54579a745176..a91f46b4a45c 100644
 --- a/arch/arm64/configs/bcmrpi3_defconfig
 +++ b/arch/arm64/configs/bcmrpi3_defconfig
 @@ -904,6 +904,7 @@ CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSADCPRO=m
@@ -464589,7 +464604,7 @@ Signed-off-by: David Knell <david.knell@gmail.com>
  create mode 100644 arch/arm/boot/dts/overlays/pifi-40-overlay.dts
 
 diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile
-index ab9fa47c8876c..fbb7ed1ba55b1 100644
+index ab9fa47c8876..fbb7ed1ba55b 100644
 --- a/arch/arm/boot/dts/overlays/Makefile
 +++ b/arch/arm/boot/dts/overlays/Makefile
 @@ -125,6 +125,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
@@ -464601,7 +464616,7 @@ index ab9fa47c8876c..fbb7ed1ba55b1 100644
  	piscreen.dtbo \
  	piscreen2r.dtbo \
 diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
-index eff90baed4068..c709c4b89c155 100644
+index eff90baed406..c709c4b89c15 100644
 --- a/arch/arm/boot/dts/overlays/README
 +++ b/arch/arm/boot/dts/overlays/README
 @@ -2000,6 +2000,12 @@ Params: spi-present-mask        8-bit integer, bitmap indicating MCP23S17 SPI0
@@ -464619,7 +464634,7 @@ index eff90baed4068..c709c4b89c155 100644
  Load:   dtoverlay=piglow
 diff --git a/arch/arm/boot/dts/overlays/pifi-40-overlay.dts b/arch/arm/boot/dts/overlays/pifi-40-overlay.dts
 new file mode 100644
-index 0000000000000..51a20e54977fe
+index 000000000000..51a20e54977f
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/pifi-40-overlay.dts
 @@ -0,0 +1,50 @@
@@ -464691,7 +464706,7 @@ Signed-off-by: David Knell <david.knell@gmail.com>
  create mode 100644 sound/soc/bcm/pifi-40.c
 
 diff --git a/sound/soc/bcm/Kconfig b/sound/soc/bcm/Kconfig
-index 5ec58ef9cbe66..7433e6f15cd7c 100644
+index 5ec58ef9cbe6..7433e6f15cd7 100644
 --- a/sound/soc/bcm/Kconfig
 +++ b/sound/soc/bcm/Kconfig
 @@ -91,6 +91,14 @@ config SND_BCM2708_SOC_HIFIBERRY_AMP
@@ -464710,7 +464725,7 @@ index 5ec58ef9cbe66..7433e6f15cd7c 100644
          tristate "Support for Cirrus Logic Audio Card"
          depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
 diff --git a/sound/soc/bcm/Makefile b/sound/soc/bcm/Makefile
-index cab3926909740..00a983355b911 100644
+index cab392690974..00a983355b91 100644
 --- a/sound/soc/bcm/Makefile
 +++ b/sound/soc/bcm/Makefile
 @@ -40,6 +40,7 @@ snd-soc-pisound-objs := pisound.o
@@ -464729,7 +464744,7 @@ index cab3926909740..00a983355b911 100644
 +
 diff --git a/sound/soc/bcm/pifi-40.c b/sound/soc/bcm/pifi-40.c
 new file mode 100644
-index 0000000000000..dbb9dd0dbe949
+index 000000000000..dbb9dd0dbe94
 --- /dev/null
 +++ b/sound/soc/bcm/pifi-40.c
 @@ -0,0 +1,282 @@
@@ -465035,7 +465050,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  3 files changed, 3 insertions(+), 667 deletions(-)
 
 diff --git a/drivers/usb/host/dwc_common_port/usb.h b/drivers/usb/host/dwc_common_port/usb.h
-index 27bda82dac2eb..f785935757368 100644
+index 27bda82dac2e..f78593575736 100644
 --- a/drivers/usb/host/dwc_common_port/usb.h
 +++ b/drivers/usb/host/dwc_common_port/usb.h
 @@ -55,12 +55,6 @@ typedef u_int8_t uByte;
@@ -465745,7 +465760,7 @@ index 27bda82dac2eb..f785935757368 100644
  #include <poppack.h>
  #endif
 diff --git a/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c b/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c
-index eda7a33908b33..50c8705185ad8 100644
+index eda7a33908b3..50c8705185ad 100644
 --- a/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c
 +++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c
 @@ -482,8 +482,8 @@ static void hcd_init_fiq(void *cookie)
@@ -465760,7 +465775,7 @@ index eda7a33908b33..50c8705185ad8 100644
  		dwc_otg_hcd->fiq_state->mphi_regs.ctrl =
  			otg_dev->os_dep.mphi_base + 0x4c;
 diff --git a/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c b/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c
-index e55ea9c74be46..76e94b4ebb43a 100644
+index e55ea9c74be4..76e94b4ebb43 100644
 --- a/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c
 +++ b/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c
 @@ -3377,7 +3377,7 @@ void predict_nextep_seq( dwc_otg_core_if_t * core_if)
@@ -465787,7 +465802,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/gpio/gpio-fsm.c b/drivers/gpio/gpio-fsm.c
-index eb8b4d58d2d0a..2cab50e513152 100644
+index eb8b4d58d2d0..2cab50e51315 100644
 --- a/drivers/gpio/gpio-fsm.c
 +++ b/drivers/gpio/gpio-fsm.c
 @@ -956,7 +956,8 @@ static int gpio_fsm_probe(struct platform_device *pdev)
@@ -465815,7 +465830,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  1 file changed, 8 insertions(+), 8 deletions(-)
 
 diff --git a/drivers/staging/media/rpivid/rpivid_h265.c b/drivers/staging/media/rpivid/rpivid_h265.c
-index b677910e237c6..fc3caed581873 100644
+index b677910e237c..fc3caed58187 100644
 --- a/drivers/staging/media/rpivid/rpivid_h265.c
 +++ b/drivers/staging/media/rpivid/rpivid_h265.c
 @@ -1341,10 +1341,10 @@ static int frame_end(struct rpivid_dev *const dev,
@@ -465892,7 +465907,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  4 files changed, 27 insertions(+), 17 deletions(-)
 
 diff --git a/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c b/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c
-index 490a7801e737e..f644acbce748f 100644
+index 490a7801e737..f644acbce748 100644
 --- a/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c
 +++ b/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c
 @@ -240,7 +240,8 @@ static int notrace fiq_increment_dma_buf(struct fiq_state *st, int num_channels,
@@ -465934,7 +465949,7 @@ index 490a7801e737e..f644acbce748f 100644
  	//hcdma.d32 += st->channel[n].dma_info.slot_len[i];
  	fiq_print(FIQDBG_INT, st, "LAST: %01d ", last);
 diff --git a/drivers/usb/host/dwc_otg/dwc_otg_hcd.c b/drivers/usb/host/dwc_otg/dwc_otg_hcd.c
-index 0f6645e2383c0..e42d8ca89c013 100644
+index 0f6645e2383c..e42d8ca89c01 100644
 --- a/drivers/usb/host/dwc_otg/dwc_otg_hcd.c
 +++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd.c
 @@ -1270,7 +1270,8 @@ static void assign_and_init_hc(dwc_otg_hcd_t * hcd, dwc_otg_qh_t * qh)
@@ -466003,7 +466018,7 @@ index 0f6645e2383c0..e42d8ca89c013 100644
  			/* fixup xfersize to the actual packet size */
  			st->hctsiz_copy.b.pid = 0;
 diff --git a/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c b/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c
-index bd8a204037134..2fd96e56e4129 100644
+index bd8a20403713..2fd96e56e412 100644
 --- a/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c
 +++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c
 @@ -620,7 +620,8 @@ static void init_non_isoc_dma_desc(dwc_otg_hcd_t * hcd, dwc_otg_qh_t * qh)
@@ -466017,7 +466032,7 @@ index bd8a204037134..2fd96e56e4129 100644
  		}
  
 diff --git a/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c b/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c
-index d3097ef3728ca..9d49b2b332276 100644
+index d3097ef3728c..9d49b2b33227 100644
 --- a/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c
 +++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c
 @@ -1857,10 +1857,10 @@ static int32_t handle_hc_ahberr_intr(dwc_otg_hcd_t * hcd,
@@ -466050,7 +466065,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/video/fbdev/bcm2708_fb.c b/drivers/video/fbdev/bcm2708_fb.c
-index d035fa59c269d..9a3d3d23c17ed 100644
+index d035fa59c269..9a3d3d23c17e 100644
 --- a/drivers/video/fbdev/bcm2708_fb.c
 +++ b/drivers/video/fbdev/bcm2708_fb.c
 @@ -705,7 +705,8 @@ static long vc_mem_copy(struct bcm2708_fb *fb, struct fb_dmacopy *ioparam)
@@ -466079,7 +466094,7 @@ Signed-off-by: Dom Cobley <popcornmix@gmail.com>
  1 file changed, 10 insertions(+), 11 deletions(-)
 
 diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c
-index db889f6da395b..cc56c5166c07f 100644
+index db889f6da395..cc56c5166c07 100644
 --- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c
 +++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c
 @@ -14,14 +14,14 @@ static const struct snd_pcm_hardware snd_bcm2835_playback_hw = {
@@ -466141,7 +466156,7 @@ which are only relevant to other reboot notifiers.
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/watchdog/bcm2835_wdt.c b/drivers/watchdog/bcm2835_wdt.c
-index 62937e6f83ca1..de25e3682f037 100644
+index 62937e6f83ca..de25e3682f03 100644
 --- a/drivers/watchdog/bcm2835_wdt.c
 +++ b/drivers/watchdog/bcm2835_wdt.c
 @@ -126,10 +126,12 @@ static int bcm2835_restart(struct watchdog_device *wdog,
@@ -466184,7 +466199,7 @@ mechanism to be implemented for OS upgrades.
  2 files changed, 25 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/firmware/raspberrypi.c b/drivers/firmware/raspberrypi.c
-index dc11a1968e99c..9b5cb65a87129 100644
+index dc11a1968e99..9b5cb65a8712 100644
 --- a/drivers/firmware/raspberrypi.c
 +++ b/drivers/firmware/raspberrypi.c
 @@ -190,6 +190,7 @@ static int rpi_firmware_notify_reboot(struct notifier_block *nb,
@@ -466227,7 +466242,7 @@ index dc11a1968e99c..9b5cb65a87129 100644
  	return 0;
  }
 diff --git a/include/soc/bcm2835/raspberrypi-firmware.h b/include/soc/bcm2835/raspberrypi-firmware.h
-index 3335c2a2993c2..7e0d1f186f29a 100644
+index 3335c2a2993c..7e0d1f186f29 100644
 --- a/include/soc/bcm2835/raspberrypi-firmware.h
 +++ b/include/soc/bcm2835/raspberrypi-firmware.h
 @@ -96,6 +96,8 @@ enum rpi_firmware_property_tag {
@@ -466260,7 +466275,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
  2 files changed, 14 insertions(+), 3 deletions(-)
 
 diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c
-index 56f029579b24d..49de844e03a3d 100644
+index 56f029579b24..49de844e03a3 100644
 --- a/drivers/net/phy/broadcom.c
 +++ b/drivers/net/phy/broadcom.c
 @@ -213,7 +213,8 @@ static void bcm54xx_adjust_rxrefclk(struct phy_device *phydev)
@@ -466306,7 +466321,7 @@ index 56f029579b24d..49de844e03a3d 100644
  	{ PHY_ID_BCM54612E, 0xfffffff0 },
  	{ PHY_ID_BCM54616S, 0xfffffff0 },
 diff --git a/include/linux/brcmphy.h b/include/linux/brcmphy.h
-index 6db2d9a6e5031..bfb37218f435c 100644
+index 6db2d9a6e503..bfb37218f435 100644
 --- a/include/linux/brcmphy.h
 +++ b/include/linux/brcmphy.h
 @@ -20,6 +20,7 @@
@@ -466332,7 +466347,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  1 file changed, 9 insertions(+)
 
 diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c
-index 49de844e03a3d..5a1ba06163cce 100644
+index 49de844e03a3..5a1ba06163cc 100644
 --- a/drivers/net/phy/broadcom.c
 +++ b/drivers/net/phy/broadcom.c
 @@ -43,6 +43,11 @@ static int bcm54210e_config_init(struct phy_device *phydev)
@@ -466376,7 +466391,7 @@ Signed-off-by: Sudeep <sudeepkumar@cem-solutions.net>
  create mode 100644 sound/soc/bcm/allo-boss2-dac.c
 
 diff --git a/sound/soc/bcm/Kconfig b/sound/soc/bcm/Kconfig
-index 7433e6f15cd7c..31ec3e047c55b 100644
+index 7433e6f15cd7..31ec3e047c55 100644
 --- a/sound/soc/bcm/Kconfig
 +++ b/sound/soc/bcm/Kconfig
 @@ -258,6 +258,15 @@ config SND_BCM2708_SOC_ALLO_BOSS_DAC
@@ -466396,7 +466411,7 @@ index 7433e6f15cd7c..31ec3e047c55b 100644
  	tristate "Support for Allo DigiOne"
  	depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
 diff --git a/sound/soc/bcm/Makefile b/sound/soc/bcm/Makefile
-index 00a983355b911..8ebbd3f29380c 100644
+index 00a983355b91..8ebbd3f29380 100644
 --- a/sound/soc/bcm/Makefile
 +++ b/sound/soc/bcm/Makefile
 @@ -33,6 +33,7 @@ snd-soc-digidac1-soundcard-objs := digidac1-soundcard.o
@@ -466417,7 +466432,7 @@ index 00a983355b911..8ebbd3f29380c 100644
  obj-$(CONFIG_SND_BCM2708_SOC_ALLO_KATANA_DAC) += snd-soc-allo-katana-codec.o
 diff --git a/sound/soc/bcm/allo-boss2-dac.c b/sound/soc/bcm/allo-boss2-dac.c
 new file mode 100644
-index 0000000000000..5ad7f16964aa8
+index 000000000000..5ad7f16964aa
 --- /dev/null
 +++ b/sound/soc/bcm/allo-boss2-dac.c
 @@ -0,0 +1,1133 @@
@@ -467572,7 +467587,7 @@ Signed-off-by: Sudeep <sudeepkumar@cem-solutions.net>
  create mode 100644 arch/arm/boot/dts/overlays/allo-boss2-dac-audio-overlay.dts
 
 diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile
-index fbb7ed1ba55b1..13342d83d02d1 100644
+index fbb7ed1ba55b..13342d83d02d 100644
 --- a/arch/arm/boot/dts/overlays/Makefile
 +++ b/arch/arm/boot/dts/overlays/Makefile
 @@ -14,6 +14,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
@@ -467584,7 +467599,7 @@ index fbb7ed1ba55b1..13342d83d02d1 100644
  	allo-katana-dac-audio.dtbo \
  	allo-piano-dac-pcm512x-audio.dtbo \
 diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
-index c709c4b89c155..2192cdfb27aad 100644
+index c709c4b89c15..2192cdfb27aa 100644
 --- a/arch/arm/boot/dts/overlays/README
 +++ b/arch/arm/boot/dts/overlays/README
 @@ -420,6 +420,12 @@ Params: 24db_digital_gain       Allow gain to be applied via the PCM512x codec
@@ -467602,7 +467617,7 @@ index c709c4b89c155..2192cdfb27aad 100644
  Load:   dtoverlay=allo-digione
 diff --git a/arch/arm/boot/dts/overlays/allo-boss2-dac-audio-overlay.dts b/arch/arm/boot/dts/overlays/allo-boss2-dac-audio-overlay.dts
 new file mode 100644
-index 0000000000000..a6adfb495eb90
+index 000000000000..a6adfb495eb9
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/allo-boss2-dac-audio-overlay.dts
 @@ -0,0 +1,57 @@
@@ -467682,7 +467697,7 @@ Signed-off-by: Sudeep <sudeepkumar@cem-solutions.net>
  5 files changed, 5 insertions(+)
 
 diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig
-index 6b3d27193be43..b062fead409b0 100644
+index 6b3d27193be4..b062fead409b 100644
 --- a/arch/arm/configs/bcm2709_defconfig
 +++ b/arch/arm/configs/bcm2709_defconfig
 @@ -1006,6 +1006,7 @@ CONFIG_SND_BCM2708_SOC_DIONAUDIO_LOCO_V2=m
@@ -467694,7 +467709,7 @@ index 6b3d27193be43..b062fead409b0 100644
  CONFIG_SND_BCM2708_SOC_ALLO_KATANA_DAC=m
  CONFIG_SND_BCM2708_SOC_FE_PI_AUDIO=m
 diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig
-index 5b826bc26c309..598e9e1989510 100644
+index 5b826bc26c30..598e9e198951 100644
 --- a/arch/arm/configs/bcm2711_defconfig
 +++ b/arch/arm/configs/bcm2711_defconfig
 @@ -1020,6 +1020,7 @@ CONFIG_SND_BCM2708_SOC_DIONAUDIO_LOCO_V2=m
@@ -467706,7 +467721,7 @@ index 5b826bc26c309..598e9e1989510 100644
  CONFIG_SND_BCM2708_SOC_ALLO_KATANA_DAC=m
  CONFIG_SND_BCM2708_SOC_FE_PI_AUDIO=m
 diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig
-index 1beb2c61e519e..520d0bf8c7001 100644
+index 1beb2c61e519..520d0bf8c700 100644
 --- a/arch/arm/configs/bcmrpi_defconfig
 +++ b/arch/arm/configs/bcmrpi_defconfig
 @@ -998,6 +998,7 @@ CONFIG_SND_BCM2708_SOC_DIONAUDIO_LOCO_V2=m
@@ -467718,7 +467733,7 @@ index 1beb2c61e519e..520d0bf8c7001 100644
  CONFIG_SND_BCM2708_SOC_ALLO_KATANA_DAC=m
  CONFIG_SND_BCM2708_SOC_FE_PI_AUDIO=m
 diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig
-index 22ba4d32f7862..39f2fc51de4d6 100644
+index 22ba4d32f786..39f2fc51de4d 100644
 --- a/arch/arm64/configs/bcm2711_defconfig
 +++ b/arch/arm64/configs/bcm2711_defconfig
 @@ -1019,6 +1019,7 @@ CONFIG_SND_BCM2708_SOC_DIONAUDIO_LOCO_V2=m
@@ -467730,7 +467745,7 @@ index 22ba4d32f7862..39f2fc51de4d6 100644
  CONFIG_SND_BCM2708_SOC_ALLO_KATANA_DAC=m
  CONFIG_SND_BCM2708_SOC_FE_PI_AUDIO=m
 diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig
-index a91f46b4a45c7..3d43b416bce45 100644
+index a91f46b4a45c..3d43b416bce4 100644
 --- a/arch/arm64/configs/bcmrpi3_defconfig
 +++ b/arch/arm64/configs/bcmrpi3_defconfig
 @@ -921,6 +921,7 @@ CONFIG_SND_AUDIOSENSE_PI=m
@@ -467775,7 +467790,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  1 file changed, 5 insertions(+), 7 deletions(-)
 
 diff --git a/drivers/mailbox/mailbox.c b/drivers/mailbox/mailbox.c
-index 3e7d4b20ab34f..0b821a5b2db84 100644
+index 3e7d4b20ab34..0b821a5b2db8 100644
 --- a/drivers/mailbox/mailbox.c
 +++ b/drivers/mailbox/mailbox.c
 @@ -82,12 +82,9 @@ static void msg_submit(struct mbox_chan *chan)
@@ -467827,7 +467842,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  create mode 100644 arch/arm64/boot/dts/broadcom/bcm2711-rpi-400.dts
 
 diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
-index 325f1ceccad97..0e1c0aeefa690 100644
+index 325f1ceccad9..0e1c0aeefa69 100644
 --- a/arch/arm/boot/dts/Makefile
 +++ b/arch/arm/boot/dts/Makefile
 @@ -12,6 +12,7 @@ dtb-$(CONFIG_ARCH_BCM2835) += \
@@ -467840,7 +467855,7 @@ index 325f1ceccad97..0e1c0aeefa690 100644
  
 diff --git a/arch/arm/boot/dts/bcm2711-rpi-400.dts b/arch/arm/boot/dts/bcm2711-rpi-400.dts
 new file mode 100644
-index 0000000000000..afd1ca215518c
+index 000000000000..afd1ca215518
 --- /dev/null
 +++ b/arch/arm/boot/dts/bcm2711-rpi-400.dts
 @@ -0,0 +1,585 @@
@@ -468430,7 +468445,7 @@ index 0000000000000..afd1ca215518c
 +	};
 +};
 diff --git a/arch/arm64/boot/dts/broadcom/Makefile b/arch/arm64/boot/dts/broadcom/Makefile
-index 996e670a60183..2bca736a71976 100644
+index 996e670a6018..2bca736a7197 100644
 --- a/arch/arm64/boot/dts/broadcom/Makefile
 +++ b/arch/arm64/boot/dts/broadcom/Makefile
 @@ -7,6 +7,7 @@ dtb-$(CONFIG_ARCH_BCM2835) += bcm2710-rpi-2-b.dtb
@@ -468443,7 +468458,7 @@ index 996e670a60183..2bca736a71976 100644
  
 diff --git a/arch/arm64/boot/dts/broadcom/bcm2711-rpi-400.dts b/arch/arm64/boot/dts/broadcom/bcm2711-rpi-400.dts
 new file mode 100644
-index 0000000000000..90c2b5a195d48
+index 000000000000..90c2b5a195d4
 --- /dev/null
 +++ b/arch/arm64/boot/dts/broadcom/bcm2711-rpi-400.dts
 @@ -0,0 +1 @@
@@ -468476,7 +468491,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  delete mode 100644 arch/arm/boot/dts/overlays/sdtweak-overlay.dts
 
 diff --git a/arch/arm/boot/dts/overlays/overlay_map.dts b/arch/arm/boot/dts/overlays/overlay_map.dts
-index 22b0ad1738ec6..b2e6b41216b20 100644
+index 22b0ad1738ec..b2e6b41216b2 100644
 --- a/arch/arm/boot/dts/overlays/overlay_map.dts
 +++ b/arch/arm/boot/dts/overlays/overlay_map.dts
 @@ -61,6 +61,10 @@
@@ -468492,7 +468507,7 @@ index 22b0ad1738ec6..b2e6b41216b20 100644
  	};
 diff --git a/arch/arm/boot/dts/overlays/sdtweak-overlay.dts b/arch/arm/boot/dts/overlays/sdtweak-overlay.dts
 deleted file mode 100644
-index 38157d2f9bf3b..0000000000000
+index 38157d2f9bf3..000000000000
 --- a/arch/arm/boot/dts/overlays/sdtweak-overlay.dts
 +++ /dev/null
 @@ -1,25 +0,0 @@
@@ -468537,7 +468552,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  2 files changed, 4 insertions(+), 24 deletions(-)
 
 diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile
-index 13342d83d02d1..467cc0ae9194b 100644
+index 13342d83d02d..467cc0ae9194 100644
 --- a/arch/arm/boot/dts/overlays/Makefile
 +++ b/arch/arm/boot/dts/overlays/Makefile
 @@ -159,7 +159,6 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
@@ -468549,7 +468564,7 @@ index 13342d83d02d1..467cc0ae9194b 100644
  	smi.dtbo \
  	smi-dev.dtbo \
 diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
-index 2192cdfb27aad..dd33a27178b5a 100644
+index 2192cdfb27aa..dd33a27178b5 100644
 --- a/arch/arm/boot/dts/overlays/README
 +++ b/arch/arm/boot/dts/overlays/README
 @@ -2407,29 +2407,10 @@ Load:   <Deprecated>
@@ -468613,7 +468628,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  8 files changed, 8 insertions(+), 8 deletions(-)
 
 diff --git a/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts b/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts
-index 80263a42aebf3..188f56b3a7f53 100644
+index 80263a42aebf..188f56b3a7f5 100644
 --- a/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts
 +++ b/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts
 @@ -11,7 +11,7 @@
@@ -468626,7 +468641,7 @@ index 80263a42aebf3..188f56b3a7f53 100644
  
  	aliases {
 diff --git a/arch/arm/boot/dts/bcm2708-rpi-zero.dts b/arch/arm/boot/dts/bcm2708-rpi-zero.dts
-index 5b1332ace9b8a..8d20064dddc4e 100644
+index 5b1332ace9b8..8d20064dddc4 100644
 --- a/arch/arm/boot/dts/bcm2708-rpi-zero.dts
 +++ b/arch/arm/boot/dts/bcm2708-rpi-zero.dts
 @@ -10,7 +10,7 @@
@@ -468639,7 +468654,7 @@ index 5b1332ace9b8a..8d20064dddc4e 100644
  };
  
 diff --git a/arch/arm/boot/dts/bcm270x.dtsi b/arch/arm/boot/dts/bcm270x.dtsi
-index b74a9df1390e1..c3a55a7a2deb8 100644
+index b74a9df1390e..c3a55a7a2deb 100644
 --- a/arch/arm/boot/dts/bcm270x.dtsi
 +++ b/arch/arm/boot/dts/bcm270x.dtsi
 @@ -3,7 +3,7 @@
@@ -468652,7 +468667,7 @@ index b74a9df1390e1..c3a55a7a2deb8 100644
  	};
  
 diff --git a/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts b/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts
-index 4e4e471008315..e7b7281d3c608 100644
+index 4e4e47100831..e7b7281d3c60 100644
 --- a/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts
 +++ b/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts
 @@ -12,7 +12,7 @@
@@ -468665,7 +468680,7 @@ index 4e4e471008315..e7b7281d3c608 100644
  
  	aliases {
 diff --git a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
-index 8989c00b03e54..d69d6a187e0ca 100644
+index 8989c00b03e5..d69d6a187e0c 100644
 --- a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
 +++ b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
 @@ -12,7 +12,7 @@
@@ -468678,7 +468693,7 @@ index 8989c00b03e54..d69d6a187e0ca 100644
  
  	aliases {
 diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
-index 21b20e334b1a7..b5daeee077ecc 100644
+index 21b20e334b1a..b5daeee077ec 100644
 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
 +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
 @@ -234,7 +234,7 @@
@@ -468691,7 +468706,7 @@ index 21b20e334b1a7..b5daeee077ecc 100644
  
  	aliases {
 diff --git a/arch/arm/boot/dts/bcm2711-rpi-400.dts b/arch/arm/boot/dts/bcm2711-rpi-400.dts
-index afd1ca215518c..9454ce193ec53 100644
+index afd1ca215518..9454ce193ec5 100644
 --- a/arch/arm/boot/dts/bcm2711-rpi-400.dts
 +++ b/arch/arm/boot/dts/bcm2711-rpi-400.dts
 @@ -234,7 +234,7 @@
@@ -468704,7 +468719,7 @@ index afd1ca215518c..9454ce193ec53 100644
  
  	aliases {
 diff --git a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
-index 3ff0be02cb34c..a969000c0b899 100644
+index 3ff0be02cb34..a969000c0b89 100644
 --- a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
 +++ b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
 @@ -174,7 +174,7 @@
@@ -468739,7 +468754,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  1 file changed, 2 insertions(+), 20 deletions(-)
 
 diff --git a/drivers/staging/vc04_services/vc-sm-cma/vc_sm.c b/drivers/staging/vc04_services/vc-sm-cma/vc_sm.c
-index 8cbe2b3522c65..03685cb5c80f6 100644
+index 8cbe2b3522c6..03685cb5c80f 100644
 --- a/drivers/staging/vc04_services/vc-sm-cma/vc_sm.c
 +++ b/drivers/staging/vc04_services/vc-sm-cma/vc_sm.c
 @@ -237,6 +237,7 @@ static void vc_sm_add_resource(struct vc_sm_privdata_t *privdata,
@@ -468817,7 +468832,7 @@ Signed-off-by: Paul Hermann <paul@picoreplayer.org>
  1 file changed, 97 insertions(+), 32 deletions(-)
 
 diff --git a/sound/soc/bcm/allo-piano-dac-plus.c b/sound/soc/bcm/allo-piano-dac-plus.c
-index e910d4a4546dc..d323f24e7d9a3 100644
+index e910d4a4546d..d323f24e7d9a 100644
 --- a/sound/soc/bcm/allo-piano-dac-plus.c
 +++ b/sound/soc/bcm/allo-piano-dac-plus.c
 @@ -2,7 +2,8 @@
@@ -469069,7 +469084,7 @@ Signed-off-by: Paul Hermann <paul@picoreplayer.org>
  1 file changed, 2 insertions(+)
 
 diff --git a/arch/arm/boot/dts/overlays/allo-piano-dac-plus-pcm512x-audio-overlay.dts b/arch/arm/boot/dts/overlays/allo-piano-dac-plus-pcm512x-audio-overlay.dts
-index 374c553db062e..d47a35def4f76 100644
+index 374c553db062..d47a35def4f7 100644
 --- a/arch/arm/boot/dts/overlays/allo-piano-dac-plus-pcm512x-audio-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/allo-piano-dac-plus-pcm512x-audio-overlay.dts
 @@ -23,12 +23,14 @@
@@ -469106,7 +469121,7 @@ Signed-off-by: Paul Hermann <paul@picoreplayer.org>
  1 file changed, 33 insertions(+), 23 deletions(-)
 
 diff --git a/sound/soc/bcm/allo-piano-dac-plus.c b/sound/soc/bcm/allo-piano-dac-plus.c
-index d323f24e7d9a3..245c3fc477364 100644
+index d323f24e7d9a..245c3fc47736 100644
 --- a/sound/soc/bcm/allo-piano-dac-plus.c
 +++ b/sound/soc/bcm/allo-piano-dac-plus.c
 @@ -420,6 +420,7 @@ static int pcm512x_get_reg_sub(struct snd_kcontrol *kcontrol,
@@ -469261,7 +469276,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  2 files changed, 14 insertions(+)
 
 diff --git a/drivers/net/can/dev/rx-offload.c b/drivers/net/can/dev/rx-offload.c
-index 7e75a87a8a6a9..fa65e0a4b7a0c 100644
+index 7e75a87a8a6a..fa65e0a4b7a0 100644
 --- a/drivers/net/can/dev/rx-offload.c
 +++ b/drivers/net/can/dev/rx-offload.c
 @@ -375,6 +375,17 @@ int can_rx_offload_add_fifo(struct net_device *dev, struct can_rx_offload *offlo
@@ -469283,7 +469298,7 @@ index 7e75a87a8a6a9..fa65e0a4b7a0c 100644
  {
  	can_rx_offload_reset(offload);
 diff --git a/include/linux/can/rx-offload.h b/include/linux/can/rx-offload.h
-index 01219f2902bf7..eac8f11413f09 100644
+index 01219f2902bf..eac8f11413f0 100644
 --- a/include/linux/can/rx-offload.h
 +++ b/include/linux/can/rx-offload.h
 @@ -35,6 +35,9 @@ int can_rx_offload_add_timestamp(struct net_device *dev,
@@ -469321,7 +469336,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 
 diff --git a/Documentation/devicetree/bindings/net/can/microchip,mcp25xxfd.yaml b/Documentation/devicetree/bindings/net/can/microchip,mcp25xxfd.yaml
 new file mode 100644
-index 0000000000000..aa2cad14d6d77
+index 000000000000..aa2cad14d6d7
 --- /dev/null
 +++ b/Documentation/devicetree/bindings/net/can/microchip,mcp25xxfd.yaml
 @@ -0,0 +1,79 @@
@@ -469438,7 +469453,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  create mode 100644 drivers/net/can/spi/mcp25xxfd/mcp25xxfd.h
 
 diff --git a/drivers/net/can/spi/Kconfig b/drivers/net/can/spi/Kconfig
-index 1c50788055cb6..d4b68eb5d386a 100644
+index 1c50788055cb..d4b68eb5d386 100644
 --- a/drivers/net/can/spi/Kconfig
 +++ b/drivers/net/can/spi/Kconfig
 @@ -15,4 +15,6 @@ config CAN_MCP251X
@@ -469449,7 +469464,7 @@ index 1c50788055cb6..d4b68eb5d386a 100644
 +
  endmenu
 diff --git a/drivers/net/can/spi/Makefile b/drivers/net/can/spi/Makefile
-index f115b2c466231..20c18ac96b1c9 100644
+index f115b2c46623..20c18ac96b1c 100644
 --- a/drivers/net/can/spi/Makefile
 +++ b/drivers/net/can/spi/Makefile
 @@ -6,3 +6,4 @@
@@ -469459,7 +469474,7 @@ index f115b2c466231..20c18ac96b1c9 100644
 +obj-y				+= mcp25xxfd/
 diff --git a/drivers/net/can/spi/mcp25xxfd/Kconfig b/drivers/net/can/spi/mcp25xxfd/Kconfig
 new file mode 100644
-index 0000000000000..9eb596019a58d
+index 000000000000..9eb596019a58
 --- /dev/null
 +++ b/drivers/net/can/spi/mcp25xxfd/Kconfig
 @@ -0,0 +1,17 @@
@@ -469482,7 +469497,7 @@ index 0000000000000..9eb596019a58d
 +	  Disable if unsure.
 diff --git a/drivers/net/can/spi/mcp25xxfd/Makefile b/drivers/net/can/spi/mcp25xxfd/Makefile
 new file mode 100644
-index 0000000000000..9dadf0070b424
+index 000000000000..9dadf0070b42
 --- /dev/null
 +++ b/drivers/net/can/spi/mcp25xxfd/Makefile
 @@ -0,0 +1,7 @@
@@ -469495,7 +469510,7 @@ index 0000000000000..9dadf0070b424
 +mcp25xxfd-objs += mcp25xxfd-regmap.o
 diff --git a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-crc16.c b/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-crc16.c
 new file mode 100644
-index 0000000000000..79d09aaebf332
+index 000000000000..79d09aaebf33
 --- /dev/null
 +++ b/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-crc16.c
 @@ -0,0 +1,89 @@
@@ -469590,7 +469605,7 @@ index 0000000000000..79d09aaebf332
 +}
 diff --git a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-regmap.c b/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-regmap.c
 new file mode 100644
-index 0000000000000..376649c7e443b
+index 000000000000..376649c7e443
 --- /dev/null
 +++ b/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-regmap.c
 @@ -0,0 +1,556 @@
@@ -470152,7 +470167,7 @@ index 0000000000000..376649c7e443b
 +}
 diff --git a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd.h b/drivers/net/can/spi/mcp25xxfd/mcp25xxfd.h
 new file mode 100644
-index 0000000000000..3bc799204cb01
+index 000000000000..3bc799204cb0
 --- /dev/null
 +++ b/drivers/net/can/spi/mcp25xxfd/mcp25xxfd.h
 @@ -0,0 +1,835 @@
@@ -471019,7 +471034,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  create mode 100644 drivers/net/can/spi/mcp25xxfd/mcp25xxfd-core.c
 
 diff --git a/drivers/net/can/spi/mcp25xxfd/Makefile b/drivers/net/can/spi/mcp25xxfd/Makefile
-index 9dadf0070b424..4e17f592e22ee 100644
+index 9dadf0070b42..4e17f592e22e 100644
 --- a/drivers/net/can/spi/mcp25xxfd/Makefile
 +++ b/drivers/net/can/spi/mcp25xxfd/Makefile
 @@ -3,5 +3,6 @@
@@ -471031,7 +471046,7 @@ index 9dadf0070b424..4e17f592e22ee 100644
  mcp25xxfd-objs += mcp25xxfd-regmap.o
 diff --git a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-core.c b/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-core.c
 new file mode 100644
-index 0000000000000..eed20e132ddba
+index 000000000000..eed20e132ddb
 --- /dev/null
 +++ b/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-core.c
 @@ -0,0 +1,2907 @@
@@ -473963,7 +473978,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  1 file changed, 10 insertions(+), 6 deletions(-)
 
 diff --git a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-core.c b/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-core.c
-index eed20e132ddba..fd736fc133968 100644
+index eed20e132ddb..fd736fc13396 100644
 --- a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-core.c
 +++ b/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-core.c
 @@ -392,7 +392,8 @@ static int mcp25xxfd_ring_alloc(struct mcp25xxfd_priv *priv)
@@ -474046,7 +474061,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  1 file changed, 14 insertions(+), 7 deletions(-)
 
 diff --git a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-core.c b/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-core.c
-index fd736fc133968..cad6f139bcf61 100644
+index fd736fc13396..cad6f139bcf6 100644
 --- a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-core.c
 +++ b/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-core.c
 @@ -1973,8 +1973,20 @@ mcp25xxfd_handle_eccif(struct mcp25xxfd_priv *priv, bool set_normal_mode)
@@ -474111,7 +474126,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  1 file changed, 14 insertions(+), 5 deletions(-)
 
 diff --git a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-core.c b/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-core.c
-index cad6f139bcf61..310bc93c69f80 100644
+index cad6f139bcf6..310bc93c69f8 100644
 --- a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-core.c
 +++ b/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-core.c
 @@ -2819,11 +2819,21 @@ static int mcp25xxfd_probe(struct spi_device *spi)
@@ -474172,7 +474187,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-core.c b/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-core.c
-index 310bc93c69f80..edcf9e2872844 100644
+index 310bc93c69f8..edcf9e287284 100644
 --- a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-core.c
 +++ b/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-core.c
 @@ -377,7 +377,7 @@ static void mcp25xxfd_ring_free(struct mcp25xxfd_priv *priv)
@@ -474213,7 +474228,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-core.c b/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-core.c
-index edcf9e2872844..7fb654edfc9ff 100644
+index edcf9e287284..7fb654edfc9f 100644
 --- a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-core.c
 +++ b/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-core.c
 @@ -2080,7 +2080,7 @@ static irqreturn_t mcp25xxfd_irq(int irq, void *dev_id)
@@ -474253,7 +474268,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/Documentation/devicetree/bindings/net/can/microchip,mcp25xxfd.yaml b/Documentation/devicetree/bindings/net/can/microchip,mcp25xxfd.yaml
-index aa2cad14d6d77..5beb00a614bfb 100644
+index aa2cad14d6d7..5beb00a614bf 100644
 --- a/Documentation/devicetree/bindings/net/can/microchip,mcp25xxfd.yaml
 +++ b/Documentation/devicetree/bindings/net/can/microchip,mcp25xxfd.yaml
 @@ -24,7 +24,7 @@ properties:
@@ -474324,7 +474339,7 @@ diff --git a/Documentation/devicetree/bindings/net/can/microchip,mcp25xxfd.yaml 
 similarity index 91%
 rename from Documentation/devicetree/bindings/net/can/microchip,mcp25xxfd.yaml
 rename to Documentation/devicetree/bindings/net/can/microchip,mcp251xfd.yaml
-index 5beb00a614bfb..2a884c1fe0e01 100644
+index 5beb00a614bf..2a884c1fe0e0 100644
 --- a/Documentation/devicetree/bindings/net/can/microchip,mcp25xxfd.yaml
 +++ b/Documentation/devicetree/bindings/net/can/microchip,mcp251xfd.yaml
 @@ -1,7 +1,7 @@
@@ -474391,7 +474406,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  2 files changed, 11 insertions(+), 11 deletions(-)
 
 diff --git a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-core.c b/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-core.c
-index 7fb654edfc9ff..409367e894b28 100644
+index 7fb654edfc9f..409367e894b2 100644
 --- a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-core.c
 +++ b/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-core.c
 @@ -41,10 +41,10 @@ static const struct mcp25xxfd_devtype_data mcp25xxfd_devtype_data_mcp2518fd = {
@@ -474450,7 +474465,7 @@ index 7fb654edfc9ff..409367e894b28 100644
  		/* sentinel */
  	},
 diff --git a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd.h b/drivers/net/can/spi/mcp25xxfd/mcp25xxfd.h
-index 3bc799204cb01..b1b5d7fd33ea7 100644
+index 3bc799204cb0..b1b5d7fd33ea 100644
 --- a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd.h
 +++ b/drivers/net/can/spi/mcp25xxfd/mcp25xxfd.h
 @@ -553,7 +553,7 @@ struct mcp25xxfd_regs_status {
@@ -474515,7 +474530,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  delete mode 100644 drivers/net/can/spi/mcp25xxfd/Makefile
 
 diff --git a/drivers/net/can/spi/Kconfig b/drivers/net/can/spi/Kconfig
-index d4b68eb5d386a..8f145a2daf57f 100644
+index d4b68eb5d386..8f145a2daf57 100644
 --- a/drivers/net/can/spi/Kconfig
 +++ b/drivers/net/can/spi/Kconfig
 @@ -15,6 +15,6 @@ config CAN_MCP251X
@@ -474527,7 +474542,7 @@ index d4b68eb5d386a..8f145a2daf57f 100644
  
  endmenu
 diff --git a/drivers/net/can/spi/Makefile b/drivers/net/can/spi/Makefile
-index 20c18ac96b1c9..33e3f60bbc104 100644
+index 20c18ac96b1c..33e3f60bbc10 100644
 --- a/drivers/net/can/spi/Makefile
 +++ b/drivers/net/can/spi/Makefile
 @@ -6,4 +6,4 @@
@@ -474542,7 +474557,7 @@ rename from drivers/net/can/spi/mcp25xxfd/Kconfig
 rename to drivers/net/can/spi/mcp251xfd/Kconfig
 diff --git a/drivers/net/can/spi/mcp251xfd/Makefile b/drivers/net/can/spi/mcp251xfd/Makefile
 new file mode 100644
-index 0000000000000..e943e6a2db0cb
+index 000000000000..e943e6a2db0c
 --- /dev/null
 +++ b/drivers/net/can/spi/mcp251xfd/Makefile
 @@ -0,0 +1,8 @@
@@ -474558,7 +474573,7 @@ diff --git a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-core.c b/drivers/net/can/sp
 similarity index 99%
 rename from drivers/net/can/spi/mcp25xxfd/mcp25xxfd-core.c
 rename to drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c
-index 409367e894b28..a1561d6e2326e 100644
+index 409367e894b2..a1561d6e2326 100644
 --- a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-core.c
 +++ b/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c
 @@ -23,7 +23,7 @@
@@ -474574,7 +474589,7 @@ diff --git a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-crc16.c b/drivers/net/can/s
 similarity index 99%
 rename from drivers/net/can/spi/mcp25xxfd/mcp25xxfd-crc16.c
 rename to drivers/net/can/spi/mcp251xfd/mcp251xfd-crc16.c
-index 79d09aaebf332..bc90afb34df29 100644
+index 79d09aaebf33..bc90afb34df2 100644
 --- a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-crc16.c
 +++ b/drivers/net/can/spi/mcp251xfd/mcp251xfd-crc16.c
 @@ -12,7 +12,7 @@
@@ -474590,7 +474605,7 @@ diff --git a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-regmap.c b/drivers/net/can/
 similarity index 99%
 rename from drivers/net/can/spi/mcp25xxfd/mcp25xxfd-regmap.c
 rename to drivers/net/can/spi/mcp251xfd/mcp251xfd-regmap.c
-index 376649c7e443b..3511317bb49bb 100644
+index 376649c7e443..3511317bb49b 100644
 --- a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd-regmap.c
 +++ b/drivers/net/can/spi/mcp251xfd/mcp251xfd-regmap.c
 @@ -6,7 +6,7 @@
@@ -474608,7 +474623,7 @@ rename from drivers/net/can/spi/mcp25xxfd/mcp25xxfd.h
 rename to drivers/net/can/spi/mcp251xfd/mcp251xfd.h
 diff --git a/drivers/net/can/spi/mcp25xxfd/Makefile b/drivers/net/can/spi/mcp25xxfd/Makefile
 deleted file mode 100644
-index 4e17f592e22ee..0000000000000
+index 4e17f592e22e..000000000000
 --- a/drivers/net/can/spi/mcp25xxfd/Makefile
 +++ /dev/null
 @@ -1,8 +0,0 @@
@@ -474654,7 +474669,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  3 files changed, 12 insertions(+), 12 deletions(-)
 
 diff --git a/drivers/net/can/spi/mcp251xfd/Kconfig b/drivers/net/can/spi/mcp251xfd/Kconfig
-index 9eb596019a58d..f5a147a92cb25 100644
+index 9eb596019a58..f5a147a92cb2 100644
 --- a/drivers/net/can/spi/mcp251xfd/Kconfig
 +++ b/drivers/net/can/spi/mcp251xfd/Kconfig
 @@ -1,14 +1,14 @@
@@ -474678,7 +474693,7 @@ index 9eb596019a58d..f5a147a92cb25 100644
  	help
  	  This option enables additional sanity checks in the driver,
 diff --git a/drivers/net/can/spi/mcp251xfd/Makefile b/drivers/net/can/spi/mcp251xfd/Makefile
-index e943e6a2db0cb..cb71244cbe891 100644
+index e943e6a2db0c..cb71244cbe89 100644
 --- a/drivers/net/can/spi/mcp251xfd/Makefile
 +++ b/drivers/net/can/spi/mcp251xfd/Makefile
 @@ -1,8 +1,8 @@
@@ -474696,7 +474711,7 @@ index e943e6a2db0cb..cb71244cbe891 100644
 +mcp251xfd-objs += mcp251xfd-crc16.o
 +mcp251xfd-objs += mcp251xfd-regmap.o
 diff --git a/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c b/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c
-index a1561d6e2326e..147af29e67593 100644
+index a1561d6e2326..147af29e6759 100644
 --- a/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c
 +++ b/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c
 @@ -25,7 +25,7 @@
@@ -474747,7 +474762,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  4 files changed, 1277 insertions(+), 1277 deletions(-)
 
 diff --git a/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c b/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c
-index 147af29e67593..dffa5d81a7c76 100644
+index 147af29e6759..dffa5d81a7c7 100644
 --- a/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c
 +++ b/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c
 @@ -1,6 +1,6 @@
@@ -477893,7 +477908,7 @@ index 147af29e67593..dffa5d81a7c76 100644
  MODULE_AUTHOR("Marc Kleine-Budde <mkl@pengutronix.de>");
  MODULE_DESCRIPTION("Microchip MCP251xFD Family CAN controller driver");
 diff --git a/drivers/net/can/spi/mcp251xfd/mcp251xfd-crc16.c b/drivers/net/can/spi/mcp251xfd/mcp251xfd-crc16.c
-index bc90afb34df29..a02ca76ac2398 100644
+index bc90afb34df2..a02ca76ac239 100644
 --- a/drivers/net/can/spi/mcp251xfd/mcp251xfd-crc16.c
 +++ b/drivers/net/can/spi/mcp251xfd/mcp251xfd-crc16.c
 @@ -1,6 +1,6 @@
@@ -477959,7 +477974,7 @@ index bc90afb34df29..a02ca76ac2398 100644
  	return crc;
  }
 diff --git a/drivers/net/can/spi/mcp251xfd/mcp251xfd-regmap.c b/drivers/net/can/spi/mcp251xfd/mcp251xfd-regmap.c
-index 3511317bb49bb..ba25902dd78c7 100644
+index 3511317bb49b..ba25902dd78c 100644
 --- a/drivers/net/can/spi/mcp251xfd/mcp251xfd-regmap.c
 +++ b/drivers/net/can/spi/mcp251xfd/mcp251xfd-regmap.c
 @@ -1,6 +1,6 @@
@@ -478527,7 +478542,7 @@ index 3511317bb49bb..ba25902dd78c7 100644
  
  	return 0;
 diff --git a/drivers/net/can/spi/mcp251xfd/mcp251xfd.h b/drivers/net/can/spi/mcp251xfd/mcp251xfd.h
-index b1b5d7fd33ea7..fa1246e399806 100644
+index b1b5d7fd33ea..fa1246e39980 100644
 --- a/drivers/net/can/spi/mcp251xfd/mcp251xfd.h
 +++ b/drivers/net/can/spi/mcp251xfd/mcp251xfd.h
 @@ -1,14 +1,14 @@
@@ -479870,7 +479885,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  1 file changed, 8 insertions(+), 8 deletions(-)
 
 diff --git a/drivers/net/can/spi/mcp251xfd/mcp251xfd-regmap.c b/drivers/net/can/spi/mcp251xfd/mcp251xfd-regmap.c
-index ba25902dd78c7..c9ffc5ea2b25c 100644
+index ba25902dd78c..c9ffc5ea2b25 100644
 --- a/drivers/net/can/spi/mcp251xfd/mcp251xfd-regmap.c
 +++ b/drivers/net/can/spi/mcp251xfd/mcp251xfd-regmap.c
 @@ -330,17 +330,17 @@ mcp251xfd_regmap_crc_read(void *context,
@@ -479926,7 +479941,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/net/can/spi/mcp251xfd/mcp251xfd-regmap.c b/drivers/net/can/spi/mcp251xfd/mcp251xfd-regmap.c
-index c9ffc5ea2b25c..314f868b34658 100644
+index c9ffc5ea2b25..314f868b3465 100644
 --- a/drivers/net/can/spi/mcp251xfd/mcp251xfd-regmap.c
 +++ b/drivers/net/can/spi/mcp251xfd/mcp251xfd-regmap.c
 @@ -173,7 +173,7 @@ mcp251xfd_regmap_nocrc_read(void *context,
@@ -479959,7 +479974,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  1 file changed, 11 insertions(+), 11 deletions(-)
 
 diff --git a/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c b/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c
-index dffa5d81a7c76..ac3025ccd9d5f 100644
+index dffa5d81a7c7..ac3025ccd9d5 100644
 --- a/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c
 +++ b/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c
 @@ -75,11 +75,11 @@ static const char *__mcp251xfd_get_model_str(enum mcp251xfd_model model)
@@ -480025,7 +480040,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  create mode 100644 arch/arm/boot/dts/overlays/mcp251xfd-overlay.dts
 
 diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile
-index 467cc0ae9194b..04219c05c3850 100644
+index 467cc0ae9194..04219c05c385 100644
 --- a/arch/arm/boot/dts/overlays/Makefile
 +++ b/arch/arm/boot/dts/overlays/Makefile
 @@ -108,6 +108,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
@@ -480037,7 +480052,7 @@ index 467cc0ae9194b..04219c05c3850 100644
  	mcp3202.dtbo \
  	mcp342x.dtbo \
 diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
-index dd33a27178b5a..ea76358a7ff46 100644
+index dd33a27178b5..ea76358a7ff4 100644
 --- a/arch/arm/boot/dts/overlays/README
 +++ b/arch/arm/boot/dts/overlays/README
 @@ -1763,6 +1763,28 @@ Params: oscillator              Clock frequency for the CAN controller (Hz)
@@ -480071,7 +480086,7 @@ index dd33a27178b5a..ea76358a7ff46 100644
          For devices on spi1 or spi2, the interfaces should be enabled
 diff --git a/arch/arm/boot/dts/overlays/mcp251xfd-overlay.dts b/arch/arm/boot/dts/overlays/mcp251xfd-overlay.dts
 new file mode 100644
-index 0000000000000..65c861bbd3401
+index 000000000000..65c861bbd340
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/mcp251xfd-overlay.dts
 @@ -0,0 +1,226 @@
@@ -480332,7 +480347,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  5 files changed, 5 insertions(+)
 
 diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig
-index b062fead409b0..0968943308560 100644
+index b062fead409b..096894330856 100644
 --- a/arch/arm/configs/bcm2709_defconfig
 +++ b/arch/arm/configs/bcm2709_defconfig
 @@ -416,6 +416,7 @@ CONFIG_CAN=m
@@ -480344,7 +480359,7 @@ index b062fead409b0..0968943308560 100644
  CONFIG_CAN_GS_USB=m
  CONFIG_BT=m
 diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig
-index 598e9e1989510..1a6853beda549 100644
+index 598e9e198951..1a6853beda54 100644
 --- a/arch/arm/configs/bcm2711_defconfig
 +++ b/arch/arm/configs/bcm2711_defconfig
 @@ -417,6 +417,7 @@ CONFIG_CAN=m
@@ -480356,7 +480371,7 @@ index 598e9e1989510..1a6853beda549 100644
  CONFIG_CAN_GS_USB=m
  CONFIG_BT=m
 diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig
-index 520d0bf8c7001..bd00983d72a93 100644
+index 520d0bf8c700..bd00983d72a9 100644
 --- a/arch/arm/configs/bcmrpi_defconfig
 +++ b/arch/arm/configs/bcmrpi_defconfig
 @@ -410,6 +410,7 @@ CONFIG_CAN=m
@@ -480368,7 +480383,7 @@ index 520d0bf8c7001..bd00983d72a93 100644
  CONFIG_CAN_GS_USB=m
  CONFIG_BT=m
 diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig
-index 39f2fc51de4d6..3de6d6dd9ed34 100644
+index 39f2fc51de4d..3de6d6dd9ed3 100644
 --- a/arch/arm64/configs/bcm2711_defconfig
 +++ b/arch/arm64/configs/bcm2711_defconfig
 @@ -416,6 +416,7 @@ CONFIG_CAN=m
@@ -480380,7 +480395,7 @@ index 39f2fc51de4d6..3de6d6dd9ed34 100644
  CONFIG_CAN_GS_USB=m
  CONFIG_BT=m
 diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig
-index 3d43b416bce45..3c2980cc8f35d 100644
+index 3d43b416bce4..3c2980cc8f35 100644
 --- a/arch/arm64/configs/bcmrpi3_defconfig
 +++ b/arch/arm64/configs/bcmrpi3_defconfig
 @@ -407,6 +407,7 @@ CONFIG_YAM=m
@@ -480422,7 +480437,7 @@ Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
  1 file changed, 9 insertions(+), 8 deletions(-)
 
 diff --git a/drivers/media/i2c/imx219.c b/drivers/media/i2c/imx219.c
-index 812323107f36c..fbbee1b08a8ce 100644
+index 812323107f36..fbbee1b08a8c 100644
 --- a/drivers/media/i2c/imx219.c
 +++ b/drivers/media/i2c/imx219.c
 @@ -485,8 +485,8 @@ static const struct imx219_mode supported_modes[] = {
@@ -480497,7 +480512,7 @@ Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
  1 file changed, 1 insertion(+), 2 deletions(-)
 
 diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-index 6501fb205e205..c13a0a20fd126 100644
+index 6501fb205e20..c13a0a20fd12 100644
 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
 +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
 @@ -1730,8 +1730,7 @@ static int unicam_start_streaming(struct vb2_queue *vq, unsigned int count)
@@ -480532,7 +480547,7 @@ Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
  1 file changed, 9 insertions(+), 7 deletions(-)
 
 diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-index c13a0a20fd126..60309de02369d 100644
+index c13a0a20fd12..60309de02369 100644
 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
 +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
 @@ -426,6 +426,8 @@ struct unicam_device {
@@ -480600,7 +480615,7 @@ Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
  1 file changed, 1 insertion(+)
 
 diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c
-index 60309de02369d..a8b3f5433f041 100644
+index 60309de02369..a8b3f5433f04 100644
 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
 +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
 @@ -1769,6 +1769,7 @@ static void unicam_stop_streaming(struct vb2_queue *vq)
@@ -480626,7 +480641,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  1 file changed, 2 deletions(-)
 
 diff --git a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
-index a969000c0b899..fc3f062fd820d 100644
+index a969000c0b89..fc3f062fd820 100644
 --- a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
 +++ b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
 @@ -434,8 +434,6 @@
@@ -480659,7 +480674,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  5 files changed, 5 insertions(+)
 
 diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig
-index 0968943308560..9df5d99417911 100644
+index 096894330856..9df5d9941791 100644
 --- a/arch/arm/configs/bcm2709_defconfig
 +++ b/arch/arm/configs/bcm2709_defconfig
 @@ -1238,6 +1238,7 @@ CONFIG_RTC_DRV_ISL1208=m
@@ -480671,7 +480686,7 @@ index 0968943308560..9df5d99417911 100644
  CONFIG_RTC_DRV_PCF8563=m
  CONFIG_RTC_DRV_PCF8583=m
 diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig
-index 1a6853beda549..e3b19eba75a6a 100644
+index 1a6853beda54..e3b19eba75a6 100644
 --- a/arch/arm/configs/bcm2711_defconfig
 +++ b/arch/arm/configs/bcm2711_defconfig
 @@ -1274,6 +1274,7 @@ CONFIG_RTC_DRV_ISL1208=m
@@ -480683,7 +480698,7 @@ index 1a6853beda549..e3b19eba75a6a 100644
  CONFIG_RTC_DRV_PCF8563=m
  CONFIG_RTC_DRV_PCF8583=m
 diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig
-index bd00983d72a93..1f2c5558453f0 100644
+index bd00983d72a9..1f2c5558453f 100644
 --- a/arch/arm/configs/bcmrpi_defconfig
 +++ b/arch/arm/configs/bcmrpi_defconfig
 @@ -1248,6 +1248,7 @@ CONFIG_RTC_DRV_ISL1208=m
@@ -480695,7 +480710,7 @@ index bd00983d72a93..1f2c5558453f0 100644
  CONFIG_RTC_DRV_PCF8563=m
  CONFIG_RTC_DRV_PCF8583=m
 diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig
-index 3de6d6dd9ed34..c37aa87597df5 100644
+index 3de6d6dd9ed3..c37aa87597df 100644
 --- a/arch/arm64/configs/bcm2711_defconfig
 +++ b/arch/arm64/configs/bcm2711_defconfig
 @@ -1273,6 +1273,7 @@ CONFIG_RTC_DRV_ISL1208=m
@@ -480707,7 +480722,7 @@ index 3de6d6dd9ed34..c37aa87597df5 100644
  CONFIG_RTC_DRV_PCF8563=m
  CONFIG_RTC_DRV_PCF8583=m
 diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig
-index 3c2980cc8f35d..599472e99d39a 100644
+index 3c2980cc8f35..599472e99d39 100644
 --- a/arch/arm64/configs/bcmrpi3_defconfig
 +++ b/arch/arm64/configs/bcmrpi3_defconfig
 @@ -1131,6 +1131,7 @@ CONFIG_RTC_DRV_ISL1208=m
@@ -480740,7 +480755,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  2 files changed, 61 insertions(+), 45 deletions(-)
 
 diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
-index ea76358a7ff46..cc380d8049c1c 100644
+index ea76358a7ff4..cc380d8049c1 100644
 --- a/arch/arm/boot/dts/overlays/README
 +++ b/arch/arm/boot/dts/overlays/README
 @@ -1243,6 +1243,10 @@ Params: abx80x                  Select one of the ABx80x family:
@@ -480766,7 +480781,7 @@ index ea76358a7ff46..cc380d8049c1c 100644
                                  device must be configured to use the specified
                                  address.
 diff --git a/arch/arm/boot/dts/overlays/i2c-rtc-overlay.dts b/arch/arm/boot/dts/overlays/i2c-rtc-overlay.dts
-index 735ca303e4fa7..759f532d5be15 100644
+index 735ca303e4fa..759f532d5be1 100644
 --- a/arch/arm/boot/dts/overlays/i2c-rtc-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/i2c-rtc-overlay.dts
 @@ -6,235 +6,238 @@
@@ -481080,7 +481095,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
-index cc380d8049c1c..b393c9651d08c 100644
+index cc380d8049c1..b393c9651d08 100644
 --- a/arch/arm/boot/dts/overlays/README
 +++ b/arch/arm/boot/dts/overlays/README
 @@ -1243,9 +1243,9 @@ Params: abx80x                  Select one of the ABx80x family:
@@ -481126,7 +481141,7 @@ Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
  1 file changed, 9 insertions(+), 8 deletions(-)
 
 diff --git a/drivers/media/i2c/imx477.c b/drivers/media/i2c/imx477.c
-index 3fbb173fa0796..f68e7718b09c5 100644
+index 3fbb173fa079..f68e7718b09c 100644
 --- a/drivers/media/i2c/imx477.c
 +++ b/drivers/media/i2c/imx477.c
 @@ -900,8 +900,8 @@ static const struct imx477_mode supported_modes_12bit[] = {
@@ -481206,7 +481221,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  1 file changed, 3 insertions(+)
 
 diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c
-index f72ab25e7d06c..fc14099fc4b2a 100644
+index f72ab25e7d06..fc14099fc4b2 100644
 --- a/drivers/net/usb/lan78xx.c
 +++ b/drivers/net/usb/lan78xx.c
 @@ -1181,6 +1181,9 @@ static int lan78xx_link_reset(struct lan78xx_net *dev)
@@ -481241,7 +481256,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  2 files changed, 2 insertions(+)
 
 diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
-index b393c9651d08c..c95f06407c5f7 100644
+index b393c9651d08..c95f06407c5f 100644
 --- a/arch/arm/boot/dts/overlays/README
 +++ b/arch/arm/boot/dts/overlays/README
 @@ -1898,6 +1898,7 @@ Name:   mpu6050
@@ -481253,7 +481268,7 @@ index b393c9651d08c..c95f06407c5f7 100644
  
  Name:   mz61581
 diff --git a/arch/arm/boot/dts/overlays/mpu6050-overlay.dts b/arch/arm/boot/dts/overlays/mpu6050-overlay.dts
-index 3109d90562aee..1b4c065356874 100644
+index 3109d90562ae..1b4c06535687 100644
 --- a/arch/arm/boot/dts/overlays/mpu6050-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/mpu6050-overlay.dts
 @@ -24,5 +24,6 @@
@@ -481287,7 +481302,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/arch/arm/boot/dts/overlays/ads1015-overlay.dts b/arch/arm/boot/dts/overlays/ads1015-overlay.dts
-index deeee12283956..dc1764613a8b0 100644
+index deeee1228395..dc1764613a8b 100644
 --- a/arch/arm/boot/dts/overlays/ads1015-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/ads1015-overlay.dts
 @@ -13,7 +13,7 @@
@@ -481300,7 +481315,7 @@ index deeee12283956..dc1764613a8b0 100644
                  status = "okay";
                  #address-cells = <1>;
 diff --git a/arch/arm/boot/dts/overlays/ads1115-overlay.dts b/arch/arm/boot/dts/overlays/ads1115-overlay.dts
-index 4fc571c2db334..e44ced704ee2d 100644
+index 4fc571c2db33..e44ced704ee2 100644
 --- a/arch/arm/boot/dts/overlays/ads1115-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/ads1115-overlay.dts
 @@ -15,7 +15,7 @@
@@ -481339,10 +481354,10 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
  3 files changed, 12 insertions(+)
 
 diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c
-index 7797980a99aed..66daf210bfe51 100644
+index 0f2aee679572..7cf7fdce7253 100644
 --- a/drivers/usb/host/xhci-pci.c
 +++ b/drivers/usb/host/xhci-pci.c
-@@ -259,6 +259,7 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci)
+@@ -261,6 +261,7 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci)
  			pdev->device == 0x3483) {
  		xhci->quirks |= XHCI_LPM_SUPPORT;
  		xhci->quirks |= XHCI_EP_CTX_BROKEN_DCS;
@@ -481351,7 +481366,7 @@ index 7797980a99aed..66daf210bfe51 100644
  
  	if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA &&
 diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
-index 5ef6d94ecd0f7..bc97b3f4cf19c 100644
+index 5ef6d94ecd0f..bc97b3f4cf19 100644
 --- a/drivers/usb/host/xhci-ring.c
 +++ b/drivers/usb/host/xhci-ring.c
 @@ -624,6 +624,16 @@ void xhci_find_new_dequeue_state(struct xhci_hcd *xhci,
@@ -481372,7 +481387,7 @@ index 5ef6d94ecd0f7..bc97b3f4cf19c 100644
  	state->new_deq_ptr = new_deq;
  
 diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
-index bdffc05b0e748..d243194c55f39 100644
+index bdffc05b0e74..d243194c55f3 100644
 --- a/drivers/usb/host/xhci.h
 +++ b/drivers/usb/host/xhci.h
 @@ -1877,6 +1877,7 @@ struct xhci_hcd {
@@ -481411,7 +481426,7 @@ Signed-off-by: Paul Elder <paul.elder@ideasonboard.com>
  1 file changed, 11 insertions(+), 10 deletions(-)
 
 diff --git a/drivers/media/i2c/ov5647.c b/drivers/media/i2c/ov5647.c
-index 86a821a172b3d..40d0d45a2481f 100644
+index 86a821a172b3..40d0d45a2481 100644
 --- a/drivers/media/i2c/ov5647.c
 +++ b/drivers/media/i2c/ov5647.c
 @@ -606,8 +606,8 @@ static struct ov5647_mode supported_modes_8bit[] = {
@@ -481506,7 +481521,7 @@ Signed-off-by: Patrick Menschel <menschel.p@posteo.de>
  create mode 100644 arch/arm/boot/dts/overlays/seeed-can-fd-hat-overlay.dts
 
 diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile
-index 04219c05c3850..ff269e097688b 100644
+index 04219c05c385..ff269e097688 100644
 --- a/arch/arm/boot/dts/overlays/Makefile
 +++ b/arch/arm/boot/dts/overlays/Makefile
 @@ -160,6 +160,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
@@ -481518,7 +481533,7 @@ index 04219c05c3850..ff269e097688b 100644
  	smi.dtbo \
  	smi-dev.dtbo \
 diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
-index c95f06407c5f7..60a490625c23a 100644
+index c95f06407c5f..60a490625c23 100644
 --- a/arch/arm/boot/dts/overlays/README
 +++ b/arch/arm/boot/dts/overlays/README
 @@ -81,6 +81,44 @@ Parameters usually have default values, although certain parameters are
@@ -481583,7 +481598,7 @@ index c95f06407c5f7..60a490625c23a 100644
  Load:   dtoverlay=sh1106-spi,<param>=<val>
 diff --git a/arch/arm/boot/dts/overlays/seeed-can-fd-hat-overlay.dts b/arch/arm/boot/dts/overlays/seeed-can-fd-hat-overlay.dts
 new file mode 100644
-index 0000000000000..e843d0b197450
+index 000000000000..e843d0b19745
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/seeed-can-fd-hat-overlay.dts
 @@ -0,0 +1,117 @@
@@ -481723,7 +481738,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  2 files changed, 15 insertions(+), 51 deletions(-)
 
 diff --git a/arch/arm/boot/dts/overlays/upstream-overlay.dts b/arch/arm/boot/dts/overlays/upstream-overlay.dts
-index 2e9dcd4f5f0a3..7c4071a7cb270 100644
+index 2e9dcd4f5f0a..7c4071a7cb27 100644
 --- a/arch/arm/boot/dts/overlays/upstream-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/upstream-overlay.dts
 @@ -8,96 +8,84 @@
@@ -481837,7 +481852,7 @@ index 2e9dcd4f5f0a3..7c4071a7cb270 100644
  		#address-cells = <1>;
  		#size-cells = <1>;
 diff --git a/arch/arm/boot/dts/overlays/upstream-pi4-overlay.dts b/arch/arm/boot/dts/overlays/upstream-pi4-overlay.dts
-index 5673f61b79518..1681c3060b629 100644
+index 5673f61b7951..1681c3060b62 100644
 --- a/arch/arm/boot/dts/overlays/upstream-pi4-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/upstream-pi4-overlay.dts
 @@ -110,42 +110,18 @@
@@ -481907,7 +481922,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  rename arch/arm/boot/dts/overlays/{seeed-can-fd-hat-overlay.dts => seeed-can-fd-hat-v2-overlay.dts} (100%)
 
 diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile
-index ff269e097688b..64e36e8c28dac 100644
+index ff269e097688..64e36e8c28da 100644
 --- a/arch/arm/boot/dts/overlays/Makefile
 +++ b/arch/arm/boot/dts/overlays/Makefile
 @@ -160,7 +160,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
@@ -481920,7 +481935,7 @@ index ff269e097688b..64e36e8c28dac 100644
  	smi.dtbo \
  	smi-dev.dtbo \
 diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
-index 60a490625c23a..003cd5de6141c 100644
+index 60a490625c23..003cd5de6141 100644
 --- a/arch/arm/boot/dts/overlays/README
 +++ b/arch/arm/boot/dts/overlays/README
 @@ -2482,11 +2482,11 @@ Info:   This overlay is now deprecated. Use the sd_* dtparams in the
@@ -481972,7 +481987,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  create mode 100644 arch/arm/boot/dts/overlays/seeed-can-fd-hat-v1-overlay.dts
 
 diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile
-index 64e36e8c28dac..25028bd73756c 100644
+index 64e36e8c28da..25028bd73756 100644
 --- a/arch/arm/boot/dts/overlays/Makefile
 +++ b/arch/arm/boot/dts/overlays/Makefile
 @@ -160,6 +160,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
@@ -481984,7 +481999,7 @@ index 64e36e8c28dac..25028bd73756c 100644
  	sh1106-spi.dtbo \
  	smi.dtbo \
 diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
-index 003cd5de6141c..a4fc41ca93d13 100644
+index 003cd5de6141..a4fc41ca93d1 100644
 --- a/arch/arm/boot/dts/overlays/README
 +++ b/arch/arm/boot/dts/overlays/README
 @@ -2482,6 +2482,14 @@ Info:   This overlay is now deprecated. Use the sd_* dtparams in the
@@ -482004,7 +482019,7 @@ index 003cd5de6141c..a4fc41ca93d13 100644
          (based on the mcp2518fd) and an RTC.
 diff --git a/arch/arm/boot/dts/overlays/seeed-can-fd-hat-v1-overlay.dts b/arch/arm/boot/dts/overlays/seeed-can-fd-hat-v1-overlay.dts
 new file mode 100644
-index 0000000000000..210d027a073ee
+index 000000000000..210d027a073e
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/seeed-can-fd-hat-v1-overlay.dts
 @@ -0,0 +1,138 @@
@@ -482167,7 +482182,7 @@ Signed-off-by: Aaron Shaw <shawaj@gmail.com>
  create mode 100644 arch/arm/boot/dts/overlays/wm8960-soundcard-overlay.dts
 
 diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile
-index 25028bd73756c..d8a3677b583e2 100644
+index 25028bd73756..d8a3677b583e 100644
 --- a/arch/arm/boot/dts/overlays/Makefile
 +++ b/arch/arm/boot/dts/overlays/Makefile
 @@ -211,7 +211,8 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
@@ -482181,7 +482196,7 @@ index 25028bd73756c..d8a3677b583e2 100644
  targets += dtbs dtbs_install
  targets += $(dtbo-y)
 diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
-index a4fc41ca93d13..6f2a6ecc869f1 100644
+index a4fc41ca93d1..6f2a6ecc869f 100644
 --- a/arch/arm/boot/dts/overlays/README
 +++ b/arch/arm/boot/dts/overlays/README
 @@ -3095,6 +3095,13 @@ Params: led_gpio                GPIO for LED (default "17")
@@ -482200,7 +482215,7 @@ index a4fc41ca93d13..6f2a6ecc869f1 100644
  
 diff --git a/arch/arm/boot/dts/overlays/wm8960-soundcard-overlay.dts b/arch/arm/boot/dts/overlays/wm8960-soundcard-overlay.dts
 new file mode 100644
-index 0000000000000..289fa4dacdf1f
+index 000000000000..289fa4dacdf1
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/wm8960-soundcard-overlay.dts
 @@ -0,0 +1,82 @@
@@ -482305,7 +482320,7 @@ Signed-off-by: Aaron Shaw <shawaj@gmail.com>
  2 files changed, 12 insertions(+), 2 deletions(-)
 
 diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
-index 6f2a6ecc869f1..53ef924a44011 100644
+index 6f2a6ecc869f..53ef924a4401 100644
 --- a/arch/arm/boot/dts/overlays/README
 +++ b/arch/arm/boot/dts/overlays/README
 @@ -1892,8 +1892,8 @@ Params: speed                   Display SPI bus speed
@@ -482320,7 +482335,7 @@ index 6f2a6ecc869f1..53ef924a44011 100644
  
  Name:   midi-uart0
 diff --git a/arch/arm/boot/dts/overlays/merus-amp-overlay.dts b/arch/arm/boot/dts/overlays/merus-amp-overlay.dts
-index 4501fbdc253da..bbffd7d263249 100644
+index 4501fbdc253d..bbffd7d26324 100644
 --- a/arch/arm/boot/dts/overlays/merus-amp-overlay.dts
 +++ b/arch/arm/boot/dts/overlays/merus-amp-overlay.dts
 @@ -57,4 +57,14 @@
@@ -482363,7 +482378,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  1 file changed, 6 insertions(+), 4 deletions(-)
 
 diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
-index 53ef924a44011..5252b1e67326a 100644
+index 53ef924a4401..5252b1e67326 100644
 --- a/arch/arm/boot/dts/overlays/README
 +++ b/arch/arm/boot/dts/overlays/README
 @@ -2483,16 +2483,18 @@ Load:   <Deprecated>
@@ -482407,7 +482422,7 @@ Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
  1 file changed, 27 insertions(+)
 
 diff --git a/include/uapi/linux/bcm2835-isp.h b/include/uapi/linux/bcm2835-isp.h
-index cf8c0437f1597..c50e3ca815657 100644
+index cf8c0437f159..c50e3ca81565 100644
 --- a/include/uapi/linux/bcm2835-isp.h
 +++ b/include/uapi/linux/bcm2835-isp.h
 @@ -31,6 +31,8 @@
@@ -482474,7 +482489,7 @@ Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
  3 files changed, 23 insertions(+)
 
 diff --git a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
-index f3703f2a01438..b9cf092cc3165 100644
+index f3703f2a0143..b9cf092cc316 100644
 --- a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
 +++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c
 @@ -776,6 +776,11 @@ static int bcm2835_isp_s_ctrl(struct v4l2_ctrl *ctrl)
@@ -482490,7 +482505,7 @@ index f3703f2a01438..b9cf092cc3165 100644
  		ret = set_isp_param(node, MMAL_PARAMETER_SHARPEN,
  				    ctrl->p_new.p_u8,
 diff --git a/drivers/staging/vc04_services/bcm2835-isp/bcm2835_isp_ctrls.h b/drivers/staging/vc04_services/bcm2835-isp/bcm2835_isp_ctrls.h
-index cfbb1063aad1c..172605718cdfb 100644
+index cfbb1063aad1..172605718cdf 100644
 --- a/drivers/staging/vc04_services/bcm2835-isp/bcm2835_isp_ctrls.h
 +++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835_isp_ctrls.h
 @@ -56,6 +56,11 @@ static const struct bcm2835_isp_custom_ctrl custom_ctrls[] = {
@@ -482506,7 +482521,7 @@ index cfbb1063aad1c..172605718cdfb 100644
  		.name	= "Defective Pixel Correction",
  		.id	= V4L2_CID_USER_BCM2835_ISP_DPC,
 diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h b/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h
-index 5b596b5c057f8..bcc55483561d8 100644
+index 5b596b5c057f..bcc55483561d 100644
 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h
 +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h
 @@ -277,6 +277,8 @@ enum mmal_parameter_camera_type {
@@ -482557,7 +482572,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  1 file changed, 6 insertions(+)
 
 diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
-index bdec9e50358db..1968ce27299ec 100644
+index bdec9e50358d..1968ce27299e 100644
 --- a/scripts/Makefile.lib
 +++ b/scripts/Makefile.lib
 @@ -306,6 +306,12 @@ cmd_dtco = mkdir -p $(dir ${dtc-tmp}) ; \
@@ -482593,7 +482608,7 @@ Signed-off-by: Joerg Schambacher <joerg@hifiberry.com>
  create mode 100644 arch/arm/boot/dts/overlays/hifiberry-amp100-overlay.dts
 
 diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile
-index d8a3677b583e2..b6abddcb26158 100644
+index d8a3677b583e..b6abddcb2615 100644
 --- a/arch/arm/boot/dts/overlays/Makefile
 +++ b/arch/arm/boot/dts/overlays/Makefile
 @@ -60,6 +60,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
@@ -482605,7 +482620,7 @@ index d8a3677b583e2..b6abddcb26158 100644
  	hifiberry-dacplus.dtbo \
  	hifiberry-dacplusadc.dtbo \
 diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
-index 5252b1e67326a..f3d6bf57f40b8 100644
+index 5252b1e67326..f3d6bf57f40b 100644
 --- a/arch/arm/boot/dts/overlays/README
 +++ b/arch/arm/boot/dts/overlays/README
 @@ -1045,8 +1045,36 @@ Load:   dtoverlay=hifiberry-amp
@@ -482648,7 +482663,7 @@ index 5252b1e67326a..f3d6bf57f40b8 100644
  
 diff --git a/arch/arm/boot/dts/overlays/hifiberry-amp100-overlay.dts b/arch/arm/boot/dts/overlays/hifiberry-amp100-overlay.dts
 new file mode 100644
-index 0000000000000..ebdef55d61109
+index 000000000000..ebdef55d6110
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/hifiberry-amp100-overlay.dts
 @@ -0,0 +1,64 @@
@@ -482736,7 +482751,7 @@ Signed-off-by: Joerg Schambacher <joerg@hifiberry.com>
  1 file changed, 111 insertions(+), 13 deletions(-)
 
 diff --git a/sound/soc/bcm/hifiberry_dacplus.c b/sound/soc/bcm/hifiberry_dacplus.c
-index 2f1b1ef4191a5..66a4198a1a304 100644
+index 2f1b1ef4191a..66a4198a1a30 100644
 --- a/sound/soc/bcm/hifiberry_dacplus.c
 +++ b/sound/soc/bcm/hifiberry_dacplus.c
 @@ -1,10 +1,10 @@
@@ -482982,7 +482997,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  2 files changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/arch/arm/boot/dts/bcm2711-rpi-400.dts b/arch/arm/boot/dts/bcm2711-rpi-400.dts
-index 9454ce193ec53..1ddeaec6d6089 100644
+index 9454ce193ec5..1ddeaec6d608 100644
 --- a/arch/arm/boot/dts/bcm2711-rpi-400.dts
 +++ b/arch/arm/boot/dts/bcm2711-rpi-400.dts
 @@ -495,8 +495,8 @@
@@ -482997,7 +483012,7 @@ index 9454ce193ec53..1ddeaec6d6089 100644
  };
  
 diff --git a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
-index fc3f062fd820d..49f6ba6c4792b 100644
+index fc3f062fd820..49f6ba6c4792 100644
 --- a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
 +++ b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
 @@ -434,6 +434,8 @@
@@ -483029,7 +483044,7 @@ Signed-off-by: Joerg Schambacher <joerg@hifiberry.com>
  1 file changed, 4 insertions(+), 10 deletions(-)
 
 diff --git a/sound/soc/bcm/hifiberry_dacplusadcpro.c b/sound/soc/bcm/hifiberry_dacplusadcpro.c
-index a7fab4d951b6e..f42bc0ce3f888 100644
+index a7fab4d951b6..f42bc0ce3f88 100644
 --- a/sound/soc/bcm/hifiberry_dacplusadcpro.c
 +++ b/sound/soc/bcm/hifiberry_dacplusadcpro.c
 @@ -190,6 +190,7 @@ static void snd_rpi_hifiberry_dacplusadcpro_select_clk(
@@ -483094,7 +483109,7 @@ Signed-off-by: Joerg Schambacher <joerg@hifiberry.com>
  1 file changed, 29 insertions(+), 24 deletions(-)
 
 diff --git a/sound/soc/bcm/hifiberry_dacplus.c b/sound/soc/bcm/hifiberry_dacplus.c
-index 66a4198a1a304..c94f233130919 100644
+index 66a4198a1a30..c94f23313091 100644
 --- a/sound/soc/bcm/hifiberry_dacplus.c
 +++ b/sound/soc/bcm/hifiberry_dacplus.c
 @@ -406,29 +406,34 @@ static int snd_rpi_hifiberry_dacplus_probe(struct platform_device *pdev)
diff --git a/SPECS/raspberrypi2.spec b/SPECS/raspberrypi2.spec
index b0b1c04..e72130c 100644
--- a/SPECS/raspberrypi2.spec
+++ b/SPECS/raspberrypi2.spec
@@ -1,4 +1,4 @@
-%global commit_firmware_long c5b3d8e5f432058bfdb8a781393899abadcff50e
+%global commit_firmware_long 19272ccd69049aaf42c78a235a0bf37dbabd5ea7
 %global commit_linux_long 93349cdffc3fbb446c7c1fc7354215a5b8e30b97
 
 ExclusiveArch: aarch64 armv7hl
@@ -32,7 +32,7 @@ ExclusiveArch: aarch64 armv7hl
 %define extra_version 1
 
 %define kversion 5.4
-%define kfullversion %{kversion}.125
+%define kfullversion %{kversion}.129
 
 Name:           raspberrypi2
 Version:        %{kfullversion}
@@ -285,6 +285,9 @@ cp $(ls -1d /usr/share/%{name}-kernel/*-*/|sort -V|tail -1)/boot/overlays/README
 %doc /boot/LICENCE.broadcom
 
 %changelog
+* Wed Jun 30 2021 Pablo Greco <pgreco@centosproject.org> - 5.4.129
+- Update to version v5.4.129
+
 * Tue Jun 15 2021 Pablo Greco <pgreco@centosproject.org> - 5.4.125
 - Update to version v5.4.125