2022-03-17 20:10:17

by Tom Zanussi

[permalink] [raw]
Subject: [PATCH RT 0/2] Linux v5.4.182-rt72-rc1

From: Tom Zanussi <[email protected]>

Dear RT Folks,

This is the RT stable review cycle of patch 5.4.182-rt72-rc1.

Please scream at me if I messed something up. Please test the patches
too.

The -rc release will be uploaded to kernel.org and will be deleted
when the final release is out. This is just a review release (or
release candidate).

The pre-releases will not be pushed to the git repository, only the
final release is.

If all goes well, this patch will be converted to the next main
release on 2022-03-20.

To build 5.4.182-rt72-rc1 directly, the following patches should be applied:

https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz

https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.182.xz

https://www.kernel.org/pub/linux/kernel/projects/rt/5.4/patch-5.4.182-rt72-rc1.patch.xz

You can also build from 5.4.182-rt71 by applying the incremental patch:

https://www.kernel.org/pub/linux/kernel/projects/rt/5.4/incr/patch-5.4.182-rt71-rt72-rc1.patch.xz


Enjoy,

-- Tom


Tom Zanussi (2):
eventfd: Fix stable-rt v5.4.182-rt71 conflict fixup issue
Linux 5.4.182-rt72-rc1

include/linux/sched.h | 8 --------
localversion-rt | 2 +-
2 files changed, 1 insertion(+), 9 deletions(-)

--
2.17.1


2022-03-17 20:10:41

by Tom Zanussi

[permalink] [raw]
Subject: [PATCH RT 1/2] eventfd: Fix stable-rt v5.4.182-rt71 conflict fixup issue

From: Tom Zanussi <[email protected]>

v5.4.182-rt72-rc1 stable review patch.
If anyone has any objections, please let me know.

-----------


This fixes an issue in stable-rt release v5.4.182-rt71 where a hunk
from the context diff was inadvertently included in a conflict fixup
where it shouldn't have been. Remove those lines that don't belong.

Reported-by: Sebastian Andrzej Siewior <[email protected]>
Signed-off-by: Tom Zanussi <[email protected]>
---
include/linux/sched.h | 8 --------
1 file changed, 8 deletions(-)

diff --git a/include/linux/sched.h b/include/linux/sched.h
index e1dfb01f4623..91f1aac3c86a 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -802,14 +802,6 @@ struct task_struct {
/* to be used once the psi infrastructure lands upstream. */
unsigned use_memdelay:1;
#endif
-#ifdef CONFIG_PSI
- /* Stalled due to lack of memory */
- unsigned in_memstall:1;
-#endif
-#ifdef CONFIG_PAGE_OWNER
- /* Used by page_owner=on to detect recursion in page tracking. */
- unsigned in_page_owner:1;
-#endif
#ifdef CONFIG_EVENTFD
/* Recursion prevention for eventfd_signal() */
unsigned in_eventfd_signal:1;
--
2.17.1