diff --git a/Makefile.rhelver b/Makefile.rhelver index 29fbe55..aca92dd 100644 --- a/Makefile.rhelver +++ b/Makefile.rhelver @@ -12,7 +12,7 @@ RHEL_MINOR = 0 # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -RHEL_RELEASE = 61 +RHEL_RELEASE = 62 # # Early y+1 numbering @@ -44,4 +44,4 @@ ifneq ("$(ZSTREAM)", "yes") endif endif -RTBUILD:=.62 +RTBUILD:=.63 diff --git a/kernel-rt-x86_64-debug-rhel.config b/kernel-rt-x86_64-debug-rhel.config index 311f66a..16b0d05 100644 --- a/kernel-rt-x86_64-debug-rhel.config +++ b/kernel-rt-x86_64-debug-rhel.config @@ -218,7 +218,6 @@ CONFIG_ARM64_EPAN=y CONFIG_ARM64_ERRATUM_1319367=y CONFIG_ARM64_ERRATUM_1530923=y CONFIG_ARM64_ERRATUM_1542419=y -CONFIG_ARM64_MTE=y CONFIG_ARM64_USE_LSE_ATOMICS=y CONFIG_ARM_CMN=m # CONFIG_ARM_MHU_V2 is not set @@ -2801,9 +2800,9 @@ CONFIG_MAC80211_RC_DEFAULT="minstrel_ht" CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y CONFIG_MAC80211_RC_MINSTREL=y CONFIG_MAC802154=m -CONFIG_MAC_EMUMOUSEBTN=y +# CONFIG_MAC_EMUMOUSEBTN is not set CONFIG_MACHZ_WDT=m -CONFIG_MACINTOSH_DRIVERS=y +# CONFIG_MACINTOSH_DRIVERS is not set CONFIG_MAC_PARTITION=y CONFIG_MACSEC=m CONFIG_MACVLAN=m @@ -5545,7 +5544,7 @@ CONFIG_TERANETICS_PHY=m # CONFIG_TEST_BITMAP is not set # CONFIG_TEST_BITOPS is not set # CONFIG_TEST_BLACKHOLE_DEV is not set -# CONFIG_TEST_BPF is not set +CONFIG_TEST_BPF=m # CONFIG_TEST_CLOCKSOURCE_WATCHDOG is not set # CONFIG_TEST_DIV64 is not set # CONFIG_TEST_FIRMWARE is not set diff --git a/kernel-rt-x86_64-rhel.config b/kernel-rt-x86_64-rhel.config index 33a264b..0b8a3e3 100644 --- a/kernel-rt-x86_64-rhel.config +++ b/kernel-rt-x86_64-rhel.config @@ -218,7 +218,6 @@ CONFIG_ARM64_EPAN=y CONFIG_ARM64_ERRATUM_1319367=y CONFIG_ARM64_ERRATUM_1530923=y CONFIG_ARM64_ERRATUM_1542419=y -CONFIG_ARM64_MTE=y CONFIG_ARM64_USE_LSE_ATOMICS=y CONFIG_ARM_CMN=m # CONFIG_ARM_MHU_V2 is not set @@ -2781,9 +2780,9 @@ CONFIG_MAC80211_RC_DEFAULT="minstrel_ht" CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y CONFIG_MAC80211_RC_MINSTREL=y CONFIG_MAC802154=m -CONFIG_MAC_EMUMOUSEBTN=y +# CONFIG_MAC_EMUMOUSEBTN is not set CONFIG_MACHZ_WDT=m -CONFIG_MACINTOSH_DRIVERS=y +# CONFIG_MACINTOSH_DRIVERS is not set CONFIG_MAC_PARTITION=y CONFIG_MACSEC=m CONFIG_MACVLAN=m @@ -5522,7 +5521,7 @@ CONFIG_TERANETICS_PHY=m # CONFIG_TEST_BITMAP is not set # CONFIG_TEST_BITOPS is not set # CONFIG_TEST_BLACKHOLE_DEV is not set -# CONFIG_TEST_BPF is not set +CONFIG_TEST_BPF=m # CONFIG_TEST_CLOCKSOURCE_WATCHDOG is not set # CONFIG_TEST_DIV64 is not set # CONFIG_TEST_FIRMWARE is not set diff --git a/kernel.spec b/kernel.spec index 91c9af3..82e140d 100755 --- a/kernel.spec +++ b/kernel.spec @@ -79,7 +79,7 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 -%global distro_build 61 +%global distro_build 62 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -123,13 +123,13 @@ Summary: The Linux kernel %define kversion 5.14 %define rpmversion 5.14.0 -%define pkgrelease 61.rt21.62.el9 +%define pkgrelease 62.rt21.63.el9 # This is needed to do merge window version magic %define patchlevel 14 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 61.rt21.62%{?buildid}%{?dist} +%define specrelease 62.rt21.63%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -703,7 +703,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.14.0-61.rt21.62.el9.tar.xz +Source0: linux-5.14.0-62.rt21.63.el9.tar.xz Source1: Makefile.rhelver @@ -1413,8 +1413,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.14.0-61.rt21.62.el9 -c -mv linux-5.14.0-61.rt21.62.el9 linux-%{KVERREL} +%setup -q -n kernel-5.14.0-62.rt21.63.el9 -c +mv linux-5.14.0-62.rt21.63.el9 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -3071,6 +3071,55 @@ fi # # %changelog +* Mon Feb 21 2022 Juri Lelli [5.14.0-62.rt21.63.el9] +- Revert "Merge: blktrace: switch trace spinlock to a raw spinlock" (Juri Lelli) +- Revert "Merge: ext4: fix potential NULL pointer dereference in ext4_fill_super()" (Juri Lelli) +- ibmvnic: remove unused defines (Diego Domingos) [2047921] +- ibmvnic: Update driver return codes (Diego Domingos) [2047921] +- powerpc/fadump: opt out from freeing pages on cma activation failure (Diego Domingos) [2040289] +- mm/cma: provide option to opt out from exposing pages on activation failure (Diego Domingos) [2040289] +- firmware: smccc: Fix check for ARCH_SOC_ID not implemented (Vitaly Kuznetsov) [2052908] +- rcu: Tighten rcu_advance_cbs_nowake() checks (Daniel Vacek) [2026991] +- redhat/configs: Disable CONFIG_MACINTOSH_DRIVERS (Prarit Bhargava) [2053028] +- ibmvnic: remove unused ->wait_capability (Diego Domingos) [2047928] +- ibmvnic: don't spin in tasklet (Diego Domingos) [2047928] +- ibmvnic: init ->running_cap_crqs early (Diego Domingos) [2047928] +- ibmvnic: Allow extra failures before disabling (Diego Domingos) [2047928] +- s390/pv: fix the forcing of the swiotlb (Thomas Huth) [2051581] +- scsi: vmw_pvscsi: Set residual data length conditionally (Cathy Avery) [2048178] +- selinux: fix double free of cond_list on error paths (Ondrej Mosnacek) [2052439] +- selinux: fix NULL-pointer dereference when hashtab allocation fails (Ondrej Mosnacek) [2052436] +- isdn: cpai: check ctr->cnr to avoid array index out of bound (Chris von Recklinghausen) [2016492] {CVE-2021-43389} +- mm/hwpoison: fix unpoison_memory() (Aristeu Rozanski) [1972220] +- mm/hwpoison: remove MF_MSG_BUDDY_2ND and MF_MSG_POISONED_HUGE (Aristeu Rozanski) [1972220] +- mm/hwpoison: mf_mutex for soft offline and unpoison (Aristeu Rozanski) [1972220] +- mm/hwpoison: clear MF_COUNT_INCREASED before retrying get_any_page() (Aristeu Rozanski) [1972220] +- mm, hwpoison: fix condition in free hugetlb page path (Aristeu Rozanski) [1972220] +- filemap: remove PageHWPoison check from next_uptodate_page() (Aristeu Rozanski) [1972220] +- mm: hwpoison: handle non-anonymous THP correctly (Aristeu Rozanski) [1972220] +- mm: hwpoison: refactor refcount check handling (Aristeu Rozanski) [1972220] +- mm: filemap: coding style cleanup for filemap_map_pmd() (Aristeu Rozanski) [1972220] +- scsi: bnx2fc: Make bnx2fc_recv_frame() mp safe (John Meneghini) [2031648] +- scsi: bnx2fc: Flush destroy_work queue before calling bnx2fc_interface_put() (John Meneghini) [2006606] +- redhat/configs: Enable CONFIG_TEST_BPF (Viktor Malik) [2035168] +- ext4: fix potential NULL pointer dereference in ext4_fill_super() (Lukas Czerner) [2051466] +- netfilter: ipset: Emit deprecation warning at set creation time (Phil Sutter) [2048194] +- redhat: move CONFIG_ARM64_MTE to aarch64 config directory (Herton R. Krzesinski) +- cgroup/cpuset: Fix "suspicious RCU usage" lockdep warning (Waiman Long) [1996015] +- cpuset: Fix the bug that subpart_cpus updated wrongly in update_cpumask() (Waiman Long) [1996015] +- net ticp:fix a kernel-infoleak in __tipc_sendmsg() (Xin Long) [2050039] +- tipc: discard MSG_CRYPTO msgs when key_exchange_enabled is not set (Xin Long) [2050039] +- tipc: delete the unlikely branch in tipc_aead_encrypt (Xin Long) [2050039] +- blktrace: switch trace spinlock to a raw spinlock (Wander Lairson Costa) [2047971] +- NFSv4.1: handle NFS4ERR_NOSPC by CREATE_SESSION (Steve Dickson) [2027447] +- igb: fix deadlock caused by taking RTNL in RPM resume path (Corinna Vinschen) [2040312] +- igb: Fix removal of unicast MAC filters of VFs (Corinna Vinschen) [2040312] +- igb: fix netpoll exit with traffic (Corinna Vinschen) [2040312] +- igb: unbreak I2C bit-banging on i350 (Corinna Vinschen) [2040312] +- igb: Avoid memcpy() over-reading of ETH_SS_STATS (Corinna Vinschen) [2040312] +- igb: Add counter to i21x doublecheck (Corinna Vinschen) [2040312] +- net: create netdev->dev_addr assignment helpers (Josef Oskera) [2030720] + * Thu Feb 17 2022 Juri Lelli [5.14.0-61.rt21.62.el9] - Enable KUNIT tests for redhat kernel-modules-internal (Nico Pache) [2048326] - kasan: test: fix compatibility with FORTIFY_SOURCE (Nico Pache) [2048326] diff --git a/mod-internal.list b/mod-internal.list index c896864..5a89abc 100644 --- a/mod-internal.list +++ b/mod-internal.list @@ -30,6 +30,7 @@ pktgen rcutorture rocker scftorture +test_bpf test_klp_atomic_replace test_klp_callbacks_demo test_klp_callbacks_demo2 diff --git a/sources b/sources index 28ec750..e2c4f91 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (kernel-abi-whitelists-5.13.0-1.tar.bz2) = ceba454e1f590c1e4ef4115a75463ae3ac2c2aa7ec85fa14a2669d666c421483a38225ee19d7d72b4ac7032375741408b23543e43588538c80161ec0cf57051c -SHA512 (linux-5.14.0-61.rt21.62.el9.tar.xz) = ae870827d8129c2c55f9dc1f4f5d2ae75069d1dcbb76621c86ddb63352e91ca35ba3f5d7916605728b496895fe0128924730c44b4f4ba2b79219f7059eb82e48 -SHA512 (kernel-abi-stablelists-5.14.0-61.tar.bz2) = eccc10d6eab8b1e9bcb00392a30265d777e20f26abce39ec564203e3af90738386ef8a9022fcdc7a79cd84a80859e22dd174f63d492db3857f2f5e4b4356bd97 -SHA512 (kernel-kabi-dw-5.14.0-61.tar.bz2) = c901529aff636abbc2aa5f289ec098a2a29c8507aa81ee649d1104592b8abad9f495db0e947dc36a84e043708a47373de35156b40b252281ef747f06e19ed914 +SHA512 (linux-5.14.0-62.rt21.63.el9.tar.xz) = 96d19ab5d890708963aa1634eed08bedefb6119c94c3f3a8ff8dfa147f3ed1a63e768287432d1f677407436d4d76889b56389adaf3cc61010f4a4711a89c1d91 +SHA512 (kernel-abi-stablelists-5.14.0-62.tar.bz2) = 7e8e4fc426dcf15a34a76d2daf850b61c5ecda1b6fb91fa6cea55705356c5ad7c1dd0fb0d6c640bee6b513ce8ccd383858c84e601f9943f201ab14ecda74afd3 +SHA512 (kernel-kabi-dw-5.14.0-62.tar.bz2) = c901529aff636abbc2aa5f289ec098a2a29c8507aa81ee649d1104592b8abad9f495db0e947dc36a84e043708a47373de35156b40b252281ef747f06e19ed914