diff --git a/Makefile.rhelver b/Makefile.rhelver index 642bbdc..3e877d9 100644 --- a/Makefile.rhelver +++ b/Makefile.rhelver @@ -12,7 +12,7 @@ RHEL_MINOR = 2 # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -RHEL_RELEASE = 271 +RHEL_RELEASE = 272 # # ZSTREAM @@ -66,4 +66,4 @@ ifneq ("$(ZSTREAM)", "yes") endif endif -RTBUILD:=.271 +RTBUILD:=.272 diff --git a/kernel-rt-aarch64-64k-debug-rhel.config b/kernel-rt-aarch64-64k-debug-rhel.config index ec83adb..0389d24 100644 --- a/kernel-rt-aarch64-64k-debug-rhel.config +++ b/kernel-rt-aarch64-64k-debug-rhel.config @@ -144,8 +144,14 @@ CONFIG_ACPI=y # CONFIG_AFE4404 is not set # CONFIG_AFFS_FS is not set # CONFIG_AF_KCM is not set -# CONFIG_AF_RXRPC is not set -# CONFIG_AFS_FS is not set +CONFIG_AF_RXRPC_DEBUG=y +# CONFIG_AF_RXRPC_INJECT_LOSS is not set +CONFIG_AF_RXRPC_IPV6=y +CONFIG_AF_RXRPC=m +# CONFIG_AFS_DEBUG_CURSOR is not set +CONFIG_AFS_DEBUG=y +CONFIG_AFS_FSCACHE=y +CONFIG_AFS_FS=m # CONFIG_AGP is not set # CONFIG_AHCI_CEVA is not set # CONFIG_AHCI_IMX is not set @@ -4782,6 +4788,7 @@ CONFIG_RV_REACTORS=y CONFIG_RV_REACT_PANIC=y CONFIG_RV_REACT_PRINTK=y CONFIG_RV=y +CONFIG_RXKAD=y # CONFIG_SAMPLES is not set # CONFIG_SATA_ACARD_AHCI is not set CONFIG_SATA_AHCI_PLATFORM=m @@ -6777,6 +6784,7 @@ CONFIG_WATCH_QUEUE=y # CONFIG_WCN36XX is not set # CONFIG_WDAT_WDT is not set # CONFIG_WDTPCI is not set +# CONFIG_WERROR is not set # CONFIG_WIL6210 is not set # CONFIG_WILC1000_SDIO is not set # CONFIG_WILC1000_SPI is not set diff --git a/kernel-rt-aarch64-64k-rhel.config b/kernel-rt-aarch64-64k-rhel.config index 8da525c..23d5aa3 100644 --- a/kernel-rt-aarch64-64k-rhel.config +++ b/kernel-rt-aarch64-64k-rhel.config @@ -144,8 +144,14 @@ CONFIG_ACPI=y # CONFIG_AFE4404 is not set # CONFIG_AFFS_FS is not set # CONFIG_AF_KCM is not set -# CONFIG_AF_RXRPC is not set -# CONFIG_AFS_FS is not set +CONFIG_AF_RXRPC_DEBUG=y +# CONFIG_AF_RXRPC_INJECT_LOSS is not set +CONFIG_AF_RXRPC_IPV6=y +CONFIG_AF_RXRPC=m +# CONFIG_AFS_DEBUG_CURSOR is not set +CONFIG_AFS_DEBUG=y +CONFIG_AFS_FSCACHE=y +CONFIG_AFS_FS=m # CONFIG_AGP is not set # CONFIG_AHCI_CEVA is not set # CONFIG_AHCI_IMX is not set @@ -4759,6 +4765,7 @@ CONFIG_RV_REACTORS=y CONFIG_RV_REACT_PANIC=y CONFIG_RV_REACT_PRINTK=y CONFIG_RV=y +CONFIG_RXKAD=y # CONFIG_SAMPLES is not set # CONFIG_SATA_ACARD_AHCI is not set CONFIG_SATA_AHCI_PLATFORM=m @@ -6752,6 +6759,7 @@ CONFIG_WATCH_QUEUE=y # CONFIG_WCN36XX is not set # CONFIG_WDAT_WDT is not set # CONFIG_WDTPCI is not set +# CONFIG_WERROR is not set # CONFIG_WIL6210 is not set # CONFIG_WILC1000_SDIO is not set # CONFIG_WILC1000_SPI is not set diff --git a/kernel-rt-x86_64-debug-rhel.config b/kernel-rt-x86_64-debug-rhel.config index caf79f2..8266c2a 100644 --- a/kernel-rt-x86_64-debug-rhel.config +++ b/kernel-rt-x86_64-debug-rhel.config @@ -157,8 +157,14 @@ CONFIG_ADVISE_SYSCALLS=y # CONFIG_AFE4404 is not set # CONFIG_AFFS_FS is not set # CONFIG_AF_KCM is not set -# CONFIG_AF_RXRPC is not set -# CONFIG_AFS_FS is not set +CONFIG_AF_RXRPC_DEBUG=y +# CONFIG_AF_RXRPC_INJECT_LOSS is not set +CONFIG_AF_RXRPC_IPV6=y +CONFIG_AF_RXRPC=m +# CONFIG_AFS_DEBUG_CURSOR is not set +CONFIG_AFS_DEBUG=y +CONFIG_AFS_FSCACHE=y +CONFIG_AFS_FS=m # CONFIG_AGP is not set CONFIG_AIO=y # CONFIG_AIX_PARTITION is not set @@ -4636,6 +4642,7 @@ CONFIG_RV_REACTORS=y CONFIG_RV_REACT_PANIC=y CONFIG_RV_REACT_PRINTK=y CONFIG_RV=y +CONFIG_RXKAD=y # CONFIG_SAMPLE_ANDROID_BINDERFS is not set # CONFIG_SAMPLE_AUXDISPLAY is not set # CONFIG_SAMPLE_CONFIGFS is not set @@ -6688,6 +6695,7 @@ CONFIG_WATCH_QUEUE=y # CONFIG_WCN36XX is not set CONFIG_WDAT_WDT=m # CONFIG_WDTPCI is not set +# CONFIG_WERROR is not set # CONFIG_WIL6210 is not set # CONFIG_WILC1000_SDIO is not set # CONFIG_WILC1000_SPI is not set diff --git a/kernel-rt-x86_64-rhel.config b/kernel-rt-x86_64-rhel.config index 1b94742..203f0c1 100644 --- a/kernel-rt-x86_64-rhel.config +++ b/kernel-rt-x86_64-rhel.config @@ -157,8 +157,14 @@ CONFIG_ADVISE_SYSCALLS=y # CONFIG_AFE4404 is not set # CONFIG_AFFS_FS is not set # CONFIG_AF_KCM is not set -# CONFIG_AF_RXRPC is not set -# CONFIG_AFS_FS is not set +CONFIG_AF_RXRPC_DEBUG=y +# CONFIG_AF_RXRPC_INJECT_LOSS is not set +CONFIG_AF_RXRPC_IPV6=y +CONFIG_AF_RXRPC=m +# CONFIG_AFS_DEBUG_CURSOR is not set +CONFIG_AFS_DEBUG=y +CONFIG_AFS_FSCACHE=y +CONFIG_AFS_FS=m # CONFIG_AGP is not set CONFIG_AIO=y # CONFIG_AIX_PARTITION is not set @@ -4615,6 +4621,7 @@ CONFIG_RV_REACTORS=y CONFIG_RV_REACT_PANIC=y CONFIG_RV_REACT_PRINTK=y CONFIG_RV=y +CONFIG_RXKAD=y # CONFIG_SAMPLE_ANDROID_BINDERFS is not set # CONFIG_SAMPLE_AUXDISPLAY is not set # CONFIG_SAMPLE_CONFIGFS is not set @@ -6665,6 +6672,7 @@ CONFIG_WATCH_QUEUE=y # CONFIG_WCN36XX is not set CONFIG_WDAT_WDT=m # CONFIG_WDTPCI is not set +# CONFIG_WERROR is not set # CONFIG_WIL6210 is not set # CONFIG_WILC1000_SDIO is not set # CONFIG_WILC1000_SPI is not set diff --git a/kernel.spec b/kernel.spec index fd98f0e..990b774 100755 --- a/kernel.spec +++ b/kernel.spec @@ -135,15 +135,15 @@ Summary: The Linux kernel # define buildid .local %define specversion 5.14.0 %define patchversion 5.14 -%define pkgrelease 271.rt14.271 +%define pkgrelease 272.rt14.272 %define kversion 5 -%define tarfile_release 5.14.0-271.rt14.271.el9 +%define tarfile_release 5.14.0-272.rt14.272.el9 # This is needed to do merge window version magic %define patchlevel 14 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 271.rt14.271%{?buildid}%{?dist} +%define specrelease 272.rt14.272%{?buildid}%{?dist} # This defines the kabi tarball version -%define kabiversion 5.14.0-271.rt14.271.el9 +%define kabiversion 5.14.0-272.rt14.272.el9 # # End of genspec.sh variables @@ -869,6 +869,7 @@ Source81: process_configs.sh Source82: update_scripts.sh Source84: mod-internal.list +Source85: mod-partner.list Source100: rheldup3.x509 Source101: rhelkpatch1.x509 @@ -1424,6 +1425,9 @@ Requires: %{name}-%{?1:%{1}-}-modules-core-uname-r = %{KVERREL}%{uname_variant % %{expand:%%kernel_modules_extra_package %{?1:%{1}} %{!?{-n}:%{1}}%{?{-n}:%{-n*}} %{-m:%{-m}}}\ %if %{-m:0}%{!-m:1}\ %{expand:%%kernel_modules_internal_package %{?1:%{1}} %{!?{-n}:%{1}}%{?{-n}:%{-n*}}}\ +%if 0%{!?fedora:1}\ +%{expand:%%kernel_modules_partner_package %{?1:%{1}} %{!?{-n}:%{1}}%{?{-n}:%{-n*}}}\ +%endif\ %{expand:%%kernel_debuginfo_package %{?1:%{1}}}\ %endif\ %if %{with_realtime} \ @@ -1438,6 +1442,27 @@ Requires: %{name}%{?1:-%{1}}-modules-core-uname-r = %{KVERREL}%{uname_suffix %{? %endif\ %{nil} +# +# This macro creates a kernel--modules-partner package. +# %%kernel_modules_partner_package +# +%define kernel_modules_partner_package() \ +%package %{?1:%{1}-}modules-partner\ +Summary: Extra kernel modules to match the %{?2:%{2} }kernel\ +Group: System Environment/Kernel\ +Provides: kernel%{?1:-%{1}}-modules-partner-%{_target_cpu} = %{version}-%{release}\ +Provides: kernel%{?1:-%{1}}-modules-partner-%{_target_cpu} = %{version}-%{release}%{uname_suffix %{?1:%{1}}}\ +Provides: kernel%{?1:-%{1}}-modules-partner = %{version}-%{release}%{uname_suffix %{?1:%{1}}}\ +Provides: installonlypkg(kernel-module)\ +Provides: kernel%{?1:-%{1}}-modules-partner-uname-r = %{KVERREL}%{uname_suffix %{?1:%{1}}}\ +Requires: kernel-uname-r = %{KVERREL}%{uname_suffix %{?1:%{1}}}\ +Requires: kernel%{?1:-%{1}}-modules-uname-r = %{KVERREL}%{uname_suffix %{?1:%{1}}}\ +AutoReq: no\ +AutoProv: yes\ +%description %{?1:%{1}-}modules-partner\ +This package provides kernel modules for the %{?2:%{2} }kernel package for Red Hat partners usage.\ +%{nil} + # Now, each variant package. %if %{with_pae} @@ -2245,6 +2270,10 @@ BuildKernel() { # Identify modules in the kernel-rt-kvm package %{SOURCE20} $RPM_BUILD_ROOT lib/modules/$KernelVer %{SOURCE400} kvm %endif +%if 0%{!?fedora:1} + # Identify modules in the kernel-modules-partner package + %{SOURCE20} $RPM_BUILD_ROOT lib/modules/$KernelVer %{SOURCE85} partner +%endif # # Generate the kernel-core and kernel-modules files lists @@ -2266,6 +2295,10 @@ BuildKernel() { # don't include anything going into kernel-rt-kvm in the file lists xargs rm -rf < mod-kvm.list %endif +%if 0%{!?fedora:1} + # don't include anything going int kernel-modules-partner in the file lists + xargs rm -rf < mod-partner.list +%endif if [ $DoModules -eq 1 ]; then # Find all the module files and filter them out into the core and @@ -2360,6 +2393,9 @@ BuildKernel() { %if %{with_realtime} sed -e 's/^lib*/\/lib/' %{?zipsed} $RPM_BUILD_ROOT/mod-kvm.list >> ../%{name}${Variant:+-${Variant}}-kvm.list %endif +%if 0%{!?fedora:1} + sed -e 's/^lib*/\/lib/' %{?zipsed} $RPM_BUILD_ROOT/mod-partner.list >> ../%{name}${Variant:+-${Variant}}-modules-partner.list +%endif # Cleanup rm -f $RPM_BUILD_ROOT/k-d.list @@ -2370,6 +2406,9 @@ BuildKernel() { %if %{with_realtime} rm -f $RPM_BUILD_ROOT/mod-kvm.list %endif +%if 0%{!?fedora:1} + rm -f $RPM_BUILD_ROOT/mod-partner.list +%endif %if %{with_cross} make -C $RPM_BUILD_ROOT/lib/modules/$KernelVer/build M=scripts clean @@ -3028,6 +3067,19 @@ fi\ %{nil} %endif +# +# This macro defines a %%post script for a kernel*-modules-partner package. +# It also defines a %%postun script that does the same thing. +# %%kernel_modules_partner_post [] +# +%define kernel_modules_partner_post() \ +%{expand:%%post %{?1:%{1}-}modules-partner}\ +/sbin/depmod -a %{KVERREL}%{?1:+%{1}}\ +%{nil}\ +%{expand:%%postun %{?1:%{1}-}modules-partner}\ +/sbin/depmod -a %{KVERREL}%{?1:+%{1}}\ +%{nil} + # # This macro defines a %%post script for a kernel*-modules package. # It also defines a %%postun script that does the same thing. @@ -3100,6 +3152,9 @@ fi\ %{expand:%%kernel_modules_core_post %{?-v*}}\ %{expand:%%kernel_modules_extra_post %{?-v*}}\ %{expand:%%kernel_modules_internal_post %{?-v*}}\ +%if 0%{!?fedora:1}\ +%{expand:%%kernel_modules_partner_post %{?-v*}}\ +%endif\ %{expand:%%kernel_variant_posttrans %{?-v*}}\ %{expand:%%post %{?-v*:%{-v*}-}core}\ %{-r:\ @@ -3408,6 +3463,9 @@ fi %if %{with_realtime}\ %{expand:%%files -f %{name}-%{?3:%{3}-}kvm.list %{?3:%{3}-}kvm}\ %endif\ +%if 0%{!?fedora:1}\ +%{expand:%%files -f %{name}-%{?3:%{3}-}modules-partner.list %{?3:%{3}-}modules-partner}\ +%endif\ %if %{with_debuginfo}\ %ifnarch noarch\ %{expand:%%files -f debuginfo%{?3}.list %{?3:%{3}-}debuginfo}\ @@ -3470,6 +3528,57 @@ fi # # %changelog +* Thu Feb 16 2023 Luis Claudio R. Goncalves [5.14.0-272.rt14.272.el9] +- [rt] build kernel-rt-5.14.0-272.rt14.272.el9 [2125474] +- Split partner modules into a sub-package (Alice Mitchell) [2039020] +- Enable kAFS and it's dependancies in RHEL (Alice Mitchell) [2039020] +- netfilter: ipset: Fix overflow before widen in the bitmap_ip_create() function. (Florian Westphal) [2161695] +- netfilter: ipset: fix hash:net,port,net hang with /0 subnet (Florian Westphal) [2161695] +- ipvs: use u64_stats_t for the per-cpu counters (Florian Westphal) [2161695] +- netfilter: flowtable: really fix NAT IPv6 offload (Florian Westphal) [2161695] +- netfilter: conntrack: fix using __this_cpu_add in preemptible (Florian Westphal) [2161695] +- netfilter: flowtable_offload: fix using __this_cpu_add in preemptible (Florian Westphal) [2161695] +- netfilter: nft_set_pipapo: Actually validate intervals in fields after the first one (Florian Westphal) [2161695] +- netfilter: flowtable_offload: add missing locking (Florian Westphal) [2161695] +- netfilter: ipset: restore allowing 64 clashing elements in hash:net,iface (Florian Westphal) [2161695] +- netfilter: ipset: regression in ip_set_hash_ip.c (Florian Westphal) [2161695] +- netfilter: Cleanup nft_net->module_list from nf_tables_exit_net() (Florian Westphal) [2161695] +- netfilter: nfnetlink: fix potential dead lock in nfnetlink_rcv_msg() (Florian Westphal) [2161695] +- netfilter: nf_tables: nft_parse_register can return a negative value (Florian Westphal) [2161695] +- intel_th: msu: Use memset_startat() for clearing hw header (Eric Chanudet) [2159468] +- redhat/configs: leave -Werror off for now (Eric Chanudet) [2159468] +- gcc-12: disable '-Warray-bounds' universally for now (Eric Chanudet) [2159468] +- kbuild: Fix -Wimplicit-fallthrough=5 error for GCC 5.x and 6.x (Eric Chanudet) [2159468] +- s390: disable -Warray-bounds (Eric Chanudet) [2159468] +- gcc-12: disable '-Wdangling-pointer' warning for now (Eric Chanudet) [2159468] +- Makefile: fix 2 typos (Eric Chanudet) [2159468] +- Makefile: Enable -Wzero-length-bounds (Eric Chanudet) [2159468] +- Makefile: Enable -Warray-bounds (Eric Chanudet) [2159468] +- sparc: Unbreak the build (Eric Chanudet) [2159468] +- Makefile: Enable -Wcast-function-type (Eric Chanudet) [2159468] +- kconfig: Add support for -Wimplicit-fallthrough (Eric Chanudet) [2159468] +- Makefile: use -Wno-main in the full kernel tree (Eric Chanudet) [2159468] +- s390: remove WARN_DYNAMIC_STACK (Eric Chanudet) [2159468] +- Enable '-Werror' by default for all kernel builds (Eric Chanudet) [2159468] +- kbuild: Shuffle blank line to improve comment meaning (Eric Chanudet) [2159468] +- x86/boot: Wrap literal addresses in absolute_pointer() (Eric Chanudet) [2159468] +- scsi: lpfc: Use struct_group() to initialize struct lpfc_cgn_info (Eric Chanudet) [2159468] +- bnx2x: Use struct_group() for memcpy() region (Eric Chanudet) [2159468] +- RDMA/cxgb4: fix accept failure due to increased cpl_t5_pass_accept_rpl size (Eric Chanudet) [2159468] +- iw_cxgb4: Use memset_startat() for cpl_t5_pass_accept_rpl (Eric Chanudet) [2159468] +- dm integrity: Use struct_group() to zero struct journal_sector (Eric Chanudet) [2159468] +- bnxt_en: Use struct_group_attr() for memcpy() region (Eric Chanudet) [2159468] +- ipv6: Use memset_after() to zero rt6_info (Eric Chanudet) [2159468] +- xfrm: Use memset_after() to clear padding (Eric Chanudet) [2159468] +- virtio-pci: Remove wrong address verification in vp_del_vqs() (Eric Chanudet) [2159468] +- ipv4: ip_output.c: Fix out-of-bounds warning in ip_copy_addrs() (Eric Chanudet) [2159468] +- skbuff: Switch structure bounds to struct_group() (Eric Chanudet) [2159468] +- tracing: Use memset_startat() to zero struct trace_iterator (Eric Chanudet) [2159468] +- kernel/sysctl.c: fixup printk sysctl constants (Eric Chanudet) [2159468] +- crypto: dh - constify struct dh's pointer members (Eric Chanudet) [2159468] +- cert host tools: Stop complaining about deprecated OpenSSL functions (Eric Chanudet) [2159468] +- kernel/sysctl.c: remove unused variable ten_thousand (Eric Chanudet) [2159468] + * Thu Feb 16 2023 Luis Claudio R. Goncalves [5.14.0-271.rt14.271.el9] - [rt] build kernel-rt-5.14.0-271.rt14.271.el9 [2125474] - spi: bcm2835: bcm2835_spi_handle_err(): fix NULL pointer deref for non DMA transfers (Mark Salter) [2071848 2122415] diff --git a/mod-partner.list b/mod-partner.list new file mode 100644 index 0000000..9cd36e5 --- /dev/null +++ b/mod-partner.list @@ -0,0 +1,2 @@ +afs +rxrpc diff --git a/sources b/sources index 7ef4569..c7ab4c1 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-271.rt14.271.el9.tar.xz) = 7b66c0b9ce8bfe845ddfa7ade4f9445204827bd0fb90b171c0296110d0ba967883319e88c60d5949c8de3dca65fdf42d11ae893c0e03ae85a1787dea6a7abb7b -SHA512 (kernel-abi-stablelists-5.14.0-271.rt14.271.el9.tar.bz2) = cbf681967b35750482a06b3160f566c573caaa79cc8efe49661ab14272e7604cfda121997461fb146f1e71736527f829f180cc8dbcd3ec437a6fb6a563bca976 -SHA512 (kernel-kabi-dw-5.14.0-271.rt14.271.el9.tar.bz2) = 565f812fa83a756ef7b91219031cfe80b1e853f22b4ed38ada76aed482caaf89df35e4d220f45728392765a757f8b0798e3b5a57fee0114e1d0379e887772578 +SHA512 (linux-5.14.0-272.rt14.272.el9.tar.xz) = 1fae7baf5b264ffe76b3aefbe75d4dd33534263c07c6754cd2631e372965681bc1180219ddfbbd7bcbf2edd1372fc3338512f209db7ceb4a4c271484e2157fec +SHA512 (kernel-abi-stablelists-5.14.0-272.rt14.272.el9.tar.bz2) = 5acd88c379059dd56d841b734022a329599d27101844f3c129684e9c8bb589f5a3c83147d00ba600b84763d89533e72ca8c2b2fae5d82ab52a02cb289793a0b2 +SHA512 (kernel-kabi-dw-5.14.0-272.rt14.272.el9.tar.bz2) = 565f812fa83a756ef7b91219031cfe80b1e853f22b4ed38ada76aed482caaf89df35e4d220f45728392765a757f8b0798e3b5a57fee0114e1d0379e887772578