diff --git a/Makefile.rhelver b/Makefile.rhelver index ff93cb371..be9bc6935 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 = 23 +RHEL_RELEASE = 24 # # Early y+1 numbering diff --git a/filter-modules.sh.rhel b/filter-modules.sh.rhel index c4a8e594e..80071614c 100755 --- a/filter-modules.sh.rhel +++ b/filter-modules.sh.rhel @@ -31,7 +31,7 @@ scsidrvs="aacraid aic7xxx aic94xx be2iscsi bfa bnx2i bnx2fc csiostor cxgbi esas2 usbdrvs="atm image misc serial wusbcore" -fsdrvs="affs befs coda cramfs ecryptfs hfs hfsplus jfs minix ncpfs nilfs2 ocfs2 reiserfs romfs squashfs sysv ubifs ufs" +fsdrvs="affs befs cifs coda cramfs ecryptfs hfs hfsplus jfs minix ncpfs nilfs2 ocfs2 reiserfs romfs squashfs sysv ubifs ufs" netprots="6lowpan appletalk atm ax25 batman-adv bluetooth can dccp dsa ieee802154 irda l2tp mac80211 mac802154 mpls netrom nfc rds rfkill rose sctp smc wireless" diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index dbdff204b..6a28b2e4a 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -801,7 +801,7 @@ CONFIG_CIFS_DFS_UPCALL=y CONFIG_CIFS=m CONFIG_CIFS_POSIX=y # CONFIG_CIFS_SMB311 is not set -# CONFIG_CIFS_SMB_DIRECT is not set +CONFIG_CIFS_SMB_DIRECT=y # CONFIG_CIFS_STATS2 is not set CONFIG_CIFS_STATS=y # CONFIG_CIFS_SWN_UPCALL is not set diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index 23fa2792c..718f8fe84 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -801,7 +801,7 @@ CONFIG_CIFS_DFS_UPCALL=y CONFIG_CIFS=m CONFIG_CIFS_POSIX=y # CONFIG_CIFS_SMB311 is not set -# CONFIG_CIFS_SMB_DIRECT is not set +CONFIG_CIFS_SMB_DIRECT=y # CONFIG_CIFS_STATS2 is not set CONFIG_CIFS_STATS=y # CONFIG_CIFS_SWN_UPCALL is not set diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index 62b1d2467..fe8110ff3 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -674,7 +674,7 @@ CONFIG_CIFS_DFS_UPCALL=y CONFIG_CIFS=m CONFIG_CIFS_POSIX=y # CONFIG_CIFS_SMB311 is not set -# CONFIG_CIFS_SMB_DIRECT is not set +CONFIG_CIFS_SMB_DIRECT=y # CONFIG_CIFS_STATS2 is not set CONFIG_CIFS_STATS=y # CONFIG_CIFS_SWN_UPCALL is not set diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index 5dea0145d..18fd27940 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -674,7 +674,7 @@ CONFIG_CIFS_DFS_UPCALL=y CONFIG_CIFS=m CONFIG_CIFS_POSIX=y # CONFIG_CIFS_SMB311 is not set -# CONFIG_CIFS_SMB_DIRECT is not set +CONFIG_CIFS_SMB_DIRECT=y # CONFIG_CIFS_STATS2 is not set CONFIG_CIFS_STATS=y # CONFIG_CIFS_SWN_UPCALL is not set diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index 1dca85ed3..300dcad16 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -678,7 +678,7 @@ CONFIG_CIFS_DFS_UPCALL=y CONFIG_CIFS=m CONFIG_CIFS_POSIX=y # CONFIG_CIFS_SMB311 is not set -# CONFIG_CIFS_SMB_DIRECT is not set +CONFIG_CIFS_SMB_DIRECT=y # CONFIG_CIFS_STATS2 is not set CONFIG_CIFS_STATS=y # CONFIG_CIFS_SWN_UPCALL is not set diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 2db9b69d7..9dd6f361e 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -678,7 +678,7 @@ CONFIG_CIFS_DFS_UPCALL=y CONFIG_CIFS=m CONFIG_CIFS_POSIX=y # CONFIG_CIFS_SMB311 is not set -# CONFIG_CIFS_SMB_DIRECT is not set +CONFIG_CIFS_SMB_DIRECT=y # CONFIG_CIFS_STATS2 is not set CONFIG_CIFS_STATS=y # CONFIG_CIFS_SWN_UPCALL is not set diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 9b5a5edda..b5cbfd6b4 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -683,7 +683,7 @@ CONFIG_CIFS_DFS_UPCALL=y CONFIG_CIFS=m CONFIG_CIFS_POSIX=y # CONFIG_CIFS_SMB311 is not set -# CONFIG_CIFS_SMB_DIRECT is not set +CONFIG_CIFS_SMB_DIRECT=y # CONFIG_CIFS_STATS2 is not set CONFIG_CIFS_STATS=y # CONFIG_CIFS_SWN_UPCALL is not set diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 0ea00ea12..10d0e267f 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -701,7 +701,7 @@ CONFIG_CIFS_DFS_UPCALL=y CONFIG_CIFS=m CONFIG_CIFS_POSIX=y # CONFIG_CIFS_SMB311 is not set -# CONFIG_CIFS_SMB_DIRECT is not set +CONFIG_CIFS_SMB_DIRECT=y # CONFIG_CIFS_STATS2 is not set CONFIG_CIFS_STATS=y # CONFIG_CIFS_SWN_UPCALL is not set diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index a4981bf59..139a01ea5 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -701,7 +701,7 @@ CONFIG_CIFS_DFS_UPCALL=y CONFIG_CIFS=m CONFIG_CIFS_POSIX=y # CONFIG_CIFS_SMB311 is not set -# CONFIG_CIFS_SMB_DIRECT is not set +CONFIG_CIFS_SMB_DIRECT=y # CONFIG_CIFS_STATS2 is not set CONFIG_CIFS_STATS=y # CONFIG_CIFS_SWN_UPCALL is not set diff --git a/kernel.spec b/kernel.spec index a66520167..c9611fa17 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 23 +%global distro_build 24 %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 23.el9 +%define pkgrelease 24.el9 # This is needed to do merge window version magic %define patchlevel 14 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 23%{?buildid}%{?dist} +%define specrelease 24%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -676,7 +676,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.14.0-23.el9.tar.xz +Source0: linux-5.14.0-24.el9.tar.xz Source1: Makefile.rhelver @@ -1361,8 +1361,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.14.0-23.el9 -c -mv linux-5.14.0-23.el9 linux-%{KVERREL} +%setup -q -n kernel-5.14.0-24.el9 -c +mv linux-5.14.0-24.el9 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -2163,7 +2163,7 @@ InitBuildVars %global perf_build_extra_opts CORESIGHT=1 %endif %global perf_make \ - %{__make} %{?make_opts} EXTRA_CFLAGS="${RPM_OPT_FLAGS}" LDFLAGS="%{__global_ldflags}" %{?cross_opts} -C tools/perf V=1 NO_PERF_READ_VDSO32=1 NO_PERF_READ_VDSOX32=1 WERROR=0 NO_LIBUNWIND=1 HAVE_CPLUS_DEMANGLE=1 NO_GTK2=1 NO_STRLCPY=1 NO_BIONIC=1 LIBBPF_DYNAMIC=1 LIBTRACEEVENT_DYNAMIC=1 %{?perf_build_extra_opts} prefix=%{_prefix} PYTHON=%{__python3} + %{__make} %{?make_opts} EXTRA_CFLAGS="${RPM_OPT_FLAGS}" LDFLAGS="%{__global_ldflags} -Wl,-E" %{?cross_opts} -C tools/perf V=1 NO_PERF_READ_VDSO32=1 NO_PERF_READ_VDSOX32=1 WERROR=0 NO_LIBUNWIND=1 HAVE_CPLUS_DEMANGLE=1 NO_GTK2=1 NO_STRLCPY=1 NO_BIONIC=1 LIBBPF_DYNAMIC=1 LIBTRACEEVENT_DYNAMIC=1 %{?perf_build_extra_opts} prefix=%{_prefix} PYTHON=%{__python3} %if %{with_perf} # perf # make sure check-headers.sh is executable @@ -2951,6 +2951,48 @@ fi # # %changelog +* Wed Dec 01 2021 Herton R. Krzesinski [5.14.0-24.el9] +- perf test: Handle fd gaps in test__dso_data_reopen (Michael Petlan) [1937209] +- perf tests vmlinux-kallsyms: Ignore hidden symbols (Michael Petlan) [1975103] +- perf script: Fix PERF_SAMPLE_WEIGHT_STRUCT support (Michael Petlan) [2009378] +- redhat/kernel.spec.template: Link perf with --export-dynamic (Michael Petlan) [2006775] +- xfs: fix I_DONTCACHE (Carlos Maiolino) [2022435] +- virtio: write back F_VERSION_1 before validate (Thomas Huth) [2008401] +- net/tls: Fix flipped sign in tls_err_abort() calls (Sabrina Dubroca) [2022006] +- net/tls: Fix flipped sign in async_wait.err assignment (Sabrina Dubroca) [2022006] +- hyper-v: Replace uuid.h with types.h (Mohammed Gamal) [2008572] +- Drivers: hv: vmbus: Remove unused code to check for subchannels (Mohammed Gamal) [2008572] +- hv: hyperv.h: Remove unused inline functions (Mohammed Gamal) [2008572] +- asm-generic/hyperv: provide cpumask_to_vpset_noself (Mohammed Gamal) [2008572] +- asm-generic/hyperv: Add missing #include of nmi.h (Mohammed Gamal) [2008572] +- x86/hyperv: Avoid erroneously sending IPI to 'self' (Mohammed Gamal) [2008572] +- x86/hyperv: remove on-stack cpumask from hv_send_ipi_mask_allbutself (Mohammed Gamal) [2008572] +- [s390] net/smc: improved fix wait on already cleared link (Mete Durlu) [1869652] +- [s390] net/smc: fix 'workqueue leaked lock' in smc_conn_abort_work (Mete Durlu) [1869652] +- [s390] net/smc: add missing error check in smc_clc_prfx_set() (Mete Durlu) [1869652] +- cifs: enable SMB_DIRECT in RHEL9 (Ronnie Sahlberg) [1965209] +- scsi: mpt3sas: Clean up some inconsistent indenting (Tomas Henzl) [1876119] +- scsi: mpt3sas: Call cpu_relax() before calling udelay() (Tomas Henzl) [1876119] +- scsi: mpt3sas: Introduce sas_ncq_prio_supported sysfs sttribute (Tomas Henzl) [1876119] +- scsi: mpt3sas: Update driver version to 39.100.00.00 (Tomas Henzl) [1876119] +- scsi: mpt3sas: Use firmware recommended queue depth (Tomas Henzl) [1876119] +- scsi: mpt3sas: Bump driver version to 38.100.00.00 (Tomas Henzl) [1876119] +- scsi: mpt3sas: Add io_uring iopoll support (Tomas Henzl) [1876119] +- serial: 8250_lpss: Extract dw8250_do_set_termios() for common use (David Arcari) [1880032] +- serial: 8250_lpss: Enable DMA on Intel Elkhart Lake (David Arcari) [1880032] +- dmaengine: dw: Convert members to u32 in platform data (David Arcari) [1880032] +- dmaengine: dw: Simplify DT property parser (David Arcari) [1880032] +- dmaengine: dw: Remove error message from DT parsing code (David Arcari) [1880032] +- dmaengine: dw: Program xBAR hardware for Elkhart Lake (David Arcari) [1880032] +- vmxnet3: switch from 'pci_' to 'dma_' API (Kamal Heib) [2003297] +- vmxnet3: update to version 6 (Kamal Heib) [2003297] +- vmxnet3: increase maximum configurable mtu to 9190 (Kamal Heib) [2003297] +- vmxnet3: set correct hash type based on rss information (Kamal Heib) [2003297] +- vmxnet3: add support for ESP IPv6 RSS (Kamal Heib) [2003297] +- vmxnet3: remove power of 2 limitation on the queues (Kamal Heib) [2003297] +- vmxnet3: add support for 32 Tx/Rx queues (Kamal Heib) [2003297] +- vmxnet3: prepare for version 6 changes (Kamal Heib) [2003297] + * Mon Nov 29 2021 Herton R. Krzesinski [5.14.0-23.el9] - PCI/VPD: Defer VPD sizing until first access (Myron Stowe) [2021298] - PCI/VPD: Use unaligned access helpers (Myron Stowe) [2021298] diff --git a/sources b/sources index 4f61bf3cd..cb3f61db2 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-5.14.0-23.el9.tar.xz) = 0bd81c4f6202dc9a27e14007a0ed71c627a2c004e237fee2d95382a622b5dac51cc21fa604a24d719ae15d5b35c4ddf362e806757cf880e84267d9508bd6fd75 -SHA512 (kernel-abi-stablelists-5.14.0-23.tar.bz2) = 0cc4ea5cffdef046a280a98f2f6f480230d02fd7587f4142524d37fcdb17f6ab2543966666f313cdf247d507b6dcc032a218dcbfe581a4d42f0801e9690f6072 -SHA512 (kernel-kabi-dw-5.14.0-23.tar.bz2) = c696ee206fd56aeae27b97cedc1048a921b725c6fa4383b3d8e7eac4e6785b71db7ee71b8df5e5d29a3c729877600cdacdf793166e71e96ea73445ac78e47d25 +SHA512 (linux-5.14.0-24.el9.tar.xz) = 854549cd0cdf72d7918f197305b14dbc9eaebd803023b23b7d9ee12f330c96030145364ef97b45fe71f3c601397563b2044ae52a497de37f9eb45e4fcd7fbe49 +SHA512 (kernel-abi-stablelists-5.14.0-24.tar.bz2) = 68e1b38b7fcebd1033a137a60ee07d8d1fc25af2e0bab60f802d2ba4df2015537965eee28fae8cf2b02132f4be45399decfd47ef5fd19992ccd22281a503e1f9 +SHA512 (kernel-kabi-dw-5.14.0-24.tar.bz2) = 8b45bf6847e36cd8ae40b2e42f0d8e1e73206f44089db9009959377260ebceacce124f51d5a36d450b06be61f17b6e86e8598c684fd01ae6edd0497252d05308