From a3216ac63101468d056c619cd3a0ac7dbb7b5345 Mon Sep 17 00:00:00 2001 From: Liu Linhui Date: Sun, 16 Oct 2022 21:35:25 +0800 Subject: [PATCH] kernel: bump 5.15 to 5.15.74 All patches automatically rebased. Signed-off-by: Liu Linhui --- include/kernel-5.15 | 4 +-- .../x86/patches-5.15/800-add-rts5139.patch | 35 +++++++++++-------- 2 files changed, 23 insertions(+), 16 deletions(-) diff --git a/include/kernel-5.15 b/include/kernel-5.15 index f971683bdd03f8..bd2e9f1dd3af5c 100644 --- a/include/kernel-5.15 +++ b/include/kernel-5.15 @@ -1,2 +1,2 @@ -LINUX_VERSION-5.15 = .72 -LINUX_KERNEL_HASH-5.15.72 = 6090323b5b471ae9d3bbc0058966113609f5bbd22fa19a76df32a8abc52f07ab +LINUX_VERSION-5.15 = .74 +LINUX_KERNEL_HASH-5.15.74 = 2c1539a2f85b835c36c4a07c8270b52b0bec38fdda7339477d07f0c3af8c4265 diff --git a/target/linux/x86/patches-5.15/800-add-rts5139.patch b/target/linux/x86/patches-5.15/800-add-rts5139.patch index 4a08360460c6c2..fc4739baf800e8 100644 --- a/target/linux/x86/patches-5.15/800-add-rts5139.patch +++ b/target/linux/x86/patches-5.15/800-add-rts5139.patch @@ -1,14 +1,21 @@ ---- a/drivers/staging/Kconfig -+++ b/drivers/staging/Kconfig -@@ -40,2 +40,4 @@ - -+source "drivers/staging/rts5139/Kconfig" -+ - source "drivers/staging/rts5208/Kconfig" - ---- a/drivers/staging/Makefile -+++ b/drivers/staging/Makefile -@@ -11,2 +11,3 @@ - obj-$(CONFIG_R8188EU) += r8188eu/ -+obj-$(CONFIG_RTS5139) += rts5139/ - obj-$(CONFIG_RTS5208) += rts5208/ +--- a/drivers/staging/Kconfig ++++ b/drivers/staging/Kconfig +@@ -38,6 +38,8 @@ source "drivers/staging/rtl8712/Kconfig" + + source "drivers/staging/r8188eu/Kconfig" + ++source "drivers/staging/rts5139/Kconfig" ++ + source "drivers/staging/rts5208/Kconfig" + + source "drivers/staging/octeon/Kconfig" +--- a/drivers/staging/Makefile ++++ b/drivers/staging/Makefile +@@ -9,6 +9,7 @@ obj-$(CONFIG_RTL8192E) += rtl8192e/ + obj-$(CONFIG_RTL8723BS) += rtl8723bs/ + obj-$(CONFIG_R8712U) += rtl8712/ + obj-$(CONFIG_R8188EU) += r8188eu/ ++obj-$(CONFIG_RTS5139) += rts5139/ + obj-$(CONFIG_RTS5208) += rts5208/ + obj-$(CONFIG_NETLOGIC_XLR_NET) += netlogic/ + obj-$(CONFIG_OCTEON_ETHERNET) += octeon/