diff --git a/hack-6.12/100-mm-memcontrol-v1-drop-warning-message.patch b/hack-6.12/100-mm-memcontrol-v1-drop-warning-message.patch index 2c197e8..d3839d8 100644 --- a/hack-6.12/100-mm-memcontrol-v1-drop-warning-message.patch +++ b/hack-6.12/100-mm-memcontrol-v1-drop-warning-message.patch @@ -10,7 +10,7 @@ Signed-off-by: sbwml --- a/mm/memcontrol-v1.c +++ b/mm/memcontrol-v1.c -@@ -1994,15 +1994,9 @@ static ssize_t memcg_write_event_control +@@ -2019,15 +2019,9 @@ static ssize_t memcg_write_event_control event->register_event = mem_cgroup_usage_register_event; event->unregister_event = mem_cgroup_usage_unregister_event; } else if (!strcmp(name, "memory.oom_control")) { @@ -26,7 +26,7 @@ Signed-off-by: sbwml event->register_event = vmpressure_register_event; event->unregister_event = vmpressure_unregister_event; } else if (!strcmp(name, "memory.memsw.usage_in_bytes")) { -@@ -2847,10 +2841,6 @@ static int mem_cgroup_oom_control_write( +@@ -2872,10 +2866,6 @@ static int mem_cgroup_oom_control_write( { struct mem_cgroup *memcg = mem_cgroup_from_css(css); diff --git a/hack-6.12/780-usb-net-MeigLink_modem_support.patch b/hack-6.12/780-usb-net-MeigLink_modem_support.patch index 6f9d6f0..d05c1ed 100644 --- a/hack-6.12/780-usb-net-MeigLink_modem_support.patch +++ b/hack-6.12/780-usb-net-MeigLink_modem_support.patch @@ -19,7 +19,7 @@ #define QUECTEL_VENDOR_ID 0x2c7c /* These Quectel products use Quectel's vendor ID */ -@@ -1200,6 +1202,11 @@ static const struct usb_device_id option +@@ -1201,6 +1203,11 @@ static const struct usb_device_id option .driver_info = ZLP }, { USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96), .driver_info = RSVD(4) }, diff --git a/hack-6.12/902-debloat_proc.patch b/hack-6.12/902-debloat_proc.patch index 46c64fb..230285c 100644 --- a/hack-6.12/902-debloat_proc.patch +++ b/hack-6.12/902-debloat_proc.patch @@ -235,7 +235,7 @@ Signed-off-by: Felix Fietkau if (!pe) --- a/mm/vmstat.c +++ b/mm/vmstat.c -@@ -2192,10 +2192,12 @@ void __init init_mm_internals(void) +@@ -2194,10 +2194,12 @@ void __init init_mm_internals(void) start_shepherd_timer(); #endif #ifdef CONFIG_PROC_FS @@ -319,7 +319,7 @@ Signed-off-by: Felix Fietkau --- a/net/core/sock.c +++ b/net/core/sock.c -@@ -4223,6 +4223,8 @@ static __net_initdata struct pernet_oper +@@ -4229,6 +4229,8 @@ static __net_initdata struct pernet_oper static int __init proto_init(void) { diff --git a/pending-6.12/300-mips_expose_boot_raw.patch b/pending-6.12/300-mips_expose_boot_raw.patch index 2400e47..a4e0daa 100644 --- a/pending-6.12/300-mips_expose_boot_raw.patch +++ b/pending-6.12/300-mips_expose_boot_raw.patch @@ -19,7 +19,7 @@ Acked-by: Rob Landley config CEVT_BCM1480 bool -@@ -2988,6 +2985,18 @@ choice +@@ -2991,6 +2988,18 @@ choice bool "Extend builtin kernel arguments with bootloader arguments" endchoice