linux 6.12

Signed-off-by: sbwml <admin@cooluc.com>
This commit is contained in:
sbwml 2024-11-18 20:14:11 +08:00
parent 9483e5161f
commit 28e86b3ca6
4 changed files with 6 additions and 6 deletions

View File

@ -10,7 +10,7 @@ Signed-off-by: sbwml <admin@cooluc.com>
--- a/mm/memcontrol-v1.c --- a/mm/memcontrol-v1.c
+++ b/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->register_event = mem_cgroup_usage_register_event;
event->unregister_event = mem_cgroup_usage_unregister_event; event->unregister_event = mem_cgroup_usage_unregister_event;
} else if (!strcmp(name, "memory.oom_control")) { } else if (!strcmp(name, "memory.oom_control")) {
@ -26,7 +26,7 @@ Signed-off-by: sbwml <admin@cooluc.com>
event->register_event = vmpressure_register_event; event->register_event = vmpressure_register_event;
event->unregister_event = vmpressure_unregister_event; event->unregister_event = vmpressure_unregister_event;
} else if (!strcmp(name, "memory.memsw.usage_in_bytes")) { } 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); struct mem_cgroup *memcg = mem_cgroup_from_css(css);

View File

@ -19,7 +19,7 @@
#define QUECTEL_VENDOR_ID 0x2c7c #define QUECTEL_VENDOR_ID 0x2c7c
/* These Quectel products use Quectel's vendor ID */ /* 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 }, .driver_info = ZLP },
{ USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96), { USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96),
.driver_info = RSVD(4) }, .driver_info = RSVD(4) },

View File

@ -235,7 +235,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
if (!pe) if (!pe)
--- a/mm/vmstat.c --- a/mm/vmstat.c
+++ b/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(); start_shepherd_timer();
#endif #endif
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
@ -319,7 +319,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/net/core/sock.c --- a/net/core/sock.c
+++ b/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) static int __init proto_init(void)
{ {

View File

@ -19,7 +19,7 @@ Acked-by: Rob Landley <rob@landley.net>
config CEVT_BCM1480 config CEVT_BCM1480
bool bool
@@ -2988,6 +2985,18 @@ choice @@ -2991,6 +2988,18 @@ choice
bool "Extend builtin kernel arguments with bootloader arguments" bool "Extend builtin kernel arguments with bootloader arguments"
endchoice endchoice