diff options
author | Rafał Miłecki <rafal@milecki.pl> | 2023-10-31 17:09:45 +0100 |
---|---|---|
committer | Rafał Miłecki <rafal@milecki.pl> | 2023-11-02 09:45:08 +0100 |
commit | 0dec0e0f1931bb6089daef6cfb5a3670bcaa64b7 (patch) | |
tree | 126b768dd939ecc30749d4f42d23b47b0fd398c2 /target/linux/generic/hack-5.15 | |
parent | 20736013e91030005353b401bc4b757ba5e5fa98 (diff) | |
download | upstream-0dec0e0f1931bb6089daef6cfb5a3670bcaa64b7.tar.gz upstream-0dec0e0f1931bb6089daef6cfb5a3670bcaa64b7.tar.bz2 upstream-0dec0e0f1931bb6089daef6cfb5a3670bcaa64b7.zip |
kernel: fix mtd/NVMEM regression affecting U-Boot env NVMEM driver
Fixes: 20736013e910 ("kernel: backport nvmem v6.6 fixes and v6.7 changes")
Fixes: https://github.com/openwrt/openwrt/issues/13831
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
(cherry picked from commit c997634c017294cb38cf6f9a0112860c7e736a53)
Diffstat (limited to 'target/linux/generic/hack-5.15')
-rw-r--r-- | target/linux/generic/hack-5.15/402-mtd-blktrans-call-add-disks-after-mtd-device.patch | 2 | ||||
-rw-r--r-- | target/linux/generic/hack-5.15/420-mtd-support-OpenWrt-s-MTD_ROOTFS_ROOT_DEV.patch | 2 |
2 files changed, 2 insertions, 2 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 62737aa779..1df6f2f18b 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" -@@ -1083,6 +1084,8 @@ int mtd_device_parse_register(struct mtd +@@ -1106,6 +1107,8 @@ int mtd_device_parse_register(struct mtd register_reboot_notifier(&mtd->reboot_notifier); } diff --git a/target/linux/generic/hack-5.15/420-mtd-support-OpenWrt-s-MTD_ROOTFS_ROOT_DEV.patch b/target/linux/generic/hack-5.15/420-mtd-support-OpenWrt-s-MTD_ROOTFS_ROOT_DEV.patch index 947b2c262f..ed46301b0e 100644 --- a/target/linux/generic/hack-5.15/420-mtd-support-OpenWrt-s-MTD_ROOTFS_ROOT_DEV.patch +++ b/target/linux/generic/hack-5.15/420-mtd-support-OpenWrt-s-MTD_ROOTFS_ROOT_DEV.patch @@ -12,7 +12,7 @@ Signed-off-by: Rafał Miłecki <rafal@milecki.pl> --- a/drivers/mtd/mtdcore.c +++ b/drivers/mtd/mtdcore.c -@@ -761,7 +761,8 @@ int add_mtd_device(struct mtd_info *mtd) +@@ -784,7 +784,8 @@ int add_mtd_device(struct mtd_info *mtd) mutex_unlock(&mtd_table_mutex); |