kernel: Refresh kernel patches
authorHauke Mehrtens <hauke@hauke-m.de>
Sat, 7 Jan 2023 13:51:55 +0000 (14:51 +0100)
committerHauke Mehrtens <hauke@hauke-m.de>
Sat, 7 Jan 2023 13:53:10 +0000 (14:53 +0100)
Make the patches apply cleanly again.

Fixes: 8dfe69cdfc5c ("kernel: update nvmem subsystem to the latest upstream")
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
target/linux/bcm27xx/patches-5.15/950-0281-media-i2c-Add-driver-for-Sony-IMX477-sensor.patch
target/linux/bcm27xx/patches-5.15/950-0413-Documentation-devicetree-Add-documentation-for-imx37.patch
target/linux/bcm27xx/patches-5.15/950-0520-dt-bindings-media-i2c-Add-IMX519-CMOS-sensor-binding.patch
target/linux/realtek/patches-5.10/008-5.17-watchdog-add-realtek-otto-watchdog-timer.patch

index ce18978978951f002fe1139a48f897c773bb423f..2727d476d94b6300e99cc4944842c27327392db0 100644 (file)
@@ -25,7 +25,7 @@ Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
 
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -17521,6 +17521,14 @@ T:    git git://linuxtv.org/media_tree.git
+@@ -17529,6 +17529,14 @@ T:    git git://linuxtv.org/media_tree.git
  F:    Documentation/devicetree/bindings/media/i2c/sony,imx412.yaml
  F:    drivers/media/i2c/imx412.c
  
index bf0a69ffe5b8a390f0deab48af73e96405c5e874..f21349769cdf7d3653c9b58c45fe6c18a7608b04 100644 (file)
@@ -132,7 +132,7 @@ Signed-off-by: David Plowman <david.plowman@raspberrypi.com>
 +...
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -17535,6 +17535,7 @@ M:     Raspberry Pi Kernel Maintenance <kern
+@@ -17543,6 +17543,7 @@ M:     Raspberry Pi Kernel Maintenance <kern
  L:    linux-media@vger.kernel.org
  S:    Maintained
  T:    git git://linuxtv.org/media_tree.git
index 8130a394497e41e15e8fdb31a1095a35d7c029a4..0107f0dc0e603859163e87128a8648d2a78be5e0 100644 (file)
@@ -132,7 +132,7 @@ Signed-off-by: Lee Jackson <info@arducam.com>
 +...
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -17539,6 +17539,14 @@ F:    Documentation/devicetree/bindings/med
+@@ -17547,6 +17547,14 @@ F:    Documentation/devicetree/bindings/med
  F:    Documentation/devicetree/bindings/media/i2c/imx477.yaml
  F:    drivers/media/i2c/imx477.c
  
index 845441b4257fb6cd578e4e21939a2b15fc198ba2..cf93d28f0a17679631ebf60e31219cf0e8be1b7d 100644 (file)
@@ -32,7 +32,7 @@ Signed-off-by: Guenter Roeck <linux@roeck-us.net>
 
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -14816,6 +14816,13 @@ S:    Maintained
+@@ -14824,6 +14824,13 @@ S:    Maintained
  F:    include/sound/rt*.h
  F:    sound/soc/codecs/rt*