From e0753c5d5cef5b03c60601364188afb262ccd02e Mon Sep 17 00:00:00 2001 From: John Audia Date: Mon, 29 Aug 2022 11:30:27 -0400 Subject: [PATCH] kernel: bump 5.10 to 5.10.139 All patches automatically rebased. Signed-off-by: John Audia --- include/kernel-5.10 | 4 +- .../300-mips-add-rtl838x-platform.patch | 2 +- .../318-add-rtl83xx-clk-support.patch | 46 ++++++++----------- 3 files changed, 23 insertions(+), 29 deletions(-) diff --git a/include/kernel-5.10 b/include/kernel-5.10 index 4143799e89..8933b1de83 100644 --- a/include/kernel-5.10 +++ b/include/kernel-5.10 @@ -1,2 +1,2 @@ -LINUX_VERSION-5.10 = .138 -LINUX_KERNEL_HASH-5.10.138 = 29a003bb8e0e3a45942f703370fb0b3460e6fdcbbad37424423c9cf831ab5ba8 +LINUX_VERSION-5.10 = .139 +LINUX_KERNEL_HASH-5.10.139 = 1c002ac275a44934a280a158a136735bf6665b26a42d344023b4648a7898bef1 diff --git a/target/linux/realtek/patches-5.10/300-mips-add-rtl838x-platform.patch b/target/linux/realtek/patches-5.10/300-mips-add-rtl838x-platform.patch index 476afba6a8..87ab1a7543 100644 --- a/target/linux/realtek/patches-5.10/300-mips-add-rtl838x-platform.patch +++ b/target/linux/realtek/patches-5.10/300-mips-add-rtl838x-platform.patch @@ -73,7 +73,7 @@ source "arch/mips/alchemy/Kconfig" source "arch/mips/ath25/Kconfig" source "arch/mips/ath79/Kconfig" -@@ -1097,6 +1147,9 @@ config CEVT_GT641XX +@@ -1097,6 +1151,9 @@ config CEVT_GT641XX config CEVT_R4K bool diff --git a/target/linux/realtek/patches-5.10/318-add-rtl83xx-clk-support.patch b/target/linux/realtek/patches-5.10/318-add-rtl83xx-clk-support.patch index 5215a75087..285b7489f2 100644 --- a/target/linux/realtek/patches-5.10/318-add-rtl83xx-clk-support.patch +++ b/target/linux/realtek/patches-5.10/318-add-rtl83xx-clk-support.patch @@ -1,26 +1,20 @@ -diff -rpN x/drivers/clk/Kconfig y/drivers/clk/Kconfig -*** x/drivers/clk/Kconfig 2022-07-29 14:28:59.704481188 +0200 ---- y/drivers/clk/Kconfig 2022-07-29 14:29:56.886053322 +0200 -*************** source "drivers/clk/mediatek/Kconfig" -*** 372,377 **** ---- 372,378 ---- - source "drivers/clk/meson/Kconfig" - source "drivers/clk/mvebu/Kconfig" - source "drivers/clk/qcom/Kconfig" -+ source "drivers/clk/realtek/Kconfig" - source "drivers/clk/renesas/Kconfig" - source "drivers/clk/rockchip/Kconfig" - source "drivers/clk/samsung/Kconfig" -diff -rpN x/drivers/clk/Makefile y/drivers/clk/Makefile -*** x/drivers/clk/Makefile 2022-07-29 13:34:36.638231518 +0200 ---- y/drivers/clk/Makefile 2022-07-29 13:34:19.105060958 +0200 -*************** obj-$(CONFIG_COMMON_CLK_NXP) += nxp/ -*** 100,105 **** ---- 100,106 ---- - obj-$(CONFIG_MACH_PISTACHIO) += pistachio/ - obj-$(CONFIG_COMMON_CLK_PXA) += pxa/ - obj-$(CONFIG_COMMON_CLK_QCOM) += qcom/ -+ obj-$(CONFIG_COMMON_CLK_REALTEK) += realtek/ - obj-y += renesas/ - obj-$(CONFIG_ARCH_ROCKCHIP) += rockchip/ - obj-$(CONFIG_COMMON_CLK_SAMSUNG) += samsung/ +--- a/drivers/clk/Kconfig ++++ b/drivers/clk/Kconfig +@@ -372,6 +372,7 @@ source "drivers/clk/mediatek/Kconfig" + source "drivers/clk/meson/Kconfig" + source "drivers/clk/mvebu/Kconfig" + source "drivers/clk/qcom/Kconfig" ++source "drivers/clk/realtek/Kconfig" + source "drivers/clk/renesas/Kconfig" + source "drivers/clk/rockchip/Kconfig" + source "drivers/clk/samsung/Kconfig" +--- a/drivers/clk/Makefile ++++ b/drivers/clk/Makefile +@@ -100,6 +100,7 @@ obj-$(CONFIG_COMMON_CLK_NXP) += nxp/ + obj-$(CONFIG_MACH_PISTACHIO) += pistachio/ + obj-$(CONFIG_COMMON_CLK_PXA) += pxa/ + obj-$(CONFIG_COMMON_CLK_QCOM) += qcom/ ++obj-$(CONFIG_COMMON_CLK_REALTEK) += realtek/ + obj-y += renesas/ + obj-$(CONFIG_ARCH_ROCKCHIP) += rockchip/ + obj-$(CONFIG_COMMON_CLK_SAMSUNG) += samsung/