diff --git a/1115-man-mention-that-rhel-9.0-net-naming-scheme-is-the-s.patch b/1115-man-mention-that-rhel-9.0-net-naming-scheme-is-the-s.patch new file mode 100644 index 0000000..a59c8d9 --- /dev/null +++ b/1115-man-mention-that-rhel-9.0-net-naming-scheme-is-the-s.patch @@ -0,0 +1,31 @@ +From 8a3390f1210561d360c45ee8d4b153d738c7ffb2 Mon Sep 17 00:00:00 2001 +From: Lukas Nykryn +Date: Mon, 14 Apr 2025 13:49:51 +0200 +Subject: [PATCH] man: mention that rhel-9.0 net naming scheme is the same as + v251 + +Due to the rebase in 9.2 it is a bit confusing that we are documenting +the newer upstream scheme and it might look 9.0 is based in v255. +So let's explicitly mention that the scheme is the same as in v251. + +Resolves: RHEL-86891 + +rhel-only: doc +--- + man/systemd.net-naming-scheme.xml | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/man/systemd.net-naming-scheme.xml b/man/systemd.net-naming-scheme.xml +index f2077ed02d..b5f4a0bc51 100644 +--- a/man/systemd.net-naming-scheme.xml ++++ b/man/systemd.net-naming-scheme.xml +@@ -462,7 +462,8 @@ + + rhel-9.0 + +- Since version v247 we no longer set ++ Same as naming scheme v251. ++ Since version v247 we no longer set + ID_NET_NAME_SLOT if we detect that a PCI device associated with a slot is a PCI + bridge as that would create naming conflict when there are more child devices on that bridge. Now, + this is relaxed and we will use slot information to generate the name based on it but only if diff --git a/1116-backlight-Drop-support-for-actual_brightness.patch b/1116-backlight-Drop-support-for-actual_brightness.patch new file mode 100644 index 0000000..86de8dc --- /dev/null +++ b/1116-backlight-Drop-support-for-actual_brightness.patch @@ -0,0 +1,92 @@ +From 2cec1ae89fbb51915426818e87d4aef2cb728abe Mon Sep 17 00:00:00 2001 +From: Mario Limonciello +Date: Fri, 28 Mar 2025 09:19:23 -0500 +Subject: [PATCH] backlight: Drop support for actual_brightness + +Some AMD systems have support for features like custom brightness +curve or adaptive backlight management. These features allow the +display driver to adjust the brightness based upon other factors +than just the user brightness request. + +The user's brightness request is indicated in the 'brightness' file +but the effective result of the logic in the display driver is stored +in the 'actual_brightness' file. + +This leads to problems when shutting the system down because the value +of 'actual_brightness' may be lower than 'brightness' and the wrong value +gets stored for the next boot. + +For example if the brightness a user requested was 150, the actual_brightness +might be 130. So the next boot the brightness will be "set" to 130, but the +actual brightness might be 115. If the user reboots again it will be set to 115 +for the next boot but the actual brightness might be 100. That is this gets worse +and worse each reboot cycle until the system eventually boots up at minimum +brightness. + +Furthermore the kernel documentation indicates that the brightness and +actual_brightness files are not guaranteed to be the same values. + +Due to this; drop the use of 'actual_brightness' when saving/restoring brightness +and instead rely only upon 'brightness'. + +Signed-off-by: Mario Limonciello + +(cherry picked from commit 9a224c307b36610e3675390eb2620e74d0f4efb0) + +Resolves: RHEL-86714 +--- + src/backlight/backlight.c | 35 +---------------------------------- + 1 file changed, 1 insertion(+), 34 deletions(-) + +diff --git a/src/backlight/backlight.c b/src/backlight/backlight.c +index b6474d31a7..de5fecd849 100644 +--- a/src/backlight/backlight.c ++++ b/src/backlight/backlight.c +@@ -386,46 +386,13 @@ static bool shall_clamp(sd_device *d) { + } + + static int read_brightness(sd_device *device, unsigned max_brightness, unsigned *ret_brightness) { +- const char *subsystem, *value; ++ const char *value; + unsigned brightness; + int r; + + assert(device); + assert(ret_brightness); + +- r = sd_device_get_subsystem(device, &subsystem); +- if (r < 0) +- return log_device_debug_errno(device, r, "Failed to get subsystem: %m"); +- +- if (streq(subsystem, "backlight")) { +- r = sd_device_get_sysattr_value(device, "actual_brightness", &value); +- if (r == -ENOENT) { +- log_device_debug_errno(device, r, "Failed to read 'actual_brightness' attribute, " +- "fall back to use 'brightness' attribute: %m"); +- goto use_brightness; +- } +- if (r < 0) +- return log_device_debug_errno(device, r, "Failed to read 'actual_brightness' attribute: %m"); +- +- r = safe_atou(value, &brightness); +- if (r < 0) { +- log_device_debug_errno(device, r, "Failed to parse 'actual_brightness' attribute, " +- "fall back to use 'brightness' attribute: %s", value); +- goto use_brightness; +- } +- +- if (brightness > max_brightness) { +- log_device_debug(device, "actual_brightness=%u is larger than max_brightness=%u, " +- "fall back to use 'brightness' attribute", brightness, max_brightness); +- goto use_brightness; +- } +- +- log_device_debug(device, "Current actual_brightness is %u", brightness); +- *ret_brightness = brightness; +- return 0; +- } +- +-use_brightness: + r = sd_device_get_sysattr_value(device, "brightness", &value); + if (r < 0) + return log_device_debug_errno(device, r, "Failed to read 'brightness' attribute: %m"); diff --git a/systemd.spec b/systemd.spec index faef629..8092de2 100644 --- a/systemd.spec +++ b/systemd.spec @@ -21,7 +21,7 @@ Name: systemd Url: https://systemd.io Version: 252 -Release: 52%{?dist} +Release: 53%{?dist} # For a breakdown of the licensing, see README License: LGPLv2+ and MIT and GPLv2+ Summary: System and Service Manager @@ -1197,6 +1197,8 @@ Patch1111: 1111-man-be-even-clearer-that-tmpfiles-user-group-mode-ar.patch Patch1112: 1112-unit-always-return-1-in-log_kill.patch Patch1113: 1113-ci-enable-mkosi-workflow-for-z-stream-branches.patch Patch1114: 1114-ci-mkosi-bump-fedora-version-from-39-to-41.patch +Patch1115: 1115-man-mention-that-rhel-9.0-net-naming-scheme-is-the-s.patch +Patch1116: 1116-backlight-Drop-support-for-actual_brightness.patch # Downstream-only patches (9000–9999) @@ -2074,6 +2076,10 @@ systemd-hwdb update &>/dev/null || : %{_prefix}/lib/dracut/modules.d/70rhel-net-naming-sysattrs/* %changelog +* Tue Apr 15 2025 systemd maintenance team - 252-53 +- man: mention that rhel-9.0 net naming scheme is the same as v251 (RHEL-86891) +- backlight: Drop support for actual_brightness (RHEL-86714) + * Wed Apr 09 2025 systemd maintenance team - 252-52 - man: be even clearer that tmpfiles user/group/mode are applied on existing inodes (RHEL-15051) - unit: always return 1 in log_kill (RHEL-78170)