diff --git a/Makefile.rhelver b/Makefile.rhelver index be29ba5..d10b029 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 = 3 +RHEL_RELEASE = 4 # # Early y+1 numbering diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 29d7e46..e060349 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -1420,7 +1420,7 @@ CONFIG_DRM_UDL=m CONFIG_DRM_VIRTIO_GPU=m CONFIG_DRM_VKMS=m CONFIG_DRM_VMWGFX_FBCON=y -CONFIG_DRM_VMWGFX=m +# CONFIG_DRM_VMWGFX is not set # CONFIG_DRM_XEN_FRONTEND is not set # CONFIG_DRM_XEN is not set # CONFIG_DS1682 is not set diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index ab75889..b27ac73 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -1412,7 +1412,7 @@ CONFIG_DRM_UDL=m CONFIG_DRM_VIRTIO_GPU=m CONFIG_DRM_VKMS=m CONFIG_DRM_VMWGFX_FBCON=y -CONFIG_DRM_VMWGFX=m +# CONFIG_DRM_VMWGFX is not set # CONFIG_DRM_XEN_FRONTEND is not set # CONFIG_DRM_XEN is not set # CONFIG_DS1682 is not set diff --git a/kernel.spec b/kernel.spec index d8ac706..e34b915 100755 --- a/kernel.spec +++ b/kernel.spec @@ -80,7 +80,7 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 -%global distro_build 3 +%global distro_build 4 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -125,13 +125,13 @@ Summary: The Linux kernel %define rpmversion 5.14.0 %define patchversion 5.14 -%define pkgrelease 3 +%define pkgrelease 4.el9 # This is needed to do merge window version magic %define patchlevel 14 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 3%{?buildid}%{?dist} +%define specrelease 4%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -672,7 +672,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.14.0-3.tar.xz +Source0: linux-5.14.0-4.el9.tar.xz Source1: Makefile.rhelver @@ -1357,8 +1357,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.14.0-3 -c -mv linux-5.14.0-3 linux-%{KVERREL} +%setup -q -n kernel-5.14.0-4.el9 -c +mv linux-5.14.0-4.el9 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -2957,6 +2957,45 @@ fi # # %changelog +* Wed Sep 22 2021 Herton R. Krzesinski [5.14-4.el9] +- Drivers: hv: vmbus: Fix kernel crash upon unbinding a device from uio_hv_generic driver (Vitaly Kuznetsov) [1999535] +- ipc: replace costly bailout check in sysvipc_find_ipc() (Rafael Aquini) [1987130 2003270] {CVE-2021-3669} +- redhat/configs: Disable CONFIG_DRM_VMWGFX on aarch64 (Michel Dänzer) [1996993] +- redhat: set USE_DIST_IN_SOURCE=1 for 9.0-beta (Jan Stancek) +- redhat: add option to use DIST tag in sources (Jan Stancek) +- CI: Enable notification messages for RHEL9 (Veronika Kabatova) +- CI: Enable private pipelines for RT branches (Veronika Kabatova) +- CI: Remove ARK leftovers (Veronika Kabatova) +- redhat: add *-matched meta packages to rpminspect emptyrpm config (Herton R. Krzesinski) +- gfs2: Don't call dlm after protocol is unmounted (Bob Peterson) [1988451] +- gfs2: don't stop reads while withdraw in progress (Bob Peterson) [1988451] +- gfs2: Mark journal inodes as "don't cache" (Bob Peterson) [1988451] +- cgroup/cpuset: Avoid memory migration when nodemasks match (Waiman Long) [1980430] +- cgroup/cpuset: Enable memory migration for cpuset v2 (Waiman Long) [1980430] +- iscsi_ibft: Fix isa_bus_to_virt not working under ARM (Maurizio Lombardi) [1963801] +- x86/setup: Explicitly include acpi.h (Maurizio Lombardi) [1963801] +- iscsi_ibft: fix warning in reserve_ibft_region() (Maurizio Lombardi) [1963801] +- iscsi_ibft: fix crash due to KASLR physical memory remapping (Maurizio Lombardi) [1963801] +- redhat: fix chronological order in the changelog file (Herton R. Krzesinski) + +* Fri Sep 17 2021 Jan Stancek [5.14-1.2.1.el9] +- redhat/configs: Disable CONFIG_DRM_VMWGFX on aarch64 (Michel Dänzer) [1996993] +- redhat: set USE_DIST_IN_SOURCE=1 for 9.0-beta (Jan Stancek) +- redhat: add option to use DIST tag in sources (Jan Stancek) +- CI: Enable notification messages for RHEL9 (Veronika Kabatova) +- CI: Enable private pipelines for RT branches (Veronika Kabatova) +- CI: Remove ARK leftovers (Veronika Kabatova) +- redhat: add *-matched meta packages to rpminspect emptyrpm config (Herton R. Krzesinski) +- gfs2: Don't call dlm after protocol is unmounted (Bob Peterson) [1988451] +- gfs2: don't stop reads while withdraw in progress (Bob Peterson) [1988451] +- gfs2: Mark journal inodes as "don't cache" (Bob Peterson) [1988451] +- cgroup/cpuset: Avoid memory migration when nodemasks match (Waiman Long) [1980430] +- cgroup/cpuset: Enable memory migration for cpuset v2 (Waiman Long) [1980430] +- iscsi_ibft: Fix isa_bus_to_virt not working under ARM (Maurizio Lombardi) [1963801] +- x86/setup: Explicitly include acpi.h (Maurizio Lombardi) [1963801] +- iscsi_ibft: fix warning in reserve_ibft_region() (Maurizio Lombardi) [1963801] +- iscsi_ibft: fix crash due to KASLR physical memory remapping (Maurizio Lombardi) [1963801] + * Thu Sep 16 2021 Herton R. Krzesinski [5.14-3] - misc/pvpanic-pci: Allow automatic loading (Eric Auger) [1977192] - md/raid10: Remove unnecessary rcu_dereference in raid10_handle_discard (Nigel Croxon) [1965294] diff --git a/rpminspect.yaml b/rpminspect.yaml index e540fbd..f62742a 100644 --- a/rpminspect.yaml +++ b/rpminspect.yaml @@ -5,6 +5,9 @@ emptyrpm: expected_empty: - kernel - kernel-debug + - kernel-debug-devel-matched + - kernel-devel-matched - kernel-lpae - kernel-zfcpdump + - kernel-zfcpdump-devel-matched - kernel-zfcpdump-modules diff --git a/sources b/sources index a3336bd..4647972 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-5.14.0-3.tar.xz) = efe815bc8b9148b6f34f6e1708bc51dabe1e21249774623175f25b2e81419117457229d55fe83a128fcf7694ef4c5048ddfdf0fd9b362d6999964adb573c6e3d -SHA512 (kernel-abi-stablelists-5.14.0-3.tar.bz2) = 2115611f5ee01766d7ce005f661116ee809209c0ef1777a42811855207bee49fa7810037d086832837d848273933388ad937d32b79394bb1e82cd7ec3eb4b880 -SHA512 (kernel-kabi-dw-5.14.0-3.tar.bz2) = 484d7a6407ac31551a27d59b324df266149ff80ab1617da5e23b2263e8273c76bda76fa00eb0937126198ea91ab000cc8d81fad09a236e9ebf5a7e6c985379b6 +SHA512 (linux-5.14.0-4.el9.tar.xz) = 2bf87587f2b34b45810a302612aaef4cafabadf7ccfa7f72e6138478fad2ad592dd8e9b05aaddd243e69ffe1ca00647457e8821961ec6b3fc6d4ace4a6a8b9fe +SHA512 (kernel-abi-stablelists-5.14.0-4.tar.bz2) = 47b22d9da477485be1720e5f99c87591c9090995dbece8ceac662977e5369c098ae85097b8123649447dc85a0ed45d411f2f0f9b7c768792aa7efbcbf4fbb853 +SHA512 (kernel-kabi-dw-5.14.0-4.tar.bz2) = d0bbe8ad38fb6253c42a9ad575ba82894d903edfe3ddce1a941e99936ad7dd19e964270d27a499c0ba5fe07aedf334b30577ffd3a193c828cdf7b5c34eec684f