From c9929fabcbd367cc82a9080ced08d7f21dead45a Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Tue, 10 May 2022 18:32:52 +0000 Subject: [PATCH] kernel: bump 5.10 to 5.10.116 Removed upstreamed: generic/backport-5.10/900-regulator-consumer-Add-missing-stubs-to-regulator-co.patch All other patches automatically rebased. Compile-tested: lantiq/xrx200, armvirt/64 Run-tested: lantiq/xrx200, armvirt/64 Signed-off-by: Hauke Mehrtens --- include/kernel-5.10 | 4 +- ...er-Add-missing-stubs-to-regulator-co.patch | 79 ------------------- .../generic/hack-5.10/902-debloat_proc.patch | 2 +- ...-add-support-for-Toshiba-TC58NVG0S3H.patch | 7 +- ...Mangle-bootloader-s-kernel-arguments.patch | 2 +- .../900-arm-add-cmdline-override.patch | 2 +- ...Mangle-bootloader-s-kernel-arguments.patch | 2 +- ...Mangle-bootloader-s-kernel-arguments.patch | 2 +- 8 files changed, 8 insertions(+), 92 deletions(-) delete mode 100644 target/linux/generic/backport-5.10/900-regulator-consumer-Add-missing-stubs-to-regulator-co.patch diff --git a/include/kernel-5.10 b/include/kernel-5.10 index 405640f695c..348ba6152a0 100644 --- a/include/kernel-5.10 +++ b/include/kernel-5.10 @@ -1,2 +1,2 @@ -LINUX_VERSION-5.10 = .115 -LINUX_KERNEL_HASH-5.10.115 = f5e417b32f89318b6d0a230109a592ffd68997817463dc4692fa49ec7fe42f71 +LINUX_VERSION-5.10 = .116 +LINUX_KERNEL_HASH-5.10.116 = 806692ba7436f9cfbc32709fe20097dbde4ae5e2f4ae582f39b1d91ce5d20b49 diff --git a/target/linux/generic/backport-5.10/900-regulator-consumer-Add-missing-stubs-to-regulator-co.patch b/target/linux/generic/backport-5.10/900-regulator-consumer-Add-missing-stubs-to-regulator-co.patch deleted file mode 100644 index c5470e8b82c..00000000000 --- a/target/linux/generic/backport-5.10/900-regulator-consumer-Add-missing-stubs-to-regulator-co.patch +++ /dev/null @@ -1,79 +0,0 @@ -From a71658c7db0b2be9fcab3522aeabe11792a4f481 Mon Sep 17 00:00:00 2001 -From: Dmitry Osipenko -Date: Wed, 20 Jan 2021 23:58:44 +0300 -Subject: [PATCH] regulator: consumer: Add missing stubs to - regulator/consumer.h -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -commit 51dfb6ca3728bd0a0a3c23776a12d2a15a1d2457 upstream. - -Add missing stubs to regulator/consumer.h in order to fix COMPILE_TEST -of the kernel. In particular this should fix compile-testing of OPP core -because of a missing stub for regulator_sync_voltage(). - -Reported-by: kernel test robot -Signed-off-by: Dmitry Osipenko -Link: https://lore.kernel.org/r/20210120205844.12658-1-digetx@gmail.com -Signed-off-by: Mark Brown -Cc: Bjørn Mork -Cc: Sudip Mukherjee -Signed-off-by: Greg Kroah-Hartman ---- - include/linux/regulator/consumer.h | 30 ++++++++++++++++++++++++++++++ - 1 file changed, 30 insertions(+) - ---- a/include/linux/regulator/consumer.h -+++ b/include/linux/regulator/consumer.h -@@ -332,6 +332,12 @@ regulator_get_exclusive(struct device *d - } - - static inline struct regulator *__must_check -+devm_regulator_get_exclusive(struct device *dev, const char *id) -+{ -+ return ERR_PTR(-ENODEV); -+} -+ -+static inline struct regulator *__must_check - regulator_get_optional(struct device *dev, const char *id) - { - return ERR_PTR(-ENODEV); -@@ -486,6 +492,11 @@ static inline int regulator_get_voltage( - return -EINVAL; - } - -+static inline int regulator_sync_voltage(struct regulator *regulator) -+{ -+ return -EINVAL; -+} -+ - static inline int regulator_is_supported_voltage(struct regulator *regulator, - int min_uV, int max_uV) - { -@@ -578,6 +589,25 @@ static inline int devm_regulator_unregis - return 0; - } - -+static inline int regulator_suspend_enable(struct regulator_dev *rdev, -+ suspend_state_t state) -+{ -+ return -EINVAL; -+} -+ -+static inline int regulator_suspend_disable(struct regulator_dev *rdev, -+ suspend_state_t state) -+{ -+ return -EINVAL; -+} -+ -+static inline int regulator_set_suspend_voltage(struct regulator *regulator, -+ int min_uV, int max_uV, -+ suspend_state_t state) -+{ -+ return -EINVAL; -+} -+ - static inline void *regulator_get_drvdata(struct regulator *regulator) - { - return NULL; diff --git a/target/linux/generic/hack-5.10/902-debloat_proc.patch b/target/linux/generic/hack-5.10/902-debloat_proc.patch index 33a3e3c5d5d..0838e2c43c3 100644 --- a/target/linux/generic/hack-5.10/902-debloat_proc.patch +++ b/target/linux/generic/hack-5.10/902-debloat_proc.patch @@ -246,7 +246,7 @@ Signed-off-by: Felix Fietkau &vmalloc_op, --- a/mm/vmstat.c +++ b/mm/vmstat.c -@@ -2044,10 +2044,12 @@ void __init init_mm_internals(void) +@@ -2040,10 +2040,12 @@ void __init init_mm_internals(void) start_shepherd_timer(); #endif #ifdef CONFIG_PROC_FS diff --git a/target/linux/generic/pending-5.10/444-mtd-nand-rawnand-add-support-for-Toshiba-TC58NVG0S3H.patch b/target/linux/generic/pending-5.10/444-mtd-nand-rawnand-add-support-for-Toshiba-TC58NVG0S3H.patch index f644c4a73e7..bafdaccd250 100644 --- a/target/linux/generic/pending-5.10/444-mtd-nand-rawnand-add-support-for-Toshiba-TC58NVG0S3H.patch +++ b/target/linux/generic/pending-5.10/444-mtd-nand-rawnand-add-support-for-Toshiba-TC58NVG0S3H.patch @@ -18,11 +18,9 @@ Signed-off-by: Andreas Böhler drivers/mtd/nand/raw/nand_ids.c | 3 +++ 1 file changed, 3 insertions(+) -diff --git a/drivers/mtd/nand/raw/nand_ids.c b/drivers/mtd/nand/raw/nand_ids.c -index 6e41902be35f..d64adbd1ce6b 100644 --- a/drivers/mtd/nand/raw/nand_ids.c +++ b/drivers/mtd/nand/raw/nand_ids.c -@@ -29,6 +29,9 @@ struct nand_flash_dev nand_flash_ids[] = { +@@ -29,6 +29,9 @@ struct nand_flash_dev nand_flash_ids[] = {"TC58NVG0S3E 1G 3.3V 8-bit", { .id = {0x98, 0xd1, 0x90, 0x15, 0x76, 0x14, 0x01, 0x00} }, SZ_2K, SZ_128, SZ_128K, 0, 8, 64, NAND_ECC_INFO(1, SZ_512), }, @@ -32,6 +30,3 @@ index 6e41902be35f..d64adbd1ce6b 100644 {"TC58NVG2S0F 4G 3.3V 8-bit", { .id = {0x98, 0xdc, 0x90, 0x26, 0x76, 0x15, 0x01, 0x08} }, SZ_4K, SZ_512, SZ_256K, 0, 8, 224, NAND_ECC_INFO(4, SZ_512) }, --- -2.35.1 - diff --git a/target/linux/ipq806x/patches-5.10/0067-generic-Mangle-bootloader-s-kernel-arguments.patch b/target/linux/ipq806x/patches-5.10/0067-generic-Mangle-bootloader-s-kernel-arguments.patch index 8f669319edb..e9f2d059371 100644 --- a/target/linux/ipq806x/patches-5.10/0067-generic-Mangle-bootloader-s-kernel-arguments.patch +++ b/target/linux/ipq806x/patches-5.10/0067-generic-Mangle-bootloader-s-kernel-arguments.patch @@ -22,7 +22,7 @@ Signed-off-by: Adrian Panella --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig -@@ -1781,6 +1781,17 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN +@@ -1777,6 +1777,17 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN The command-line arguments provided by the boot loader will be appended to the the device tree bootargs property. diff --git a/target/linux/ipq806x/patches-5.10/900-arm-add-cmdline-override.patch b/target/linux/ipq806x/patches-5.10/900-arm-add-cmdline-override.patch index dba917872c0..ddc3b7cb527 100644 --- a/target/linux/ipq806x/patches-5.10/900-arm-add-cmdline-override.patch +++ b/target/linux/ipq806x/patches-5.10/900-arm-add-cmdline-override.patch @@ -1,6 +1,6 @@ --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig -@@ -1794,6 +1794,14 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_MANGL +@@ -1790,6 +1790,14 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_MANGL endchoice diff --git a/target/linux/mvebu/patches-5.10/300-mvebu-Mangle-bootloader-s-kernel-arguments.patch b/target/linux/mvebu/patches-5.10/300-mvebu-Mangle-bootloader-s-kernel-arguments.patch index 36f10fcfb52..04c80113c15 100644 --- a/target/linux/mvebu/patches-5.10/300-mvebu-Mangle-bootloader-s-kernel-arguments.patch +++ b/target/linux/mvebu/patches-5.10/300-mvebu-Mangle-bootloader-s-kernel-arguments.patch @@ -28,7 +28,7 @@ Signed-off-by: Michael Gray --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig -@@ -1781,6 +1781,17 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN +@@ -1777,6 +1777,17 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN The command-line arguments provided by the boot loader will be appended to the the device tree bootargs property. diff --git a/target/linux/oxnas/patches-5.10/996-generic-Mangle-bootloader-s-kernel-arguments.patch b/target/linux/oxnas/patches-5.10/996-generic-Mangle-bootloader-s-kernel-arguments.patch index 898e6023065..8f56bdbf9c2 100644 --- a/target/linux/oxnas/patches-5.10/996-generic-Mangle-bootloader-s-kernel-arguments.patch +++ b/target/linux/oxnas/patches-5.10/996-generic-Mangle-bootloader-s-kernel-arguments.patch @@ -22,7 +22,7 @@ Signed-off-by: Adrian Panella --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig -@@ -1781,6 +1781,17 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN +@@ -1777,6 +1777,17 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN The command-line arguments provided by the boot loader will be appended to the the device tree bootargs property.