summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZxl hhyccc2024-07-12 17:37:10 +0000
committerHauke Mehrtens2024-07-14 23:28:38 +0000
commit607697fa4b8c43926a9983ee952b64aa249a3302 (patch)
treead600f333c75dd94d7022058c935805bfcbfc38e
parenta9818e3ef82ea45a223a71e845946448df15235e (diff)
downloadopenwrt-607697fa4b8c43926a9983ee952b64aa249a3302.tar.gz
kernel: bump 6.1 to 6.1.98
https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.1.98 All patches automatically rebased. Build system: bcm53xx ath79 Signed-off-by: Zxl hhyccc <zxlhhy@gmail.com> Link: https://github.com/openwrt/openwrt/pull/15935 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
-rw-r--r--include/kernel-6.14
-rw-r--r--target/linux/generic/pending-6.1/530-jffs2_make_lzma_available.patch2
2 files changed, 3 insertions, 3 deletions
diff --git a/include/kernel-6.1 b/include/kernel-6.1
index d67049a6b3..1f97e8f301 100644
--- a/include/kernel-6.1
+++ b/include/kernel-6.1
@@ -1,2 +1,2 @@
-LINUX_VERSION-6.1 = .97
-LINUX_KERNEL_HASH-6.1.97 = 890b845f36452328716e62dd893b634584f607cdd44b4e685392d302d3be41af
+LINUX_VERSION-6.1 = .98
+LINUX_KERNEL_HASH-6.1.98 = 97cdc9127c7700556ea0891267a0c24cf372f4b81636fb8203a914f3a69f3406
diff --git a/target/linux/generic/pending-6.1/530-jffs2_make_lzma_available.patch b/target/linux/generic/pending-6.1/530-jffs2_make_lzma_available.patch
index 27a673399a..5dd47ef388 100644
--- a/target/linux/generic/pending-6.1/530-jffs2_make_lzma_available.patch
+++ b/target/linux/generic/pending-6.1/530-jffs2_make_lzma_available.patch
@@ -244,7 +244,7 @@ Signed-off-by: Alexandros C. Couloumbis <alex@ozo.com>
+}
--- a/fs/jffs2/super.c
+++ b/fs/jffs2/super.c
-@@ -374,14 +374,41 @@ static int __init init_jffs2_fs(void)
+@@ -375,14 +375,41 @@ static int __init init_jffs2_fs(void)
BUILD_BUG_ON(sizeof(struct jffs2_raw_inode) != 68);
BUILD_BUG_ON(sizeof(struct jffs2_raw_summary) != 32);