diff --git a/Makefile.rhelver b/Makefile.rhelver index 2291c0c65..874c9f591 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 = 41 +RHEL_RELEASE = 42 # # Early y+1 numbering diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index aad24e689..e50716ad8 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -885,7 +885,7 @@ CONFIG_CRYPTO_AES_ARM64_NEON_BLK=y CONFIG_CRYPTO_AES=y CONFIG_CRYPTO_ANSI_CPRNG=m CONFIG_CRYPTO_AUTHENC=y -# CONFIG_CRYPTO_BLAKE2B is not set +CONFIG_CRYPTO_BLAKE2B=m # CONFIG_CRYPTO_BLAKE2S is not set CONFIG_CRYPTO_BLOWFISH=m CONFIG_CRYPTO_CAMELLIA=m @@ -1050,7 +1050,7 @@ CONFIG_DEBUG_IRQFLAGS=y CONFIG_DEBUG_KERNEL=y CONFIG_DEBUG_KMEMLEAK_AUTO_SCAN=y CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=y -CONFIG_DEBUG_KMEMLEAK_MEM_POOL_SIZE=20000 +CONFIG_DEBUG_KMEMLEAK_MEM_POOL_SIZE=40000 # CONFIG_DEBUG_KMEMLEAK_TEST is not set CONFIG_DEBUG_KMEMLEAK=y # CONFIG_DEBUG_KOBJECT is not set diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index 4fb71c66e..60d213393 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -885,7 +885,7 @@ CONFIG_CRYPTO_AES_ARM64_NEON_BLK=y CONFIG_CRYPTO_AES=y CONFIG_CRYPTO_ANSI_CPRNG=m CONFIG_CRYPTO_AUTHENC=y -# CONFIG_CRYPTO_BLAKE2B is not set +CONFIG_CRYPTO_BLAKE2B=m # CONFIG_CRYPTO_BLAKE2S is not set CONFIG_CRYPTO_BLOWFISH=m CONFIG_CRYPTO_CAMELLIA=m diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index a7733e528..2cf63c822 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -745,7 +745,7 @@ CONFIG_CRYPTO_AEGIS128_AESNI_SSE2=m CONFIG_CRYPTO_AES=y CONFIG_CRYPTO_ANSI_CPRNG=m CONFIG_CRYPTO_AUTHENC=y -# CONFIG_CRYPTO_BLAKE2B is not set +CONFIG_CRYPTO_BLAKE2B=m # CONFIG_CRYPTO_BLAKE2S is not set CONFIG_CRYPTO_BLOWFISH=m CONFIG_CRYPTO_CAMELLIA=m @@ -908,7 +908,7 @@ CONFIG_DEBUG_IRQFLAGS=y CONFIG_DEBUG_KERNEL=y CONFIG_DEBUG_KMEMLEAK_AUTO_SCAN=y CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=y -CONFIG_DEBUG_KMEMLEAK_MEM_POOL_SIZE=20000 +CONFIG_DEBUG_KMEMLEAK_MEM_POOL_SIZE=40000 # CONFIG_DEBUG_KMEMLEAK_TEST is not set CONFIG_DEBUG_KMEMLEAK=y # CONFIG_DEBUG_KOBJECT is not set diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index ddfee6f15..c6b6efb72 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -745,7 +745,7 @@ CONFIG_CRYPTO_AEGIS128_AESNI_SSE2=m CONFIG_CRYPTO_AES=y CONFIG_CRYPTO_ANSI_CPRNG=m CONFIG_CRYPTO_AUTHENC=y -# CONFIG_CRYPTO_BLAKE2B is not set +CONFIG_CRYPTO_BLAKE2B=m # CONFIG_CRYPTO_BLAKE2S is not set CONFIG_CRYPTO_BLOWFISH=m CONFIG_CRYPTO_CAMELLIA=m diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index 7697d6144..891613b8b 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -746,7 +746,7 @@ CONFIG_CRYPTO_AES_S390=m CONFIG_CRYPTO_AES=y CONFIG_CRYPTO_ANSI_CPRNG=m CONFIG_CRYPTO_AUTHENC=y -# CONFIG_CRYPTO_BLAKE2B is not set +CONFIG_CRYPTO_BLAKE2B=m # CONFIG_CRYPTO_BLAKE2S is not set CONFIG_CRYPTO_BLOWFISH=m CONFIG_CRYPTO_CAMELLIA=m @@ -914,7 +914,7 @@ CONFIG_DEBUG_IRQFLAGS=y CONFIG_DEBUG_KERNEL=y CONFIG_DEBUG_KMEMLEAK_AUTO_SCAN=y CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=y -CONFIG_DEBUG_KMEMLEAK_MEM_POOL_SIZE=20000 +CONFIG_DEBUG_KMEMLEAK_MEM_POOL_SIZE=40000 # CONFIG_DEBUG_KMEMLEAK_TEST is not set CONFIG_DEBUG_KMEMLEAK=y # CONFIG_DEBUG_KOBJECT is not set diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index a8860148e..67472d5b7 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -746,7 +746,7 @@ CONFIG_CRYPTO_AES_S390=m CONFIG_CRYPTO_AES=y CONFIG_CRYPTO_ANSI_CPRNG=m CONFIG_CRYPTO_AUTHENC=y -# CONFIG_CRYPTO_BLAKE2B is not set +CONFIG_CRYPTO_BLAKE2B=m # CONFIG_CRYPTO_BLAKE2S is not set CONFIG_CRYPTO_BLOWFISH=m CONFIG_CRYPTO_CAMELLIA=m diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 9917c601d..3eac2022a 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -751,7 +751,7 @@ CONFIG_CRYPTO_AES_S390=y CONFIG_CRYPTO_AES=y CONFIG_CRYPTO_ANSI_CPRNG=y # CONFIG_CRYPTO_AUTHENC is not set -# CONFIG_CRYPTO_BLAKE2B is not set +CONFIG_CRYPTO_BLAKE2B=y # CONFIG_CRYPTO_BLAKE2S is not set CONFIG_CRYPTO_BLOWFISH=y CONFIG_CRYPTO_CAMELLIA=y diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 0f2f609da..09131f1a1 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -776,7 +776,7 @@ CONFIG_CRYPTO_AES_NI_INTEL=y CONFIG_CRYPTO_AES=y CONFIG_CRYPTO_ANSI_CPRNG=m CONFIG_CRYPTO_AUTHENC=y -# CONFIG_CRYPTO_BLAKE2B is not set +CONFIG_CRYPTO_BLAKE2B=m # CONFIG_CRYPTO_BLAKE2S is not set CONFIG_CRYPTO_BLAKE2S_X86=m CONFIG_CRYPTO_BLOWFISH=m @@ -969,7 +969,7 @@ CONFIG_DEBUG_IRQFLAGS=y CONFIG_DEBUG_KERNEL=y CONFIG_DEBUG_KMEMLEAK_AUTO_SCAN=y CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=y -CONFIG_DEBUG_KMEMLEAK_MEM_POOL_SIZE=20000 +CONFIG_DEBUG_KMEMLEAK_MEM_POOL_SIZE=40000 # CONFIG_DEBUG_KMEMLEAK_TEST is not set CONFIG_DEBUG_KMEMLEAK=y # CONFIG_DEBUG_KOBJECT is not set diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index f5c8c7412..b1b4421ef 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -776,7 +776,7 @@ CONFIG_CRYPTO_AES_NI_INTEL=y CONFIG_CRYPTO_AES=y CONFIG_CRYPTO_ANSI_CPRNG=m CONFIG_CRYPTO_AUTHENC=y -# CONFIG_CRYPTO_BLAKE2B is not set +CONFIG_CRYPTO_BLAKE2B=m # CONFIG_CRYPTO_BLAKE2S is not set CONFIG_CRYPTO_BLAKE2S_X86=m CONFIG_CRYPTO_BLOWFISH=m diff --git a/kernel.spec b/kernel.spec index 9fc48eff6..60df0445a 100755 --- a/kernel.spec +++ b/kernel.spec @@ -85,7 +85,7 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 -%global distro_build 41 +%global distro_build 42 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -129,13 +129,13 @@ Summary: The Linux kernel %define kversion 5.14 %define rpmversion 5.14.0 -%define pkgrelease 41.el9 +%define pkgrelease 42.el9 # This is needed to do merge window version magic %define patchlevel 14 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 41%{?buildid}%{?dist} +%define specrelease 42%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -677,7 +677,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.14.0-41.el9.tar.xz +Source0: linux-5.14.0-42.el9.tar.xz Source1: Makefile.rhelver @@ -1362,8 +1362,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.14.0-41.el9 -c -mv linux-5.14.0-41.el9 linux-%{KVERREL} +%setup -q -n kernel-5.14.0-42.el9 -c +mv linux-5.14.0-42.el9 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -2959,6 +2959,53 @@ fi # # %changelog +* Thu Jan 13 2022 Herton R. Krzesinski [5.14.0-42.el9] +- scsi: smartpqi: Update version to 2.1.12-055 (Don Brace) [1869853] +- scsi: smartpqi: Add 3252-8i PCI id (Don Brace) [1869853] +- scsi: smartpqi: Fix duplicate device nodes for tape changers (Don Brace) [1869853] +- scsi: smartpqi: Fix boot failure during LUN rebuild (Don Brace) [1869853] +- scsi: smartpqi: Add extended report physical LUNs (Don Brace) [1869853] +- scsi: smartpqi: Avoid failing I/Os for offline devices (Don Brace) [1869853] +- scsi: smartpqi: Add TEST UNIT READY check for SANITIZE operation (Don Brace) [1869853] +- scsi: smartpqi: Update LUN reset handler (Don Brace) [1869853] +- scsi: smartpqi: Capture controller reason codes (Don Brace) [1869853] +- scsi: smartpqi: Add controller handshake during kdump (Don Brace) [1869853] +- scsi: smartpqi: Update device removal management (Don Brace) [1869853] +- scsi: smartpqi: Replace one-element array with flexible-array member (Don Brace) [1869853] +- scsi: smartpqi: Fix an error code in pqi_get_raid_map() (Don Brace) [1869853] +- scsi: smartpqi: Update version to 2.1.10-020 (Don Brace) [1869853] +- scsi: smartpqi: Fix ISR accessing uninitialized data (Don Brace) [1869853] +- scsi: smartpqi: Add PCI IDs for new ZTE controllers (Don Brace) [1869853] +- scsi: smartpqi: Add PCI ID for new ntcom controller (Don Brace) [1869853] +- scsi: smartpqi: Add SCSI cmd info for resets (Don Brace) [1869853] +- scsi: smartpqi: Change Kconfig menu entry to Microchip (Don Brace) [1869853] +- scsi: smartpqi: Change driver module macros to Microchip (Don Brace) [1869853] +- scsi: smartpqi: Update copyright notices (Don Brace) [1869853] +- scsi: smartpqi: Add PCI IDs for H3C P4408 controllers (Don Brace) [1869853] +- powerpc/module_64: Fix livepatching for RO modules (Joe Lawrence) [2019205] +- net-sysfs: try not to restart the syscall if it will fail eventually (Antoine Tenart) [2030634] +- CI: Enable realtime checks for baselines (Veronika Kabatova) +- CI: Cleanup residue from ARK (Veronika Kabatova) +- redhat: ignore ksamples and kselftests on the badfuncs rpminspect test (Herton R. Krzesinski) +- redhat: disable upstream check for rpminspect (Herton R. Krzesinski) +- redhat/configs: Enable CONFIG_CRYPTO_BLAKE2B (Neal Gompa) [2031547] +- selftests: netfilter: switch zone stress to socat (Florian Westphal) [2030759] +- netfilter: conntrack: set on IPS_ASSURED if flows enters internal stream state (Florian Westphal) [2030759] +- netfilter: conntrack: serialize hash resizes and cleanups (Florian Westphal) [2030759] +- selftests: netfilter: add zone stress test with colliding tuples (Florian Westphal) [2030759] +- selftests: netfilter: add selftest for directional zone support (Florian Westphal) [2030759] +- netfilter: conntrack: include zone id in tuple hash again (Florian Westphal) [2030759] +- netfilter: conntrack: make max chain length random (Florian Westphal) [2030759] +- netfilter: refuse insertion if chain has grown too large (Florian Westphal) [2030759] +- netfilter: conntrack: switch to siphash (Florian Westphal) [2030759] +- netfilter: conntrack: sanitize table size default settings (Florian Westphal) [2030759] +- redhat: configs: increase CONFIG_DEBUG_KMEMLEAK_MEM_POOL_SIZE (Rafael Aquini) [2008118] +- iommu/dma: Fix incorrect error return on iommu deferred attach (Jerry Snitselaar) [2030394] +- RDMA/siw: Mark Software iWARP Driver as tech-preview (Kamal Heib) [2023416] +- genirq: Fix kernel doc indentation (Prarit Bhargava) [2023084] +- genirq: Change force_irqthreads to a static key (Prarit Bhargava) [2023084] +- genirq: Clarify documentation for request_threaded_irq() (Prarit Bhargava) [2023084] + * Wed Jan 12 2022 Herton R. Krzesinski [5.14.0-41.el9] - af_unix: Return errno instead of NULL in unix_create1(). (Balazs Nemeth) [2030037] - s390/ftrace: remove preempt_disable()/preempt_enable() pair (Wander Lairson Costa) [1938117] diff --git a/rpminspect.yaml b/rpminspect.yaml index f62742aa5..4c059887f 100644 --- a/rpminspect.yaml +++ b/rpminspect.yaml @@ -1,6 +1,14 @@ # additional rpminspect configuration for this branch --- +inspections: + upstream: off + +badfuncs: + ignore: + - /usr/libexec/ksamples/* + - /usr/libexec/kselftests/* + emptyrpm: expected_empty: - kernel diff --git a/sources b/sources index 34e48b037..26a676be0 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-5.14.0-41.el9.tar.xz) = 351e4a3a74b9d5470497c044635f13a453f690113bbf07c4493e6319231d6fe71f54b0db28bb96539e6598668ebe95333f3cb6d94224fd2f6fa754f1e2f217b8 -SHA512 (kernel-abi-stablelists-5.14.0-41.tar.bz2) = 9146127e89282ac561b1e35ede5a4bf95940775cb59136a198d4a5ee83fde633fa1ac93085574cbdd5b47efe0d76d5870df1578e38617d4d03378563866e147a -SHA512 (kernel-kabi-dw-5.14.0-41.tar.bz2) = bef016c8981383b5015d0017f479b23d42adb49e1b914699aadbd109a70111bc327fd3e8099b7d7e93a32cd3df012b5b4769500130b55a0da405c8d83d566bcb +SHA512 (linux-5.14.0-42.el9.tar.xz) = c060198155c385a1b3ce60b58ccd4d16234bda6046a17d549becc7b51b3c6fdbb116b29a8c2939d0960fc87925314f36af1508c95469718fda6605de2eede964 +SHA512 (kernel-abi-stablelists-5.14.0-42.tar.bz2) = a2199eb82526f37a583a7ae5400b3d3457c8c8a1e92101b20551888f4f3e6501b30216055f1bcf658c61c22846ca81c7601fc909149b50a233b569189aa5a708 +SHA512 (kernel-kabi-dw-5.14.0-42.tar.bz2) = 3bc0a8429c5c1ef13470176a8e6be7d4e0aafe896bd7c77fd0c2ad6b2d01458dc1c0443bce2f287a1bb27331713e539efb47d144c1bf94bb0500dc7410c902f9