[][openwrt][common][Upgrade kernel version from 5.4.246 to 5.4.260]
[Description]
Change kernel version and hash in
201-change_kernel_version_and_hash_due_to_upgrading_from_5.4.246_to_5.4.260.patch
Add patches that conflict in kernel 5.4.260 in remove.patch.list
[Release-log]
Change-Id: Ie17eb858d71995dc50cfb6d0159dd3d1470b4133
Reviewed-on: https://gerrit.mediatek.inc/c/openwrt/feeds/mtk_openwrt_feeds/+/8231346
diff --git a/openwrt_patches-21.02/201-change_kernel_version_and_hash_due_to_upgrading_from_5.4.238_to_5.4.246.patch b/openwrt_patches-21.02/201-change_kernel_version_and_hash_due_to_upgrading_from_5.4.246_to_5.4.260.patch
similarity index 60%
rename from openwrt_patches-21.02/201-change_kernel_version_and_hash_due_to_upgrading_from_5.4.238_to_5.4.246.patch
rename to openwrt_patches-21.02/201-change_kernel_version_and_hash_due_to_upgrading_from_5.4.246_to_5.4.260.patch
index c54b0d6..79c3da6 100644
--- a/openwrt_patches-21.02/201-change_kernel_version_and_hash_due_to_upgrading_from_5.4.238_to_5.4.246.patch
+++ b/openwrt_patches-21.02/201-change_kernel_version_and_hash_due_to_upgrading_from_5.4.246_to_5.4.260.patch
@@ -3,5 +3,5 @@
@@ -1,2 +1,2 @@
-LINUX_VERSION-5.4 = .238
-LINUX_KERNEL_HASH-5.4.238 = 70a2b2da85598eba6a73cdc0749e441cbdf3011d9babcb7028a46aa8d98aa91f
-+LINUX_VERSION-5.4 = .246
-+LINUX_KERNEL_HASH-5.4.246 = 0938790a858fd0af6aa6b27a3bdf4c5d4a46aba60e6178156980d58bef7ed9ea
++LINUX_VERSION-5.4 = .260
++LINUX_KERNEL_HASH-5.4.260 = 9830820714c8f5985c50071cc9e1b40533ee81a4f6c704916c7148d16e54ebfe
diff --git a/remove.patch.list b/remove.patch.list
index e328364..9c58e6d 100644
--- a/remove.patch.list
+++ b/remove.patch.list
@@ -27,3 +27,5 @@
target/linux/generic/pending-5.15/702-net-ethernet-mtk_eth_soc-enable-threaded-NAPI.patch
target/linux/mediatek/patches-5.15/510-net-mediatek-add-flow-offload-for-mt7623.patch
target/linux/mediatek/patches-5.15/703-v5.17-net-ethernet-mtk_eth_soc-implement-Clause-45-MDIO-ac.patch
+target/linux/generic/backport-5.4/711-v6.3-bgmac-fix-initial-chip-reset-to-support-BCM5358.patch
+target/linux/mediatek/patches-5.4/999-1700-macsec-revert-async-support.patch