[bot] AutoMerging: merge all upstream's changes:

* https://github.com/coolsnowwolf/lede:
  kernel: bump 5.15 to 5.15.74 (coolsnowwolf#10263)
  Kernel: bump 5.4 to 5.4.218 (coolsnowwolf#10262)

Author: github-actions[bot]

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

include/kernel-5.4

@@ -1,2 +1,2 @@
-LINUX_VERSION-5.4 = .216
-LINUX_KERNEL_HASH-5.4.216 = ce5f62017334fec9b812fa952f653d4aa978a7f94e562511e1c4b5ef81ea7ea7
+LINUX_VERSION-5.4 = .218
+LINUX_KERNEL_HASH-5.4.218 = 3ddd74028537d677b0c02b17cfdf881f4ebddf755526ccb9cd7f988371a9f438

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/