diff --git a/buildroot-external/package/eq3_char_loop/0004-Fix-eq3_char_loop-driver-build-on-Linux-6.12.patch b/buildroot-external/package/eq3_char_loop/0004-Fix-eq3_char_loop-driver-build-on-Linux-6.12.patch
index 8866dcf4190..be4f402538d 100644
--- a/buildroot-external/package/eq3_char_loop/0004-Fix-eq3_char_loop-driver-build-on-Linux-6.12.patch
+++ b/buildroot-external/package/eq3_char_loop/0004-Fix-eq3_char_loop-driver-build-on-Linux-6.12.patch
@@ -1,12 +1,16 @@
-diff --git a/KernelDrivers/eq3_char_loop.c b/KernelDrivers/eq3_char_loop.c
-index de2d637d..782958d1 100644
---- a/KernelDrivers/eq3_char_loop.c
-+++ b/KernelDrivers/eq3_char_loop.c
-@@ -898,7 +898,6 @@ static int eq3loop_open(struct inode *inode, struct file *filp)
+Remove llseek NULL'd in 6.0 (868941b) removed in 6.12 (cb787f4)
+
+Signed-off-by: Nick Venenga <nick@venenga.com>
+
+--- a/KernelDrivers/eq3_char_loop.c
++++ b/KernelDrivers/eq3_char_loop.c
+@@ -898,7 +898,6 @@ static int eq3loop_open(struct inode *inode, struct file *filp)
  
  static struct file_operations eq3loop_fops = {
  	.owner		= THIS_MODULE,
--	.llseek		= no_llseek,
++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 0, 0)
+	.llseek		= no_llseek,
++#endif
  	.read		= eq3loop_read,
  	.write		= eq3loop_write,
  	.open		= eq3loop_open,
diff --git a/buildroot-external/package/generic_raw_uart/0002-Linux-6.12-llseek.patch b/buildroot-external/package/generic_raw_uart/0002-Linux-6.12-llseek.patch
index bafea31d7aa..2d3c9a6c1b7 100644
--- a/buildroot-external/package/generic_raw_uart/0002-Linux-6.12-llseek.patch
+++ b/buildroot-external/package/generic_raw_uart/0002-Linux-6.12-llseek.patch
@@ -1,12 +1,16 @@
-diff --git a/kernel/generic_raw_uart.c
-index e227333e0..99946a3ad 100644
+Remove llseek NULL'd in 6.0 (868941b) removed in 6.12 (cb787f4)
+
+Signed-off-by: Nick Venenga <nick@venenga.com>
+
 --- a/kernel/generic_raw_uart.c
 +++ b/kernel/generic_raw_uart.c
-@@ -147,7 +147,6 @@ static int generic_raw_uart_get_device_type(struct generic_raw_uart_instance *in
+@@ -147,7 +147,9 @@ static int generic_raw_uart_get_device_type(struct generic_raw_uart_instance *in
  static struct file_operations generic_raw_uart_fops =
  {
    .owner = THIS_MODULE,
--  .llseek = no_llseek,
++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 0, 0)
+   .llseek = no_llseek,
++#endif
    .read = generic_raw_uart_read,
    .write = generic_raw_uart_write,
    .open = generic_raw_uart_open,
diff --git a/buildroot-external/package/generic_raw_uart/0003-Linux-6.11-gpio-data.patch b/buildroot-external/package/generic_raw_uart/0003-Linux-6.11-gpio-data.patch
new file mode 100644
index 00000000000..c282b72f538
--- /dev/null
+++ b/buildroot-external/package/generic_raw_uart/0003-Linux-6.11-gpio-data.patch
@@ -0,0 +1,18 @@
+Replace `gpiochip_add` removed in 6.11 (3ff1180)
+
+Signed-off-by: Nick Venenga <nick@venenga.com>
+
+--- a/kernel/hb_rf_eth.c
++++ b/kernel/hb_rf_eth.c
+@@ -715,7 +715,11 @@ static int __init hb_rf_eth_init(void)
+   gc.base = -1;
+   gc.can_sleep = false;
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 11, 0)
+   err = gpiochip_add(&gc);
++#else
++  err = gpiochip_add_data(&gc, NULL);
++#endif
+   if (err)
+     goto failed_gc_create;
+ 
diff --git a/buildroot-external/package/generic_raw_uart/0003-Linux-6.12-gpio-data.patch b/buildroot-external/package/generic_raw_uart/0003-Linux-6.12-gpio-data.patch
deleted file mode 100644
index 0ca98e03d9a..00000000000
--- a/buildroot-external/package/generic_raw_uart/0003-Linux-6.12-gpio-data.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/kernel/hb_rf_eth.c b/kernel/hb_rf_eth.c
-index 9d949c003..c8d5f15bf 100644
---- a/kernel/hb_rf_eth.c
-+++ b/kernel/hb_rf_eth.c
-@@ -715,7 +715,7 @@ static int __init hb_rf_eth_init(void)
-   gc.base = -1;
-   gc.can_sleep = false;
- 
--  err = gpiochip_add(&gc);
-+  err = gpiochip_add_data(&gc, NULL);
-   if (err)
-     goto failed_gc_create;
-