[openwrt/openwrt] ath79: refresh kernel patches

LEDE Commits lede-commits at lists.infradead.org
Thu Oct 20 00:53:43 PDT 2022


ynezz pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/329b583aad489c7aafef672a816e43eac4f9d437

commit 329b583aad489c7aafef672a816e43eac4f9d437
Author: Petr Štetiar <ynezz at true.cz>
AuthorDate: Thu Oct 20 07:47:54 2022 +0200

    ath79: refresh kernel patches
    
    Refresh dirty patches after commit 711f1a8bcbdd ("kernel: mtd: backport
    SafeLoader parser").
    
    Fixes: 711f1a8bcbdd ("kernel: mtd: backport SafeLoader parser")
    Signed-off-by: Petr Štetiar <ynezz at true.cz>
---
 .../patches-5.15/401-mtd-nor-support-mtd-name-from-device-tree.patch    | 2 +-
 target/linux/ath79/patches-5.15/404-mtd-cybertan-trx-parser.patch       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/target/linux/ath79/patches-5.15/401-mtd-nor-support-mtd-name-from-device-tree.patch b/target/linux/ath79/patches-5.15/401-mtd-nor-support-mtd-name-from-device-tree.patch
index 92f5116a8e..5ff2a61c7a 100644
--- a/target/linux/ath79/patches-5.15/401-mtd-nor-support-mtd-name-from-device-tree.patch
+++ b/target/linux/ath79/patches-5.15/401-mtd-nor-support-mtd-name-from-device-tree.patch
@@ -34,7 +34,7 @@ Signed-off-by: Abhimanyu Vishwakarma <Abhimanyu.Vishwakarma at imgtec.com>
  	mtd->type = MTD_NORFLASH;
 --- a/drivers/mtd/mtdcore.c
 +++ b/drivers/mtd/mtdcore.c
-@@ -851,6 +851,17 @@ out_error:
+@@ -843,6 +843,17 @@ out_error:
   */
  static void mtd_set_dev_defaults(struct mtd_info *mtd)
  {
diff --git a/target/linux/ath79/patches-5.15/404-mtd-cybertan-trx-parser.patch b/target/linux/ath79/patches-5.15/404-mtd-cybertan-trx-parser.patch
index cfc017871f..4e8e536e29 100644
--- a/target/linux/ath79/patches-5.15/404-mtd-cybertan-trx-parser.patch
+++ b/target/linux/ath79/patches-5.15/404-mtd-cybertan-trx-parser.patch
@@ -25,7 +25,7 @@ Submitted-by: Christian Lamparter <chunkeey at gmail.com>
 +obj-$(CONFIG_MTD_PARSER_CYBERTAN)	+= parser_cybertan.o
  obj-$(CONFIG_MTD_PARSER_IMAGETAG)	+= parser_imagetag.o
  obj-$(CONFIG_MTD_AFS_PARTS)		+= afs.o
- obj-$(CONFIG_MTD_PARSER_TRX)		+= parser_trx.o
+ obj-$(CONFIG_MTD_PARSER_TPLINK_SAFELOADER)	+= tplink_safeloader.o
 --- a/drivers/mtd/parsers/Kconfig
 +++ b/drivers/mtd/parsers/Kconfig
 @@ -102,6 +102,14 @@ config MTD_OF_PARTS_LINKSYS_NS




More information about the lede-commits mailing list