diff options
author | John Audia <therealgraysky@proton.me> | 2022-10-27 06:26:25 -0400 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-10-30 17:52:42 +0100 |
commit | aa2fa2eb76f13e48cd39d844dca34627da00cb5d (patch) | |
tree | 4252a116ecb086acb763b735ef6ec544a2143247 /target/linux/ath79/patches-5.10 | |
parent | 641e4f2f0479997c71ff6c1f1b63fb9b5c67e687 (diff) | |
download | upstream-aa2fa2eb76f13e48cd39d844dca34627da00cb5d.tar.gz upstream-aa2fa2eb76f13e48cd39d844dca34627da00cb5d.tar.bz2 upstream-aa2fa2eb76f13e48cd39d844dca34627da00cb5d.zip |
kernel: bump 5.10 to 5.10.150
Manually rebased:
bcm53xx/patches-5.10/180-usb-xhci-add-support-for-performing-fake-doorbell.patch
All patches automatically rebased.
Signed-off-by: John Audia <therealgraysky@proton.me>
[Move gro_skip in 680-NET-skip-GRO-for-foreign-MAC-addresses.patch to old position]
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/ath79/patches-5.10')
-rw-r--r-- | target/linux/ath79/patches-5.10/401-mtd-nor-support-mtd-name-from-device-tree.patch | 2 | ||||
-rw-r--r-- | target/linux/ath79/patches-5.10/404-mtd-cybertan-trx-parser.patch | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/ath79/patches-5.10/401-mtd-nor-support-mtd-name-from-device-tree.patch b/target/linux/ath79/patches-5.10/401-mtd-nor-support-mtd-name-from-device-tree.patch index 62f610492f..5b14d1f8cb 100644 --- a/target/linux/ath79/patches-5.10/401-mtd-nor-support-mtd-name-from-device-tree.patch +++ b/target/linux/ath79/patches-5.10/401-mtd-nor-support-mtd-name-from-device-tree.patch @@ -34,7 +34,7 @@ Signed-off-by: Abhimanyu Vishwakarma <Abhimanyu.Vishwakarma@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.10/404-mtd-cybertan-trx-parser.patch b/target/linux/ath79/patches-5.10/404-mtd-cybertan-trx-parser.patch index cfc017871f..4e8e536e29 100644 --- a/target/linux/ath79/patches-5.10/404-mtd-cybertan-trx-parser.patch +++ b/target/linux/ath79/patches-5.10/404-mtd-cybertan-trx-parser.patch @@ -25,7 +25,7 @@ Submitted-by: Christian Lamparter <chunkeey@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 |