diff --git a/Makefile.rhelver b/Makefile.rhelver index e027113a4..f557284d5 100644 --- a/Makefile.rhelver +++ b/Makefile.rhelver @@ -12,7 +12,7 @@ RHEL_MINOR = 3 # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -RHEL_RELEASE = 346 +RHEL_RELEASE = 347 # # ZSTREAM diff --git a/kernel-aarch64-64k-debug-rhel.config b/kernel-aarch64-64k-debug-rhel.config index 52128a729..87cf48635 100644 --- a/kernel-aarch64-64k-debug-rhel.config +++ b/kernel-aarch64-64k-debug-rhel.config @@ -6033,7 +6033,7 @@ CONFIG_TCG_TIS_I2C_NUVOTON=m # CONFIG_TCG_TIS_ST33ZP24_SPI is not set CONFIG_TCG_TIS=y CONFIG_TCG_TPM=y -# CONFIG_TCG_VTPM_PROXY is not set +CONFIG_TCG_VTPM_PROXY=m # CONFIG_TCG_XEN is not set CONFIG_TCM_FC=m CONFIG_TCM_FILEIO=m diff --git a/kernel-aarch64-64k-rhel.config b/kernel-aarch64-64k-rhel.config index ad0546427..cdd33917a 100644 --- a/kernel-aarch64-64k-rhel.config +++ b/kernel-aarch64-64k-rhel.config @@ -6009,7 +6009,7 @@ CONFIG_TCG_TIS_I2C_NUVOTON=m # CONFIG_TCG_TIS_ST33ZP24_SPI is not set CONFIG_TCG_TIS=y CONFIG_TCG_TPM=y -# CONFIG_TCG_VTPM_PROXY is not set +CONFIG_TCG_VTPM_PROXY=m # CONFIG_TCG_XEN is not set CONFIG_TCM_FC=m CONFIG_TCM_FILEIO=m diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 4ad6bc280..e31ce55bd 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -6030,7 +6030,7 @@ CONFIG_TCG_TIS_I2C_NUVOTON=m # CONFIG_TCG_TIS_ST33ZP24_SPI is not set CONFIG_TCG_TIS=y CONFIG_TCG_TPM=y -# CONFIG_TCG_VTPM_PROXY is not set +CONFIG_TCG_VTPM_PROXY=m # CONFIG_TCG_XEN is not set CONFIG_TCM_FC=m CONFIG_TCM_FILEIO=m diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index 020cb7b3e..7a566a516 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -6006,7 +6006,7 @@ CONFIG_TCG_TIS_I2C_NUVOTON=m # CONFIG_TCG_TIS_ST33ZP24_SPI is not set CONFIG_TCG_TIS=y CONFIG_TCG_TPM=y -# CONFIG_TCG_VTPM_PROXY is not set +CONFIG_TCG_VTPM_PROXY=m # CONFIG_TCG_XEN is not set CONFIG_TCM_FC=m CONFIG_TCM_FILEIO=m diff --git a/kernel-aarch64-rt-debug-rhel.config b/kernel-aarch64-rt-debug-rhel.config index 82c2930fd..29076fcbd 100644 --- a/kernel-aarch64-rt-debug-rhel.config +++ b/kernel-aarch64-rt-debug-rhel.config @@ -6131,7 +6131,7 @@ CONFIG_TCG_TIS_I2C_NUVOTON=m # CONFIG_TCG_TIS_ST33ZP24_SPI is not set CONFIG_TCG_TIS=y CONFIG_TCG_TPM=y -# CONFIG_TCG_VTPM_PROXY is not set +CONFIG_TCG_VTPM_PROXY=m # CONFIG_TCG_XEN is not set CONFIG_TCM_FC=m CONFIG_TCM_FILEIO=m diff --git a/kernel-aarch64-rt-rhel.config b/kernel-aarch64-rt-rhel.config index 23e286f90..3677d0dd0 100644 --- a/kernel-aarch64-rt-rhel.config +++ b/kernel-aarch64-rt-rhel.config @@ -6107,7 +6107,7 @@ CONFIG_TCG_TIS_I2C_NUVOTON=m # CONFIG_TCG_TIS_ST33ZP24_SPI is not set CONFIG_TCG_TIS=y CONFIG_TCG_TPM=y -# CONFIG_TCG_VTPM_PROXY is not set +CONFIG_TCG_VTPM_PROXY=m # CONFIG_TCG_XEN is not set CONFIG_TCM_FC=m CONFIG_TCM_FILEIO=m diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index 2f2617afd..c00c9ab94 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -5526,7 +5526,7 @@ CONFIG_TCG_TIS_I2C_NUVOTON=y # CONFIG_TCG_TIS_ST33ZP24_SPI is not set CONFIG_TCG_TIS=y CONFIG_TCG_TPM=y -# CONFIG_TCG_VTPM_PROXY is not set +CONFIG_TCG_VTPM_PROXY=m # CONFIG_TCG_XEN is not set CONFIG_TCM_FC=m CONFIG_TCM_FILEIO=m diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index dbeb29520..d63ac867b 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -5504,7 +5504,7 @@ CONFIG_TCG_TIS_I2C_NUVOTON=y # CONFIG_TCG_TIS_ST33ZP24_SPI is not set CONFIG_TCG_TIS=y CONFIG_TCG_TPM=y -# CONFIG_TCG_VTPM_PROXY is not set +CONFIG_TCG_VTPM_PROXY=m # CONFIG_TCG_XEN is not set CONFIG_TCM_FC=m CONFIG_TCM_FILEIO=m diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index 235543489..14ef4cc69 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -5504,7 +5504,7 @@ CONFIG_TCG_CRB=y # CONFIG_TCG_TIS_ST33ZP24_SPI is not set CONFIG_TCG_TIS=y CONFIG_TCG_TPM=y -# CONFIG_TCG_VTPM_PROXY is not set +CONFIG_TCG_VTPM_PROXY=m # CONFIG_TCG_XEN is not set CONFIG_TCM_FC=m CONFIG_TCM_FILEIO=m diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 9c22bd14a..01bb266a5 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -5482,7 +5482,7 @@ CONFIG_TCG_CRB=y # CONFIG_TCG_TIS_ST33ZP24_SPI is not set CONFIG_TCG_TIS=y CONFIG_TCG_TPM=y -# CONFIG_TCG_VTPM_PROXY is not set +CONFIG_TCG_VTPM_PROXY=m # CONFIG_TCG_XEN is not set CONFIG_TCM_FC=m CONFIG_TCM_FILEIO=m diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 33e5dd32d..76276dd0e 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -5508,7 +5508,7 @@ CONFIG_TCG_CRB=y # CONFIG_TCG_TIS_ST33ZP24_SPI is not set CONFIG_TCG_TIS=y CONFIG_TCG_TPM=y -# CONFIG_TCG_VTPM_PROXY is not set +CONFIG_TCG_VTPM_PROXY=m # CONFIG_TCG_XEN is not set CONFIG_TCM_FC=y CONFIG_TCM_FILEIO=y diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 72dace325..b69bc3d25 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -5760,7 +5760,7 @@ CONFIG_TCG_TIS_I2C_NUVOTON=m # CONFIG_TCG_TIS_ST33ZP24_SPI is not set CONFIG_TCG_TIS=y CONFIG_TCG_TPM=y -# CONFIG_TCG_VTPM_PROXY is not set +CONFIG_TCG_VTPM_PROXY=m # CONFIG_TCG_XEN is not set CONFIG_TCM_FC=m CONFIG_TCM_FILEIO=m diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 86b35c62b..5c27b8145 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -5737,7 +5737,7 @@ CONFIG_TCG_TIS_I2C_NUVOTON=m # CONFIG_TCG_TIS_ST33ZP24_SPI is not set CONFIG_TCG_TIS=y CONFIG_TCG_TPM=y -# CONFIG_TCG_VTPM_PROXY is not set +CONFIG_TCG_VTPM_PROXY=m # CONFIG_TCG_XEN is not set CONFIG_TCM_FC=m CONFIG_TCM_FILEIO=m diff --git a/kernel-x86_64-rt-debug-rhel.config b/kernel-x86_64-rt-debug-rhel.config index 228c72a56..24e3bd205 100644 --- a/kernel-x86_64-rt-debug-rhel.config +++ b/kernel-x86_64-rt-debug-rhel.config @@ -5859,7 +5859,7 @@ CONFIG_TCG_TIS_I2C_NUVOTON=m # CONFIG_TCG_TIS_ST33ZP24_SPI is not set CONFIG_TCG_TIS=y CONFIG_TCG_TPM=y -# CONFIG_TCG_VTPM_PROXY is not set +CONFIG_TCG_VTPM_PROXY=m # CONFIG_TCG_XEN is not set CONFIG_TCM_FC=m CONFIG_TCM_FILEIO=m diff --git a/kernel-x86_64-rt-rhel.config b/kernel-x86_64-rt-rhel.config index f45515243..d0dd92c03 100644 --- a/kernel-x86_64-rt-rhel.config +++ b/kernel-x86_64-rt-rhel.config @@ -5836,7 +5836,7 @@ CONFIG_TCG_TIS_I2C_NUVOTON=m # CONFIG_TCG_TIS_ST33ZP24_SPI is not set CONFIG_TCG_TIS=y CONFIG_TCG_TPM=y -# CONFIG_TCG_VTPM_PROXY is not set +CONFIG_TCG_VTPM_PROXY=m # CONFIG_TCG_XEN is not set CONFIG_TCM_FC=m CONFIG_TCM_FILEIO=m diff --git a/kernel.spec b/kernel.spec index 5f45e1238..b807b0829 100755 --- a/kernel.spec +++ b/kernel.spec @@ -161,15 +161,15 @@ Summary: The Linux kernel # define buildid .local %define specversion 5.14.0 %define patchversion 5.14 -%define pkgrelease 346 +%define pkgrelease 347 %define kversion 5 -%define tarfile_release 5.14.0-346.el9 +%define tarfile_release 5.14.0-347.el9 # This is needed to do merge window version magic %define patchlevel 14 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 346%{?buildid}%{?dist} +%define specrelease 347%{?buildid}%{?dist} # This defines the kabi tarball version -%define kabiversion 5.14.0-346.el9 +%define kabiversion 5.14.0-347.el9 # # End of genspec.sh variables @@ -3698,6 +3698,62 @@ fi # # %changelog +* Fri Jul 28 2023 Jan Stancek [5.14.0-347.el9] +- rxrpc: Truncate UTS_RELEASE for rxrpc version (Marc Dionne) [2222918] +- rxrpc: Use alloc_ordered_workqueue() to create ordered workqueues (Marc Dionne) [2222918] +- rxrpc: Fix timeout of a call that hasn't yet been granted a channel (Marc Dionne) [2222918] +- rxrpc: Make it so that a waiting process can be aborted (Marc Dionne) [2222918] +- rxrpc: Fix hard call timeout units (Marc Dionne) [2222918] +- rxrpc: Fix potential data race in rxrpc_wait_to_be_connected() (Marc Dionne) [2222918] +- rxrpc: Fix error when reading rxrpc tokens (Marc Dionne) [2222918] +- rxrpc: Fix potential race in error handling in afs_make_call() (Marc Dionne) [2222918] +- rxrpc: Fix overproduction of wakeups to recvmsg() (Marc Dionne) [2222918] +- rxrpc: use bvec_set_page to initialize a bvec (Marc Dionne) [2222918] +- rxrpc: Kill service bundle (Marc Dionne) [2222918] +- rxrpc: Remove local->defrag_sem (Marc Dionne) [2222918] +- rxrpc: Don't lock call->tx_lock to access call->tx_buffer (Marc Dionne) [2222918] +- rxrpc: Simplify ACK handling (Marc Dionne) [2222918] +- rxrpc: De-atomic call->ackr_window and call->ackr_nr_unacked (Marc Dionne) [2222918] +- rxrpc: Generate extra pings for RTT during heavy-receive call (Marc Dionne) [2222918] +- rxrpc: Convert call->recvmsg_lock to a spinlock (Marc Dionne) [2222918] +- rxrpc: Reduce unnecessary ack transmission (Marc Dionne) [2222918] +- rxrpc: Trace ack.rwind (Marc Dionne) [2222918] +- rxrpc: Shrink the tabulation in the rxrpc trace header a bit (Marc Dionne) [2222918] +- rxrpc: Remove whitespace before ')' in trace header (Marc Dionne) [2222918] +- rxrpc: Fix overwaking on call poking (Marc Dionne) [2222918] +- rxrpc: Fix trace string (Marc Dionne) [2222918] +- afs: Fix accidental truncation when storing data (Marc Dionne) [2222918] +- afs: convert pagevec to folio_batch in afs_extend_writeback() (Marc Dionne) [2222918] +- afs: Fix vlserver probe RTT handling (Marc Dionne) [2222918] +- afs: Fix setting of mtime when creating a file/dir/symlink (Marc Dionne) [2222918] +- afs: Avoid endless loop if file is larger than expected (Marc Dionne) [2222918] +- afs: Fix getattr to report server i_size on dirs, not local size (Marc Dionne) [2222918] +- afs: Fix updating of i_size with dv jump from server (Marc Dionne) [2222918] +- afs: split afs_pagecache_valid() out of afs_validate() (Marc Dionne) [2222918] +- afs: use bvec_set_folio to initialize a bvec (Marc Dionne) [2222918] +- afs: Stop implementing ->writepage() (Marc Dionne) [2222918] +- ACPI: video: Add acpi_backlight=video quirk for Lenovo ThinkPad W530 (Mark Langsdorf) [2186058] +- ACPI: video: Stop trying to use vendor backlight control on laptops from after ~2012 (Mark Langsdorf) [2186058] +- ACPI: video: Remove register_backlight_delay module option and code (Mark Langsdorf) [2186058] +- ACPI: video: Don't enable fallback path for creating ACPI backlight by default (Mark Langsdorf) [2186058] +- ACPI: video: Prefer native over vendor (Mark Langsdorf) [2186058] +- ACPI: video: Simplify __acpi_video_get_backlight_type() (Mark Langsdorf) [2186058] +- PM/devfreq: governor: Add a private governor_data for governor (Steve Best) [2212961] +- redhat/configs: Enable CONFIG_TCG_VTPM_PROXY (Štěpán Horáček) [2210263] +- iavf: fix reset task race with iavf_remove() (Petr Oros) [2223599] +- iavf: fix a deadlock caused by rtnl and driver's lock circular dependencies (Petr Oros) [2223599] +- Revert "iavf: Do not restart Tx queues after reset task failure" (Petr Oros) [2223599] +- Revert "iavf: Detach device during reset task" (Petr Oros) [2223599] +- iavf: Wait for reset in callbacks which trigger it (Petr Oros) [2223599] +- iavf: use internal state to free traffic IRQs (Petr Oros) [2223599] +- iavf: Fix out-of-bounds when setting channels on remove (Petr Oros) [2223599] +- iavf: Fix use-after-free in free_netdev (Petr Oros) [2223599] +- iavf: make functions static where possible (Petr Oros) [2223599] +- iavf: fix err handling for MAC replace (Petr Oros) [2223599] +- iavf: remove some unused functions and pointless wrappers (Petr Oros) [2223599] +- iavf: remove mask from iavf_irq_enable_queues() (Petr Oros) [2223599] +- iavf: send VLAN offloading caps once after VFR (Petr Oros) [2223599] + * Wed Jul 26 2023 Jan Stancek [5.14.0-346.el9] - redhat: configs: Enable CONFIG_TYPEC_STUSB160X for rhel on aarch64 (Desnes Nunes) [2222412] - usb: typec: stusb160x: Switch to use dev_err_probe() helper (Desnes Nunes) [2222412] diff --git a/sources b/sources index b0c791f77..15b070b0e 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-5.14.0-346.el9.tar.xz) = b4fc5a58fcaa13308bad5b4be914e1583925ba9e3b79be4fb17d628de9e6c7ae340d55cf6a800cb36f264ccd78409e1c75418c7528ec0d823d0448ad22840aaa -SHA512 (kernel-abi-stablelists-5.14.0-346.el9.tar.bz2) = d7e5046a6b56d116d1ce24f889f7cea2fb7f3893d96d87a866b7e381c7735654f460b41f8853bf224d4d65237971002bddd012a71e49023fd926203fa6bfef48 -SHA512 (kernel-kabi-dw-5.14.0-346.el9.tar.bz2) = 119e820407c58c1868a04aa69c969a881bd672f0f7111a8b382a7369bc89e57667faab180be0b4932dbfbfeb25267787c56fb155dba1ccb244922a7a130d187b +SHA512 (linux-5.14.0-347.el9.tar.xz) = f044ba518d64d5c7b60363883828d1cb4bbce8b03830fbbc6557fe556884593ce640bb6e964cc0308b9862c1303928a769976255f75a014f2deb00e5a4b83c80 +SHA512 (kernel-abi-stablelists-5.14.0-347.el9.tar.bz2) = fd9ade56e4633797c768df903c1eed36b4d2d5db39260067df2863db303f29b54115c1faee07c3febe96986eea87fe12b5f266f6a3e5ebd4aaf3630188814ed1 +SHA512 (kernel-kabi-dw-5.14.0-347.el9.tar.bz2) = 119e820407c58c1868a04aa69c969a881bd672f0f7111a8b382a7369bc89e57667faab180be0b4932dbfbfeb25267787c56fb155dba1ccb244922a7a130d187b