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>
--- 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
+...
--- 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
+...
--- 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
--- 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*