kernel-6.16.0-0.rc2.24
* Mon Jun 16 2025 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.16.0-0.rc2.24] - redhat/configs: clang_lto: disable CONFIG_FORTIFY_KUNIT_TEST (Scott Weaver) - powerpc: Fix struct termio related ioctl macros (Madhavan Srinivasan) Resolves: Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
This commit is contained in:
parent
48a6272b82
commit
bd3ee81a5b
23 changed files with 57 additions and 74 deletions
|
|
@ -76,8 +76,7 @@
|
|||
security/integrity/platform_certs/load_uefi.c | 6 +-
|
||||
security/lockdown/Kconfig | 13 +
|
||||
security/lockdown/lockdown.c | 11 +
|
||||
tools/power/cpupower/Makefile | 9 +-
|
||||
79 files changed, 2739 insertions(+), 215 deletions(-)
|
||||
78 files changed, 2734 insertions(+), 211 deletions(-)
|
||||
|
||||
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
|
||||
index f1f2c0874da9..bcbfd150b8a1 100644
|
||||
|
|
@ -192,7 +191,7 @@ index 000000000000..85771d74c34f
|
|||
+
|
||||
+endmenu
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 35e6e5240c61..71a0e00952a8 100644
|
||||
index ba0827a1fccd..bfe526e88cea 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
|
||||
|
|
@ -247,7 +246,7 @@ index 35e6e5240c61..71a0e00952a8 100644
|
|||
endef
|
||||
|
||||
$(version_h): private PATCHLEVEL := $(or $(PATCHLEVEL), 0)
|
||||
@@ -1927,6 +1956,23 @@ endif
|
||||
@@ -1924,6 +1953,23 @@ endif
|
||||
|
||||
ifdef CONFIG_MODULES
|
||||
|
||||
|
|
@ -3170,10 +3169,10 @@ index dba349629229..9a32f178f9fe 100644
|
|||
+
|
||||
#endif /* ! __LINUX_SECURITY_H */
|
||||
diff --git a/init/main.c b/init/main.c
|
||||
index ed576c7f475d..5c3361bf0f10 100644
|
||||
index 225a58279acd..147796614002 100644
|
||||
--- a/init/main.c
|
||||
+++ b/init/main.c
|
||||
@@ -1162,8 +1162,10 @@ static bool __init_or_module initcall_blacklisted(initcall_t fn)
|
||||
@@ -1163,8 +1163,10 @@ static bool __init_or_module initcall_blacklisted(initcall_t fn)
|
||||
char fn_name[KSYM_SYMBOL_LEN];
|
||||
unsigned long addr;
|
||||
|
||||
|
|
@ -3184,7 +3183,7 @@ index ed576c7f475d..5c3361bf0f10 100644
|
|||
|
||||
addr = (unsigned long) dereference_function_descriptor(fn);
|
||||
sprint_symbol_no_offset(fn_name, addr);
|
||||
@@ -1174,6 +1176,9 @@ static bool __init_or_module initcall_blacklisted(initcall_t fn)
|
||||
@@ -1175,6 +1177,9 @@ static bool __init_or_module initcall_blacklisted(initcall_t fn)
|
||||
*/
|
||||
strreplace(fn_name, ' ', '\0');
|
||||
|
||||
|
|
@ -4483,37 +4482,3 @@ index cf83afa1d879..aba751e7abff 100644
|
|||
static struct security_hook_list lockdown_hooks[] __ro_after_init = {
|
||||
LSM_HOOK_INIT(locked_down, lockdown_is_locked_down),
|
||||
};
|
||||
diff --git a/tools/power/cpupower/Makefile b/tools/power/cpupower/Makefile
|
||||
index be8dfac14076..c43db1c41205 100644
|
||||
--- a/tools/power/cpupower/Makefile
|
||||
+++ b/tools/power/cpupower/Makefile
|
||||
@@ -73,6 +73,7 @@ sbindir ?= /usr/sbin
|
||||
mandir ?= /usr/man
|
||||
libdir ?= /usr/lib
|
||||
libexecdir ?= /usr/libexec
|
||||
+unitdir ?= /usr/lib/systemd/system
|
||||
includedir ?= /usr/include
|
||||
localedir ?= /usr/share/locale
|
||||
docdir ?= /usr/share/doc/packages/cpupower
|
||||
@@ -309,9 +310,9 @@ install-tools: $(OUTPUT)cpupower
|
||||
$(INSTALL_DATA) cpupower-service.conf '$(DESTDIR)${confdir}'
|
||||
$(INSTALL) -d $(DESTDIR)${libexecdir}
|
||||
$(INSTALL_PROGRAM) cpupower.sh '$(DESTDIR)${libexecdir}/cpupower'
|
||||
- $(INSTALL) -d $(DESTDIR)${libdir}/systemd/system
|
||||
- sed 's|___CDIR___|${confdir}|; s|___LDIR___|${libexecdir}|' cpupower.service.in > '$(DESTDIR)${libdir}/systemd/system/cpupower.service'
|
||||
- $(SETPERM_DATA) '$(DESTDIR)${libdir}/systemd/system/cpupower.service'
|
||||
+ $(INSTALL) -d $(DESTDIR)${unitdir}
|
||||
+ sed 's|___CDIR___|${confdir}|; s|___LDIR___|${libexecdir}|' cpupower.service.in > '$(DESTDIR)${unitdir}/cpupower.service'
|
||||
+ $(SETPERM_DATA) '$(DESTDIR)${unitdir}/cpupower.service'
|
||||
|
||||
install-man:
|
||||
$(INSTALL_DATA) -D man/cpupower.1 $(DESTDIR)${mandir}/man1/cpupower.1
|
||||
@@ -348,7 +349,7 @@ uninstall:
|
||||
- rm -f $(DESTDIR)${bindir}/utils/cpupower
|
||||
- rm -f $(DESTDIR)${confdir}cpupower-service.conf
|
||||
- rm -f $(DESTDIR)${libexecdir}/cpupower
|
||||
- - rm -f $(DESTDIR)${libdir}/systemd/system/cpupower.service
|
||||
+ - rm -f $(DESTDIR)${unitdir}/cpupower.service
|
||||
- rm -f $(DESTDIR)${mandir}/man1/cpupower.1
|
||||
- rm -f $(DESTDIR)${mandir}/man1/cpupower-frequency-set.1
|
||||
- rm -f $(DESTDIR)${mandir}/man1/cpupower-frequency-info.1
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue