diff --git a/.kernel-auto.metadata b/.kernel-auto.metadata index 1c1180c..f9fbe64 100644 --- a/.kernel-auto.metadata +++ b/.kernel-auto.metadata @@ -1 +1 @@ -33e48492a0238b3f4e329cd4640dc17cadd65587 SOURCES/linux-5.14.0-30.1.el9.tar.xz +b313cf3e57ab00a2664c535911517818d9dda05e SOURCES/linux-5.14.0-31.2.el9.tar.xz diff --git a/SOURCES/Makefile.rhelver b/SOURCES/Makefile.rhelver index fcfee27..e0ddc34 100644 --- a/SOURCES/Makefile.rhelver +++ b/SOURCES/Makefile.rhelver @@ -12,14 +12,14 @@ RHEL_MINOR = 0 # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -RHEL_RELEASE = 30 +RHEL_RELEASE = 31 # # Automotive Release # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -AUTOMOTIVEBUILD:=.1 +AUTOMOTIVEBUILD:=.2 # # Early y+1 numbering @@ -51,4 +51,4 @@ ifneq ("$(ZSTREAM)", "yes") endif endif -RTBUILD:=.30 +RTBUILD:=.31 diff --git a/SOURCES/kernel-auto-aarch64-debug-rhel.config b/SOURCES/kernel-auto-aarch64-debug-rhel.config index 8956f9d..770d7be 100644 --- a/SOURCES/kernel-auto-aarch64-debug-rhel.config +++ b/SOURCES/kernel-auto-aarch64-debug-rhel.config @@ -1552,7 +1552,7 @@ CONFIG_DRM_VC4=m CONFIG_DRM_VIRTIO_GPU=m CONFIG_DRM_VKMS=m CONFIG_DRM_VMWGFX_FBCON=y -# CONFIG_DRM_VMWGFX is not set +CONFIG_DRM_VMWGFX=m # CONFIG_DRM_XEN_FRONTEND is not set # CONFIG_DRM_XEN is not set # CONFIG_DS1682 is not set @@ -2551,6 +2551,7 @@ CONFIG_INFINIBAND_SRPT=m CONFIG_INFINIBAND_USER_ACCESS=m CONFIG_INFINIBAND_USER_MAD=m CONFIG_INFINIBAND_USNIC=m +# CONFIG_INFINIBAND_VMWARE_PVRDMA is not set # CONFIG_INFTL is not set # CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set @@ -7293,7 +7294,7 @@ CONFIG_VMAP_STACK=y # CONFIG_VME_BUS is not set CONFIG_VM_EVENT_COUNTERS=y # CONFIG_VMLINUX_MAP is not set -# CONFIG_VMXNET3 is not set +CONFIG_VMXNET3=m CONFIG_VP_VDPA=m CONFIG_VSOCKETS_DIAG=m CONFIG_VSOCKETS_LOOPBACK=m diff --git a/SOURCES/kernel-auto-aarch64-rhel.config b/SOURCES/kernel-auto-aarch64-rhel.config index 915858d..302b3da 100644 --- a/SOURCES/kernel-auto-aarch64-rhel.config +++ b/SOURCES/kernel-auto-aarch64-rhel.config @@ -1544,7 +1544,7 @@ CONFIG_DRM_VC4=m CONFIG_DRM_VIRTIO_GPU=m CONFIG_DRM_VKMS=m CONFIG_DRM_VMWGFX_FBCON=y -# CONFIG_DRM_VMWGFX is not set +CONFIG_DRM_VMWGFX=m # CONFIG_DRM_XEN_FRONTEND is not set # CONFIG_DRM_XEN is not set # CONFIG_DS1682 is not set @@ -2535,6 +2535,7 @@ CONFIG_INFINIBAND_SRPT=m CONFIG_INFINIBAND_USER_ACCESS=m CONFIG_INFINIBAND_USER_MAD=m CONFIG_INFINIBAND_USNIC=m +# CONFIG_INFINIBAND_VMWARE_PVRDMA is not set # CONFIG_INFTL is not set # CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set # CONFIG_INIT_ON_FREE_DEFAULT_ON is not set @@ -7270,7 +7271,7 @@ CONFIG_VMAP_STACK=y # CONFIG_VME_BUS is not set CONFIG_VM_EVENT_COUNTERS=y # CONFIG_VMLINUX_MAP is not set -# CONFIG_VMXNET3 is not set +CONFIG_VMXNET3=m CONFIG_VP_VDPA=m CONFIG_VSOCKETS_DIAG=m CONFIG_VSOCKETS_LOOPBACK=m diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec index c7056ec..aeb88c6 100755 --- a/SPECS/kernel.spec +++ b/SPECS/kernel.spec @@ -85,7 +85,7 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 -%global distro_build 30 +%global distro_build 31 %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 30.1.el9 +%define pkgrelease 31.2.el9 # This is needed to do merge window version magic %define patchlevel 14 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 30.1%{?buildid}%{?dist} +%define specrelease 31.2%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -283,7 +283,7 @@ Summary: The Linux kernel %endif %if %{with_auto} -%global autobuild .1 +%global autobuild .2 %define with_doc 0 %define with_headers 0 %define with_cross_headers 0 @@ -597,6 +597,7 @@ BuildRequires: net-tools, hostname, bc, elfutils-devel BuildRequires: dwarves BuildRequires: python3-devel BuildRequires: gcc-plugin-devel +BuildRequires: kernel-rpm-macros >= 185-9 %ifnarch %{nobuildarches} noarch BuildRequires: bpftool %endif @@ -701,7 +702,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.14.0-30.1.el9.tar.xz +Source0: linux-5.14.0-31.2.el9.tar.xz Source1: Makefile.rhelver @@ -1429,8 +1430,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.14.0-30.1.el9 -c -mv linux-5.14.0-30.1.el9 linux-%{KVERREL} +%setup -q -n kernel-5.14.0-31.2.el9 -c +mv linux-5.14.0-31.2.el9 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -3077,6 +3078,40 @@ fi # # %changelog +* Wed Dec 15 2021 Julio Faracco [5.14.0-31.2.el9] +- Disable CONFIG_DEBUG_PREEMPT to restore performance (Phil Auld) [2030877] +- tcp: seq_file: Avoid skipping sk during tcp_seek_last_pos (Paolo Abeni) [2028279] +- tcp: fix tp->undo_retrans accounting in tcp_sacktag_one() (Paolo Abeni) [2028279] +- tcp: md5: Fix overlap between vrf and non-vrf keys (Paolo Abeni) [2028279] +- tcp: don't free a FIN sk_buff in tcp_remove_empty_skb() (Paolo Abeni) [2028279] +- tcp: Fix uninitialized access in skb frags array for Rx 0cp. (Paolo Abeni) [2028279] +- tcp_cubic: fix spurious Hystart ACK train detections for not-cwnd-limited flows (Paolo Abeni) [2028279] +- Revert "ibmvnic: check failover_pending in login response" (Steve Best) [2010612] +- ibmvnic: check failover_pending in login response (Steve Best) [2010612] +- ibmvnic: check failover_pending in login response (Steve Best) [2010612] +- kernfs: don't create a negative dentry if inactive node exists (Ian Kent) [2004858] +- kernfs: also call kernfs_set_rev() for positive dentry (Ian Kent) [2004858] +- kernfs: dont call d_splice_alias() under kernfs node lock (Ian Kent) [2004858] +- kernfs: use i_lock to protect concurrent inode updates (Ian Kent) [2004858] +- kernfs: switch kernfs to use an rwsem (Ian Kent) [2004858] +- kernfs: use VFS negative dentry caching (Ian Kent) [2004858] +- kernfs: add a revision to identify directory node changes (Ian Kent) [2004858] +- drm/hyperv: Fix double mouse pointers (Vitaly Kuznetsov) [1999697] +- Revert "watchdog: iTCO_wdt: Account for rebooting on second timeout" (Frantisek Sumsal) [2020918] +- watchdog: iTCO_wdt: Fix detection of SMI-off case (Frantisek Sumsal) [2020918] +- redhat/kernel.spec.template: enable dependencies generation (Eugene Syromiatnikov) [1975927] +- redhat: configs: Update configs for vmware (Kamal Heib) [1991676 2009344] +- redhat/configs: Enable CONFIG_DRM_VMWGFX on aarch64 (Michel Dänzer) [1992253] +- mm/memcg: Remove MEMCG config dependency on PREEMPT_RT (Leah Leshchinsky) [2001776] +- mm/memcg: get_obj_stock can be called from hard interrupt context (Leah Leshchinsky) [2001776] +- mm: memcontrol: use the local_lock on all accesses to per-CPU memcg_stock (Leah Leshchinsky) [2001776] +- memcontrol: Add an argument to refill_stock() to indicate locking (Leah Leshchinsky) [2001776] +- mm/memcontrol: Replace local_irq_disable with local locks (Leah Leshchinsky) [2001776] +- mm/memcontrol: Don't call schedule_work_on in preemption disabled context (Leah Leshchinsky) [2001776] +- mm: memcontrol: Provide a local_lock for per-CPU memcg_stock (Leah Leshchinsky) [2001776] +- mm/memcontrol: Disable preemption in __mod_memcg_lruvec_state() (Leah Leshchinsky) [2001776] +- redhat: Update Makefile.auto with latest revision (Scott Weaver) + * Tue Dec 14 2021 Scott Weaver [5.14.0-30.1””.el9] - selftests: KVM: avoid failures due to reserved HyperTransport region (Vitaly Kuznetsov) [2009338] - KVM: X86: Fix when shadow_root_level=5 && guest root_level<4 (Vitaly Kuznetsov) [2009338]