diff --git a/Makefile.rhelver b/Makefile.rhelver index 913f12fc1..5da85be4c 100644 --- a/Makefile.rhelver +++ b/Makefile.rhelver @@ -12,7 +12,7 @@ RHEL_MINOR = 99 # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -RHEL_RELEASE = 55 +RHEL_RELEASE = 56 # # RHEL_REBASE_NUM diff --git a/Patchlist.changelog b/Patchlist.changelog index 575170e3b..647abe9fe 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,5 +1,8 @@ -https://gitlab.com/cki-project/kernel-ark/-/commit/d14a4a8f42b706f442d4256f0813f3baf357eb42 - d14a4a8f42b706f442d4256f0813f3baf357eb42 x86/insn_decoder_test: allow longer symbol-names +https://gitlab.com/cki-project/kernel-ark/-/commit/1680fa2cb7a4f6e43b1eabafd09d66c2044babe3 + 1680fa2cb7a4f6e43b1eabafd09d66c2044babe3 x86/insn_decoder_test: allow longer symbol-names + +https://gitlab.com/cki-project/kernel-ark/-/commit/86419fda1ef20624ce657c514d0c665b4998f75d + 86419fda1ef20624ce657c514d0c665b4998f75d [redhat] rh_messages.h: driver and device updates https://gitlab.com/cki-project/kernel-ark/-/commit/4d11b5eee76ec8a293d0dce03f16995e5c94b07b 4d11b5eee76ec8a293d0dce03f16995e5c94b07b crypto: rng - Fix extrng EFAULT handling diff --git a/README.rst b/README.rst index eded90761..5de37e5bb 100644 --- a/README.rst +++ b/README.rst @@ -21,5 +21,5 @@ source can be built in different build roots (Fedora, CentOS, etc.) .. _source tree: https://gitlab.com/cki-project/kernel-ark.git .. _template: https://gitlab.com/cki-project/kernel-ark/-/blob/os-build/redhat/kernel.spec.template -.. _documentation: https://cki-project.gitlab.io/kernel-ark/ +.. _documentation: https://gitlab.com/cki-project/kernel-ark/-/wikis/home .. _online: https://gitlab.com/cki-project/kernel-ark/-/commits/ark-patches diff --git a/kernel.changelog b/kernel.changelog index a65354136..136172d0a 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,8 +1,13 @@ -* Mon Jan 13 2025 Fedora Kernel Team [6.13.0-0.rc7.55] +* Tue Jan 14 2025 Fedora Kernel Team [6.13.0-0.rc7.c45323b7560e.56] - x86/insn_decoder_test: allow longer symbol-names (David Rheinsberg) - kernel.spec: update license field (Scott Weaver) Resolves: +* Tue Jan 14 2025 Fedora Kernel Team [6.13.0-0.rc7.c45323b7560e.55] +- kernel.spec: Build cpupower on riscv64 (Yanko Kaneti) +- Linux v6.13.0-0.rc7.c45323b7560e +Resolves: + * Mon Jan 13 2025 Fedora Kernel Team [6.13.0-0.rc7.54] - Linux v6.13.0-0.rc7 Resolves: diff --git a/kernel.spec b/kernel.spec index 960972e53..b8ee71692 100644 --- a/kernel.spec +++ b/kernel.spec @@ -162,13 +162,13 @@ Summary: The Linux kernel %define specrpmversion 6.13.0 %define specversion 6.13.0 %define patchversion 6.13 -%define pkgrelease 0.rc7.55 +%define pkgrelease 0.rc7.20250114gitc45323b7560e.56 %define kversion 6 -%define tarfile_release 6.13-rc7 +%define tarfile_release 6.13-rc7-19-gc45323b7560e # This is needed to do merge window version magic %define patchlevel 13 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc7.55%{?buildid}%{?dist} +%define specrelease 0.rc7.20250114gitc45323b7560e.56%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.13.0 @@ -623,9 +623,9 @@ Summary: The Linux kernel # Architectures we build tools/cpupower on %if 0%{?fedora} -%define cpupowerarchs %{ix86} x86_64 ppc64le aarch64 +%define cpupowerarchs %{ix86} x86_64 ppc64le aarch64 riscv64 %else -%define cpupowerarchs i686 x86_64 ppc64le aarch64 +%define cpupowerarchs i686 x86_64 ppc64le aarch64 riscv64 %endif # Architectures we build kernel livepatching selftests on @@ -3390,7 +3390,7 @@ chmod 0755 %{buildroot}%{_libdir}/libcpupower.so* %{tools_make} DESTDIR=%{buildroot} install popd pushd tools/arch/x86/intel_sdsi - %{tools_make} CFLAGS="${RPM_OPT_FLAGS}" DESTDIR=%{buildroot} install + %{tools_make} CFLAGS="${RPM_OPT_FLAGS}" DESTDIR=%{buildroot} BINDIR=%{_sbindir} install popd %endif pushd tools/thermal/tmon @@ -4174,13 +4174,17 @@ fi\ # # %changelog -* Mon Jan 13 2025 Justin M. Forbes [6.13.0-0.rc7.55] +* Tue Jan 14 2025 Justin M. Forbes [6.13.0-0.rc7.20250114gitc45323b7560e.56] - Fedora 6.13 configs part 1 (Justin M. Forbes) -* Mon Jan 13 2025 Fedora Kernel Team [6.13.0-0.rc7.55] +* Tue Jan 14 2025 Fedora Kernel Team [6.13.0-0.rc7.c45323b7560e.56] - x86/insn_decoder_test: allow longer symbol-names (David Rheinsberg) - kernel.spec: update license field (Scott Weaver) +* Tue Jan 14 2025 Fedora Kernel Team [6.13.0-0.rc7.c45323b7560e.55] +- kernel.spec: Build cpupower on riscv64 (Yanko Kaneti) +- Linux v6.13.0-0.rc7.c45323b7560e + * Mon Jan 13 2025 Fedora Kernel Team [6.13.0-0.rc7.54] - Linux v6.13.0-0.rc7 diff --git a/patch-6.13-redhat.patch b/patch-6.13-redhat.patch index acb5c1851..e50d055be 100644 --- a/patch-6.13-redhat.patch +++ b/patch-6.13-redhat.patch @@ -2667,7 +2667,7 @@ index eb2937599cb0..7860721ef2f6 100644 #ifdef CONFIG_PERF_EVENTS LSM_HOOK(int, 0, perf_event_open, struct perf_event_attr *attr, int type) diff --git a/include/linux/module.h b/include/linux/module.h -index 94acbacdcdf1..e4e6fc1bd393 100644 +index b3a643435357..54c09d4c6f38 100644 --- a/include/linux/module.h +++ b/include/linux/module.h @@ -426,6 +426,7 @@ struct module { @@ -2678,7 +2678,7 @@ index 94acbacdcdf1..e4e6fc1bd393 100644 struct kobject *holders_dir; /* Exported symbols */ -@@ -1023,4 +1024,8 @@ static inline unsigned long find_kallsyms_symbol_value(struct module *mod, +@@ -1024,4 +1025,8 @@ static inline unsigned long find_kallsyms_symbol_value(struct module *mod, #endif /* CONFIG_MODULES && CONFIG_KALLSYMS */ @@ -4147,7 +4147,7 @@ index 000000000000..bb69e8965748 +} diff --git a/kernel/rh_messages.h b/kernel/rh_messages.h new file mode 100644 -index 000000000000..d445a2da4180 +index 000000000000..647d7b9a4fe9 --- /dev/null +++ b/kernel/rh_messages.h @@ -0,0 +1,326 @@ @@ -4233,8 +4233,8 @@ index 000000000000..d445a2da4180 + "nft_compat", + "nicpf", + "nicvf", -+ "nvmet-fc", -+ "nvmet-tcp", ++ "nvmet_fc", ++ "nvmet_tcp", + "team", + 0 /* Terminating entry */ +}; @@ -4419,6 +4419,7 @@ index 000000000000..d445a2da4180 + { 0x15B3, 0x100e, PCI_ANY_ID, PCI_ANY_ID }, + { 0x15B3, 0x100f, PCI_ANY_ID, PCI_ANY_ID }, + { 0x15B3, 0x1010, PCI_ANY_ID, PCI_ANY_ID }, ++ { 0x15B3, 0x1025, PCI_ANY_ID, PCI_ANY_ID }, + { 0x15B3, 0xA2DF, PCI_ANY_ID, PCI_ANY_ID }, + { 0x1000, 0x0064, PCI_ANY_ID, PCI_ANY_ID }, + { 0x1000, 0x0065, PCI_ANY_ID, PCI_ANY_ID }, @@ -4455,7 +4456,6 @@ index 000000000000..d445a2da4180 + { 0x1000, 0x0071, PCI_ANY_ID, PCI_ANY_ID }, + { 0x1000, 0x0073, PCI_ANY_ID, PCI_ANY_ID }, + { 0x1000, 0x0079, PCI_ANY_ID, PCI_ANY_ID }, -+ { 0x15B3, 0xA2DC, PCI_ANY_ID, PCI_ANY_ID }, + { 0x1000, 0x006E, PCI_ANY_ID, PCI_ANY_ID }, + { 0x1000, 0x0080, PCI_ANY_ID, PCI_ANY_ID }, + { 0x1000, 0x0081, PCI_ANY_ID, PCI_ANY_ID }, diff --git a/sources b/sources index f32841a2a..830dfccc8 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.13-rc7.tar.xz) = 2d67e0c7fc402b2bfbbe635bc6dabdcf3127275f27221be7d9ccf1e446c83220238dc8cc26fbc5ae844e87208265791c84fe30ce6e4390877fe549d4c7cced01 -SHA512 (kernel-abi-stablelists-6.13.0.tar.xz) = a89c553e29860fef6aa1f85ab29c111b24d7c58dcc8527b9aa8b280df7e0e5f41f7b65d9dee49ca35c7c53b9ac5b6d82e664dc621fa9920a68b96f010890fb16 -SHA512 (kernel-kabi-dw-6.13.0.tar.xz) = 2f50b7542b4d8761173f260f4351d3b37543275af96ceab988c5dd0045e01178eedd822222607db988706a450b3cffbb3926f35cd9de1654cdfd8baf51606a66 +SHA512 (linux-6.13-rc7-19-gc45323b7560e.tar.xz) = 59324f0eaf4681b151a0731e446cd40e8a433a93b0f62234c40e136a2bd372c9fc54fe6cb6add01d6c950027869fb99c5faaf44236af95a76db36fb29981c4c7 +SHA512 (kernel-abi-stablelists-6.13.0.tar.xz) = 392bf54c8eb1459e4f515499dd41e417bfa2ffbc60fe1ca29859dde0462c79a6bbf19f0700a742eef01fa4056a7c91944dc35cff9d81e39208c7a8b61d3d6054 +SHA512 (kernel-kabi-dw-6.13.0.tar.xz) = 238893d8b5c8a0bd2f706362c42b76d18e8d768ec303c54c041ea88ee44c60294b36254b3f56d8aac445fdebeb0737b91a962d2d9f9b3e6d6a2e7bbb2c9ed649