aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Hainke <vincent@systemli.org>2022-07-01 15:25:29 +0200
committerChristian Marangi <ansuelsmth@gmail.com>2022-07-01 20:24:43 +0200
commit3c3367f03e3e45fb87698df9777eb0e3cf83f7b3 (patch)
treebc4a192a798a384900e3cb169df0d58b69f4ea1f
parent668619425526cb0d43f8536a2f6f15a6314e6553 (diff)
downloadupstream-3c3367f03e3e45fb87698df9777eb0e3cf83f7b3.tar.gz
upstream-3c3367f03e3e45fb87698df9777eb0e3cf83f7b3.tar.bz2
upstream-3c3367f03e3e45fb87698df9777eb0e3cf83f7b3.zip
generic: 5.15: refresh patches
Refresh patches: - 402-mtd-blktrans-call-add-disks-after-mtd-device.patch - 420-mtd-set-rootfs-to-be-root-dev.patch - 495-mtd-core-add-get_mtd_device_by_node.patch Signed-off-by: Nick Hainke <vincent@systemli.org>
-rw-r--r--target/linux/generic/hack-5.15/402-mtd-blktrans-call-add-disks-after-mtd-device.patch2
-rw-r--r--target/linux/generic/hack-5.15/420-mtd-set-rootfs-to-be-root-dev.patch2
-rw-r--r--target/linux/generic/pending-5.15/495-mtd-core-add-get_mtd_device_by_node.patch2
3 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/hack-5.15/402-mtd-blktrans-call-add-disks-after-mtd-device.patch b/target/linux/generic/hack-5.15/402-mtd-blktrans-call-add-disks-after-mtd-device.patch
index d0f81c485b..88ca07f517 100644
--- a/target/linux/generic/hack-5.15/402-mtd-blktrans-call-add-disks-after-mtd-device.patch
+++ b/target/linux/generic/hack-5.15/402-mtd-blktrans-call-add-disks-after-mtd-device.patch
@@ -77,7 +77,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
#include "mtdcore.h"
-@@ -1002,6 +1003,8 @@ int mtd_device_parse_register(struct mtd
+@@ -1012,6 +1013,8 @@ int mtd_device_parse_register(struct mtd
ret = mtd_otp_nvmem_add(mtd);
diff --git a/target/linux/generic/hack-5.15/420-mtd-set-rootfs-to-be-root-dev.patch b/target/linux/generic/hack-5.15/420-mtd-set-rootfs-to-be-root-dev.patch
index 8ac1dca238..4cefe35e55 100644
--- a/target/linux/generic/hack-5.15/420-mtd-set-rootfs-to-be-root-dev.patch
+++ b/target/linux/generic/hack-5.15/420-mtd-set-rootfs-to-be-root-dev.patch
@@ -20,7 +20,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
#include <linux/nvmem-provider.h>
#include <linux/mtd/mtd.h>
-@@ -697,6 +698,16 @@ int add_mtd_device(struct mtd_info *mtd)
+@@ -707,6 +708,16 @@ int add_mtd_device(struct mtd_info *mtd)
of this try_ nonsense, and no bitching about it
either. :) */
__module_get(THIS_MODULE);
diff --git a/target/linux/generic/pending-5.15/495-mtd-core-add-get_mtd_device_by_node.patch b/target/linux/generic/pending-5.15/495-mtd-core-add-get_mtd_device_by_node.patch
index a708a46b04..d1b2c9d1a5 100644
--- a/target/linux/generic/pending-5.15/495-mtd-core-add-get_mtd_device_by_node.patch
+++ b/target/linux/generic/pending-5.15/495-mtd-core-add-get_mtd_device_by_node.patch
@@ -17,7 +17,7 @@ Reviewed-by: Miquel Raynal <miquel.raynal@bootlin.com>
--- a/drivers/mtd/mtdcore.c
+++ b/drivers/mtd/mtdcore.c
-@@ -1203,6 +1203,44 @@ out_unlock:
+@@ -1213,6 +1213,44 @@ out_unlock:
}
EXPORT_SYMBOL_GPL(get_mtd_device_nm);