diff --git a/Makefile.rhelver b/Makefile.rhelver index f761aaa..c58c790 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 = 170 +RHEL_RELEASE = 175 # # Early y+1 numbering @@ -44,4 +44,4 @@ ifneq ("$(ZSTREAM)", "yes") endif endif -RTBUILD:=.5 +RTBUILD:=.6 diff --git a/kernel-rt-x86_64-debug-rhel.config b/kernel-rt-x86_64-debug-rhel.config index 8f9f01e..fcf8e86 100644 --- a/kernel-rt-x86_64-debug-rhel.config +++ b/kernel-rt-x86_64-debug-rhel.config @@ -1775,7 +1775,7 @@ CONFIG_FUTEX=y # CONFIG_FW_CACHE is not set # CONFIG_FW_CFG_SYSFS_CMDLINE is not set CONFIG_FW_CFG_SYSFS=y -# CONFIG_FW_LOADER_COMPRESS is not set +CONFIG_FW_LOADER_COMPRESS=y # CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set CONFIG_FW_LOADER_USER_HELPER=y CONFIG_FW_LOADER=y diff --git a/kernel-rt-x86_64-rhel.config b/kernel-rt-x86_64-rhel.config index 4aa68f3..4e4e6de 100644 --- a/kernel-rt-x86_64-rhel.config +++ b/kernel-rt-x86_64-rhel.config @@ -1759,7 +1759,7 @@ CONFIG_FUTEX=y # CONFIG_FW_CACHE is not set # CONFIG_FW_CFG_SYSFS_CMDLINE is not set CONFIG_FW_CFG_SYSFS=y -# CONFIG_FW_LOADER_COMPRESS is not set +CONFIG_FW_LOADER_COMPRESS=y # CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set CONFIG_FW_LOADER_USER_HELPER=y CONFIG_FW_LOADER=y diff --git a/kernel.spec b/kernel.spec index ad99b1b..f558999 100755 --- a/kernel.spec +++ b/kernel.spec @@ -64,7 +64,7 @@ Summary: The Linux kernel # For a stable, released kernel, released_kernel should be 1. %global released_kernel 0 -%global distro_build 0.rc3.170 +%global distro_build 0.rc4.175 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -105,13 +105,13 @@ Summary: The Linux kernel %endif %define rpmversion 5.12.0 -%define pkgrelease 0.rc3.170.rt1.5 +%define pkgrelease 0.rc4.175.rt3.6 # This is needed to do merge window version magic %define patchlevel 12 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc3.170.rt1.5%{?buildid}%{?dist} +%define specrelease 0.rc4.175.rt3.6%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -627,7 +627,7 @@ BuildRequires: asciidoc # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.12.0-0.rc3.170.rt1.5.tar.xz +Source0: linux-5.12.0-0.rc4.175.rt3.6.tar.xz Source1: Makefile.rhelver @@ -1315,8 +1315,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.12.0-0.rc3.170.rt1.5 -c -mv linux-5.12.0-0.rc3.170.rt1.5 linux-%{KVERREL} +%setup -q -n kernel-5.12.0-0.rc4.175.rt3.6 -c +mv linux-5.12.0-0.rc4.175.rt3.6 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -2575,12 +2575,14 @@ fi\ # %define kernel_variant_posttrans() \ %{expand:%%posttrans %{?1:%{1}-}core}\ +%if 0%{!?fedora:1}\ %if !%{with_realtime}\ if [ -x %{_sbindir}/weak-modules ]\ then\ %{_sbindir}/weak-modules --add-kernel %{KVERREL}%{?1:+%{1}} || exit $?\ fi\ %endif\ +%endif\ /bin/kernel-install add %{KVERREL}%{?1:+%{1}} /lib/modules/%{KVERREL}%{?1:+%{1}}/vmlinuz || exit $?\ %{nil} @@ -2885,8 +2887,8 @@ fi # # %changelog -* Wed Mar 17 2021 Juri Lelli [5.12.0-0.rc3.170.rt1.5] -- kernel-5.12.0-0.rc3.170 rebase +* Tue Mar 30 2021 Juri Lelli [5.12.0-0.rc4.175.rt3.6] +- kernel-5.12.0-0.rc4.175.el9 rebase - spec: Generate separate kernel-rt-kvm packages (Juri Lelli) - Add RT config options (Juri Lelli) - specfile: Add with_realtime (Juri Lelli) @@ -3054,28 +3056,30 @@ fi - printk: remove deferred printing (John Ogness) - printk: move console printing to kthreads (John Ogness) - printk: introduce kernel sync mode (John Ogness) -- printk: change @console_seq to atomic64_t (John Ogness) +- printk: use seqcount_latch for console_seq (John Ogness) - printk: combine boot_delay_msec() into printk_delay() (John Ogness) - printk: relocate printk_delay() and vprintk_default() (John Ogness) - serial: 8250: implement write_atomic (John Ogness) +- kdb: only use atomic consoles for output mirroring (John Ogness) - console: add write_atomic interface (John Ogness) - printk: convert @syslog_lock to spin_lock (John Ogness) - printk: remove safe buffers (John Ogness) - printk: track/limit recursion (John Ogness) - printk: console: remove unnecessary safe buffer usage (John Ogness) -- printk: kmsg_dump: use kmsg_dump_rewind (John Ogness) - printk: kmsg_dump: remove _nolock() variants (John Ogness) - printk: remove logbuf_lock (John Ogness) -- um: synchronize kmsg_dumper (John Ogness) - printk: introduce a kmsg_dump iterator (John Ogness) +- printk: kmsg_dumper: remove @active field (John Ogness) - printk: add syslog_lock (John Ogness) - printk: use atomic64_t for devkmsg_user.seq (John Ogness) - printk: use seqcount_latch for clear_seq (John Ogness) -- printk: introduce CONSOLE_LOG_MAX for improved multi-line support (John Ogness) +- printk: introduce CONSOLE_LOG_MAX (John Ogness) - printk: consolidate kmsg_dump_get_buffer/syslog_print_all code (John Ogness) - printk: refactor kmsg_dump_get_buffer() (John Ogness) - printk: kmsg_dump: remove unused fields (John Ogness) - printk: limit second loop of syslog_print_all (John Ogness) +- mtd: mtdoops: synchronize kmsg_dumper (John Ogness) +- um: synchronize kmsg_dumper (John Ogness) - powerpc/mm: Move the linear_mapping_mutex to the ifdef where it is used (Sebastian Andrzej Siewior) - notifier: Make atomic_notifiers use raw_spinlock (Valentin Schneider) - genirq: Move prio assignment into the newly created thread (Thomas Gleixner) @@ -3083,6 +3087,13 @@ fi - timers: Move clearing of base::timer_running under base::lock (Thomas Gleixner) - highmem: Don't disable preemption on RT in kmap_atomic() (Sebastian Andrzej Siewior) +* Sat Mar 20 2021 Fedora Kernel Team [5.12.0-0.rc3.20210320git1c273e10bc0c.173] +- CONFIG_VFIO now selects IOMMU_API instead of depending on it, causing several config mismatches for the zfcpdump kernel (Justin M. Forbes) + +* Thu Mar 18 2021 Fedora Kernel Team [5.12.0-0.rc3.20210318git6417f03132a6.171] +- Turn off weak-modules for Fedora (Justin M. Forbes) +- redhat: enable CONFIG_FW_LOADER_COMPRESS for ARK (Herton R. Krzesinski) [1939095] + * Mon Mar 15 2021 Fedora Kernel Team [5.12.0-0.rc3.170] - Fedora: filters: update to move dfl-emif to modules (Peter Robinson) - drop duplicate DEVFREQ_GOV_SIMPLE_ONDEMAND config (Peter Robinson) diff --git a/sources b/sources index 3046080..9355728 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-5.12.0-0.rc3.170.rt1.5.tar.xz) = d24a6b6f61bd51794776ad1d4b65636fea6e3cba3dcec1f7fde83acb421d89926a11ee4f73680ed440971de2f704e2e178c379c6f070f2f7e0009abba59168b7 -SHA512 (kernel-abi-whitelists-5.12.0-0.rc3.170.tar.bz2) = bc5d09494ae5f33adb7bd6f4bce1dbd755a82e58671814920ef0164c6cb07d7206eae72df51cc55070e713a9cdb1856bb4f708f9cbbf491c0577f23fd5555f76 -SHA512 (kernel-kabi-dw-5.12.0-0.rc3.170.tar.bz2) = 9ac28003004f9d5a2e33cb5be67eb80d899b98d6c05d15a47bf946eadfc48e30320140cc6808d7f48800e4223f72162efe7fa16c7cd8f81dcb1206a8c8c55177 +SHA512 (linux-5.12.0-0.rc4.175.rt3.6.tar.xz) = 419d515d05aca40bce3568c42b5fa90f6b4129b01bcb90cbd93e13e7b8884c32e9f93b94fe4542436e14dabcb1170dd7ff3cf651e4eb9b95670fceed156afb4a +SHA512 (kernel-abi-whitelists-5.12.0-0.rc4.175.tar.bz2) = 6e594e014b132562864951e36cf943ab93c457e8155be14ced71ec90af956705f8383b9e304ffdb9a703557ff38ca425a6436193716b17db9d2d07dcb58dda96 +SHA512 (kernel-kabi-dw-5.12.0-0.rc4.175.tar.bz2) = af4ed1c8513a5fcffe5c6eae0d1f8e934eefd548efc93676b12f796e91f7b9edb89ec99318da05ae540c2ed79414e435ac4662cf33ae2009910ec45ce8444b17