diff --git a/target/linux/bcm53xx/patches-6.6/905-BCM53573-minor-hacks.patch b/target/linux/bcm53xx/patches-6.6/905-BCM53573-minor-hacks.patch index 44573cb46a..afb0a1b8a3 100644 --- a/target/linux/bcm53xx/patches-6.6/905-BCM53573-minor-hacks.patch +++ b/target/linux/bcm53xx/patches-6.6/905-BCM53573-minor-hacks.patch @@ -21,7 +21,7 @@ Signed-off-by: Rafał Miłecki clocks { --- a/drivers/bcma/main.c +++ b/drivers/bcma/main.c -@@ -331,14 +331,6 @@ static int bcma_register_devices(struct +@@ -337,14 +337,6 @@ static int bcma_register_devices(struct } #endif @@ -36,7 +36,7 @@ Signed-off-by: Rafał Miłecki #ifdef CONFIG_BCMA_NFLASH if (bus->drv_cc.nflash.present) { err = platform_device_register(&bcma_nflash_dev); -@@ -418,6 +410,14 @@ int bcma_bus_register(struct bcma_bus *b +@@ -424,6 +416,14 @@ int bcma_bus_register(struct bcma_bus *b bcma_register_core(bus, core); } diff --git a/target/linux/generic/backport-6.6/301-v6.9-kernel.h-removed-REPEAT_BYTE-from-kernel.h.patch b/target/linux/generic/backport-6.6/301-v6.9-kernel.h-removed-REPEAT_BYTE-from-kernel.h.patch index adc924c09a..d76c562940 100644 --- a/target/linux/generic/backport-6.6/301-v6.9-kernel.h-removed-REPEAT_BYTE-from-kernel.h.patch +++ b/target/linux/generic/backport-6.6/301-v6.9-kernel.h-removed-REPEAT_BYTE-from-kernel.h.patch @@ -128,7 +128,7 @@ Signed-off-by: Kees Cook #ifdef __BIG_ENDIAN --- a/include/linux/kernel.h +++ b/include/linux/kernel.h -@@ -38,14 +38,6 @@ +@@ -39,14 +39,6 @@ #define STACK_MAGIC 0xdeadbeef diff --git a/target/linux/generic/backport-6.6/302-v6.9-kernel.h-Move-upper_-_bits-and-lower_-_bits-to-wordp.patch b/target/linux/generic/backport-6.6/302-v6.9-kernel.h-Move-upper_-_bits-and-lower_-_bits-to-wordp.patch index b9c40e6206..48c58c1ca2 100644 --- a/target/linux/generic/backport-6.6/302-v6.9-kernel.h-Move-upper_-_bits-and-lower_-_bits-to-wordp.patch +++ b/target/linux/generic/backport-6.6/302-v6.9-kernel.h-Move-upper_-_bits-and-lower_-_bits-to-wordp.patch @@ -23,7 +23,7 @@ Signed-off-by: Kees Cook --- a/include/linux/kernel.h +++ b/include/linux/kernel.h -@@ -32,6 +32,8 @@ +@@ -33,6 +33,8 @@ #include #include #include @@ -32,7 +32,7 @@ Signed-off-by: Kees Cook #include #include -@@ -57,34 +59,6 @@ +@@ -52,34 +54,6 @@ } \ ) diff --git a/target/linux/generic/hack-6.6/810-bcma-ssb-fallback-sprom.patch b/target/linux/generic/hack-6.6/810-bcma-ssb-fallback-sprom.patch index a011cf8ffa..73e25f45cd 100644 --- a/target/linux/generic/hack-6.6/810-bcma-ssb-fallback-sprom.patch +++ b/target/linux/generic/hack-6.6/810-bcma-ssb-fallback-sprom.patch @@ -54,7 +54,7 @@ Subject: [PATCH] ssb_sprom: add generic kernel support for Broadcom Fallback SP --- a/drivers/bcma/main.c +++ b/drivers/bcma/main.c -@@ -671,6 +671,14 @@ static int __init bcma_modinit(void) +@@ -677,6 +677,14 @@ static int __init bcma_modinit(void) { int err; diff --git a/target/linux/generic/kernel-6.6 b/target/linux/generic/kernel-6.6 index 3a848b96e5..e5c3c5c302 100644 --- a/target/linux/generic/kernel-6.6 +++ b/target/linux/generic/kernel-6.6 @@ -1,2 +1,2 @@ -LINUX_VERSION-6.6 = .117 -LINUX_KERNEL_HASH-6.6.117 = 643b31079222fdbda70cfdd0b68c514f05a3926104be4762a4685f62818b43d1 +LINUX_VERSION-6.6 = .118 +LINUX_KERNEL_HASH-6.6.118 = 4bdddce35474afc8d26f74ebfbcd0e1045ecd15f69e60f53529dba143374b17d