diff --git a/include/kernel-6.6 b/include/kernel-6.6 index 94f100b36..1fed507b1 100644 --- a/include/kernel-6.6 +++ b/include/kernel-6.6 @@ -1,2 +1,2 @@ -LINUX_VERSION-6.6 = .17 -LINUX_KERNEL_HASH-6.6.17 = ee7650996ba75aa29fe66f309b413097f249a03e7001f2a41128c7c95205226a +LINUX_VERSION-6.6 = .18 +LINUX_KERNEL_HASH-6.6.18 = 4e43d8c5fba14f7c82597838011648056487b7550fd83276ad534559e8499b1d diff --git a/target/linux/generic/backport-6.6/001-CONFIG_INITRAMFS_PRESERVE_MTIME.patch b/target/linux/generic/backport-6.6/001-CONFIG_INITRAMFS_PRESERVE_MTIME.patch index a9bf15d6e..1bb98582d 100644 --- a/target/linux/generic/backport-6.6/001-CONFIG_INITRAMFS_PRESERVE_MTIME.patch +++ b/target/linux/generic/backport-6.6/001-CONFIG_INITRAMFS_PRESERVE_MTIME.patch @@ -1,6 +1,6 @@ --- a/init/Kconfig +++ b/init/Kconfig -@@ -1347,16 +1347,6 @@ config BOOT_CONFIG_EMBED_FILE +@@ -1356,16 +1356,6 @@ config BOOT_CONFIG_EMBED_FILE This bootconfig will be used if there is no initrd or no other bootconfig in the initrd. diff --git a/target/linux/generic/hack-6.6/204-module_strip.patch b/target/linux/generic/hack-6.6/204-module_strip.patch index 850cdeb88..63981e983 100644 --- a/target/linux/generic/hack-6.6/204-module_strip.patch +++ b/target/linux/generic/hack-6.6/204-module_strip.patch @@ -127,7 +127,7 @@ Signed-off-by: Felix Fietkau if (err) --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c -@@ -1753,7 +1753,9 @@ static void read_symbols(const char *mod +@@ -1745,7 +1745,9 @@ static void read_symbols(const char *mod symname = remove_dot(info.strtab + sym->st_name); handle_symbol(mod, &info, sym, symname); @@ -137,7 +137,7 @@ Signed-off-by: Felix Fietkau } check_sec_ref(mod, &info); -@@ -1926,8 +1928,10 @@ static void add_header(struct buffer *b, +@@ -1918,8 +1920,10 @@ static void add_header(struct buffer *b, buf_printf(b, "BUILD_SALT;\n"); buf_printf(b, "BUILD_LTO_INFO;\n"); buf_printf(b, "\n"); @@ -148,7 +148,7 @@ Signed-off-by: Felix Fietkau buf_printf(b, "\n"); buf_printf(b, "__visible struct module __this_module\n"); buf_printf(b, "__section(\".gnu.linkonce.this_module\") = {\n"); -@@ -2061,11 +2065,13 @@ static void add_depends(struct buffer *b +@@ -2053,11 +2057,13 @@ static void add_depends(struct buffer *b static void add_srcversion(struct buffer *b, struct module *mod) { @@ -162,7 +162,7 @@ Signed-off-by: Felix Fietkau } static void write_buf(struct buffer *b, const char *fname) -@@ -2148,7 +2154,9 @@ static void write_mod_c_file(struct modu +@@ -2140,7 +2146,9 @@ static void write_mod_c_file(struct modu add_exported_symbols(&buf, mod); add_versions(&buf, mod); add_depends(&buf, mod); diff --git a/target/linux/generic/hack-6.6/253-ksmbd-config.patch b/target/linux/generic/hack-6.6/253-ksmbd-config.patch index 80c77ddd0..6e8a1aad9 100644 --- a/target/linux/generic/hack-6.6/253-ksmbd-config.patch +++ b/target/linux/generic/hack-6.6/253-ksmbd-config.patch @@ -1,6 +1,6 @@ --- a/init/Kconfig +++ b/init/Kconfig -@@ -1970,7 +1970,7 @@ config PADATA +@@ -1979,7 +1979,7 @@ config PADATA bool config ASN1 diff --git a/target/linux/generic/pending-6.6/203-kallsyms_uncompressed.patch b/target/linux/generic/pending-6.6/203-kallsyms_uncompressed.patch index d7afc5c82..86d375c36 100644 --- a/target/linux/generic/pending-6.6/203-kallsyms_uncompressed.patch +++ b/target/linux/generic/pending-6.6/203-kallsyms_uncompressed.patch @@ -13,7 +13,7 @@ Signed-off-by: Felix Fietkau --- a/init/Kconfig +++ b/init/Kconfig -@@ -1432,6 +1432,17 @@ config SYSCTL_ARCH_UNALIGN_ALLOW +@@ -1441,6 +1441,17 @@ config SYSCTL_ARCH_UNALIGN_ALLOW the unaligned access emulation. see arch/parisc/kernel/unaligned.c for reference @@ -97,7 +97,7 @@ Signed-off-by: Felix Fietkau for (i = 255; i >= 0; i--) { --- a/scripts/link-vmlinux.sh +++ b/scripts/link-vmlinux.sh -@@ -160,6 +160,10 @@ kallsyms() +@@ -165,6 +165,10 @@ kallsyms() kallsymopt="${kallsymopt} --lto-clang" fi diff --git a/target/linux/generic/pending-6.6/920-mangle_bootargs.patch b/target/linux/generic/pending-6.6/920-mangle_bootargs.patch index 998fc500d..d7fa34349 100644 --- a/target/linux/generic/pending-6.6/920-mangle_bootargs.patch +++ b/target/linux/generic/pending-6.6/920-mangle_bootargs.patch @@ -13,7 +13,7 @@ Signed-off-by: Imre Kaloz --- a/init/Kconfig +++ b/init/Kconfig -@@ -1792,6 +1792,15 @@ config DEBUG_RSEQ +@@ -1801,6 +1801,15 @@ config DEBUG_RSEQ If unsure, say N.