Skip to content

Commit

Permalink
6.10: Rebase RT patches
Browse files Browse the repository at this point in the history
  • Loading branch information
ventureoo committed Aug 21, 2024
1 parent 6569ca4 commit ff75efb
Showing 1 changed file with 12 additions and 12 deletions.
24 changes: 12 additions & 12 deletions 6.10/misc/0001-rt.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 153186709bf6a9506c036e1338aee8eb75b36393 Mon Sep 17 00:00:00 2001
From f48d1aea88f39ccadb42a3eea49f4b5f3f265c0f Mon Sep 17 00:00:00 2001
From: Vasiliy Stelmachenok <[email protected]>
Date: Sat, 10 Aug 2024 19:26:40 +0300
Subject: [PATCH 1/2] Add realtime patchset (6.10.2-rt14)
Expand Down Expand Up @@ -117,10 +117,10 @@ Subject: [PATCH 1/2] Add realtime patchset (6.10.2-rt14)
create mode 100644 include/linux/netdevice_xmit.h

diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index 21c6506ea9ef..01a49075e963 100644
index ab5ca3af35d2..9e2ad1fb80f4 100644
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -6610,6 +6610,18 @@
@@ -6608,6 +6608,18 @@
Force threading of all interrupt handlers except those
marked explicitly IRQF_NO_THREAD.

Expand Down Expand Up @@ -401,7 +401,7 @@ index b68efe643a12..48745a3c5261 100644
EXPORT_SYMBOL(kernel_neon_end);

diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 5d91259ee7b5..537633203ff0 100644
index 11bbdc15c6e5..760c93baa448 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -98,6 +98,7 @@ config ARM64
Expand Down Expand Up @@ -1494,10 +1494,10 @@ index 8b1644f5411e..7d0134ecd82f 100644
}

diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
index 2a8006e3d687..950d598d6076 100644
index 9967444eae10..144780ad8dad 100644
--- a/drivers/tty/serial/serial_core.c
+++ b/drivers/tty/serial/serial_core.c
@@ -3168,8 +3168,15 @@ static int serial_core_add_one_port(struct uart_driver *drv, struct uart_port *u
@@ -3176,8 +3176,15 @@ static int serial_core_add_one_port(struct uart_driver *drv, struct uart_port *u
state->uart_port = uport;
uport->state = state;

Expand All @@ -1514,7 +1514,7 @@ index 2a8006e3d687..950d598d6076 100644
uport->minor = drv->tty_driver->minor_start + uport->line;
uport->name = kasprintf(GFP_KERNEL, "%s%d", drv->dev_name,
drv->tty_driver->name_base + uport->line);
@@ -3178,13 +3185,6 @@ static int serial_core_add_one_port(struct uart_driver *drv, struct uart_port *u
@@ -3186,13 +3193,6 @@ static int serial_core_add_one_port(struct uart_driver *drv, struct uart_port *u
goto out;
}

Expand Down Expand Up @@ -2898,7 +2898,7 @@ index 9ea0b28068f4..5ded1450ac1a 100644

#ifndef CONFIG_HAVE_ARCH_WITHIN_STACK_FRAMES
diff --git a/include/linux/trace_events.h b/include/linux/trace_events.h
index 9df3e2973626..c52e89f40741 100644
index 9435185c10ef..4697f3ab3db9 100644
--- a/include/linux/trace_events.h
+++ b/include/linux/trace_events.h
@@ -184,8 +184,8 @@ unsigned int tracing_gen_ctx_irq_test(unsigned int irqs_status);
Expand Down Expand Up @@ -6448,7 +6448,7 @@ index 6d10927a07d8..f47fef701265 100644

/* No obstacles. */
diff --git a/kernel/rcu/rcutorture.c b/kernel/rcu/rcutorture.c
index 807fbf6123a7..0fd17cc1f8fa 100644
index 251cead74460..a7d8e90d31fc 100644
--- a/kernel/rcu/rcutorture.c
+++ b/kernel/rcu/rcutorture.c
@@ -2420,6 +2420,12 @@ static int rcutorture_booster_init(unsigned int cpu)
Expand Down Expand Up @@ -6574,7 +6574,7 @@ index 460efecd077b..833a75167ac9 100644

/*
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index ebf21373f663..a8a19ee33ae3 100644
index 3e84a3b7b7bb..13c9e8c21646 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -898,14 +898,15 @@ static inline void hrtick_rq_init(struct rq *rq)
Expand Down Expand Up @@ -7759,7 +7759,7 @@ index b7b518bc2be5..4984dd9b334b 100644

#endif
diff --git a/net/core/filter.c b/net/core/filter.c
index 110692c1dd95..050814b1d56f 100644
index ab0455c64e49..4d67fa357853 100644
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -1658,9 +1658,12 @@ struct bpf_scratchpad {
Expand Down Expand Up @@ -8600,7 +8600,7 @@ index 7d1c0986f9bb..7e16336044b2 100644
2.46.0


From f1d61f1f1b190bd84b400432ff9084282e67c3b6 Mon Sep 17 00:00:00 2001
From 2868ff4425eed05bc975b35861b32ebcfeaf2433 Mon Sep 17 00:00:00 2001
From: Vasiliy Stelmachenok <[email protected]>
Date: Tue, 31 Oct 2023 11:04:44 +0300
Subject: [PATCH 2/2] Don't make realtime patchset dependent on CONFIG_EXPERT
Expand Down

0 comments on commit ff75efb

Please sign in to comment.