diff --git a/Makefile.rhelver b/Makefile.rhelver index df67c9f..6b121b1 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 = 67 +RHEL_RELEASE = 68 # # Early y+1 numbering diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 0b693ad..da453dc 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -653,7 +653,7 @@ CONFIG_CAN_SOFTING=m CONFIG_CAN_VCAN=m CONFIG_CAN_VXCAN=m # CONFIG_CAN_XILINXCAN is not set -CONFIG_CARDBUS=y +# CONFIG_CARDBUS is not set # CONFIG_CARL9170 is not set CONFIG_CAVIUM_CPT=m CONFIG_CAVIUM_ERRATUM_22375=y @@ -4165,7 +4165,7 @@ CONFIG_RENESAS_PHY=m CONFIG_RESET_CONTROLLER=y # CONFIG_RESET_QCOM_AOSS is not set # CONFIG_RESET_QCOM_PDC is not set -CONFIG_RESET_SCMI=y +# CONFIG_RESET_SCMI is not set # CONFIG_RESET_TI_SYSCON is not set CONFIG_RESOURCE_KUNIT_TEST=m CONFIG_RETPOLINE=y @@ -4647,7 +4647,7 @@ CONFIG_SENSORS_MAX31790=m # CONFIG_SENSORS_MP2888 is not set # CONFIG_SENSORS_MP2975 is not set # CONFIG_SENSORS_MR75203 is not set -CONFIG_SENSORS_NCT6683=m +# CONFIG_SENSORS_NCT6683 is not set # CONFIG_SENSORS_NCT6775 is not set CONFIG_SENSORS_NCT7802=m CONFIG_SENSORS_NCT7904=m @@ -6290,7 +6290,7 @@ CONFIG_XZ_DEC_POWERPC=y CONFIG_XZ_DEC_X86=y CONFIG_XZ_DEC=y # CONFIG_YAMAHA_YAS530 is not set -CONFIG_YENTA=m +# CONFIG_YENTA is not set # CONFIG_Z3FOLD is not set CONFIG_ZBUD=y # CONFIG_ZEROPLUS_FF is not set diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index ab50c3f..caf2035 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -653,7 +653,7 @@ CONFIG_CAN_SOFTING=m CONFIG_CAN_VCAN=m CONFIG_CAN_VXCAN=m # CONFIG_CAN_XILINXCAN is not set -CONFIG_CARDBUS=y +# CONFIG_CARDBUS is not set # CONFIG_CARL9170 is not set CONFIG_CAVIUM_CPT=m CONFIG_CAVIUM_ERRATUM_22375=y @@ -4143,7 +4143,7 @@ CONFIG_RENESAS_PHY=m CONFIG_RESET_CONTROLLER=y # CONFIG_RESET_QCOM_AOSS is not set # CONFIG_RESET_QCOM_PDC is not set -CONFIG_RESET_SCMI=y +# CONFIG_RESET_SCMI is not set # CONFIG_RESET_TI_SYSCON is not set CONFIG_RESOURCE_KUNIT_TEST=m CONFIG_RETPOLINE=y @@ -4625,7 +4625,7 @@ CONFIG_SENSORS_MAX31790=m # CONFIG_SENSORS_MP2888 is not set # CONFIG_SENSORS_MP2975 is not set # CONFIG_SENSORS_MR75203 is not set -CONFIG_SENSORS_NCT6683=m +# CONFIG_SENSORS_NCT6683 is not set # CONFIG_SENSORS_NCT6775 is not set CONFIG_SENSORS_NCT7802=m CONFIG_SENSORS_NCT7904=m @@ -6266,7 +6266,7 @@ CONFIG_XZ_DEC_POWERPC=y CONFIG_XZ_DEC_X86=y CONFIG_XZ_DEC=y # CONFIG_YAMAHA_YAS530 is not set -CONFIG_YENTA=m +# CONFIG_YENTA is not set # CONFIG_Z3FOLD is not set CONFIG_ZBUD=y # CONFIG_ZEROPLUS_FF is not set diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index c6a7953..224163d 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -544,7 +544,7 @@ CONFIG_CAN_SOFTING=m CONFIG_CAN_VCAN=m CONFIG_CAN_VXCAN=m # CONFIG_CAN_XILINXCAN is not set -CONFIG_CARDBUS=y +# CONFIG_CARDBUS is not set # CONFIG_CARL9170 is not set CONFIG_CAVIUM_ERRATUM_30115=y CONFIG_CB710_CORE=m @@ -6058,7 +6058,7 @@ CONFIG_XZ_DEC_POWERPC=y CONFIG_XZ_DEC_X86=y CONFIG_XZ_DEC=y # CONFIG_YAMAHA_YAS530 is not set -CONFIG_YENTA=m +# CONFIG_YENTA is not set # CONFIG_Z3FOLD is not set CONFIG_ZBUD=y # CONFIG_ZEROPLUS_FF is not set diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index 59c57d0..328be3f 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -544,7 +544,7 @@ CONFIG_CAN_SOFTING=m CONFIG_CAN_VCAN=m CONFIG_CAN_VXCAN=m # CONFIG_CAN_XILINXCAN is not set -CONFIG_CARDBUS=y +# CONFIG_CARDBUS is not set # CONFIG_CARL9170 is not set CONFIG_CAVIUM_ERRATUM_30115=y CONFIG_CB710_CORE=m @@ -6038,7 +6038,7 @@ CONFIG_XZ_DEC_POWERPC=y CONFIG_XZ_DEC_X86=y CONFIG_XZ_DEC=y # CONFIG_YAMAHA_YAS530 is not set -CONFIG_YENTA=m +# CONFIG_YENTA is not set # CONFIG_Z3FOLD is not set CONFIG_ZBUD=y # CONFIG_ZEROPLUS_FF is not set diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index f3c3119..cede138 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -543,7 +543,7 @@ CONFIG_CAN_SOFTING=m CONFIG_CAN_VCAN=m CONFIG_CAN_VXCAN=m # CONFIG_CAN_XILINXCAN is not set -CONFIG_CARDBUS=y +# CONFIG_CARDBUS is not set # CONFIG_CARL9170 is not set CONFIG_CAVIUM_ERRATUM_30115=y CONFIG_CB710_CORE=m @@ -6014,7 +6014,7 @@ CONFIG_XZ_DEC_POWERPC=y CONFIG_XZ_DEC_X86=y CONFIG_XZ_DEC=y # CONFIG_YAMAHA_YAS530 is not set -CONFIG_YENTA=m +# CONFIG_YENTA is not set # CONFIG_Z3FOLD is not set # CONFIG_ZBUD is not set CONFIG_ZCRYPT_DEBUG=y diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 6d29147..ac3c5f8 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -543,7 +543,7 @@ CONFIG_CAN_SOFTING=m CONFIG_CAN_VCAN=m CONFIG_CAN_VXCAN=m # CONFIG_CAN_XILINXCAN is not set -CONFIG_CARDBUS=y +# CONFIG_CARDBUS is not set # CONFIG_CARL9170 is not set CONFIG_CAVIUM_ERRATUM_30115=y CONFIG_CB710_CORE=m @@ -5994,7 +5994,7 @@ CONFIG_XZ_DEC_POWERPC=y CONFIG_XZ_DEC_X86=y CONFIG_XZ_DEC=y # CONFIG_YAMAHA_YAS530 is not set -CONFIG_YENTA=m +# CONFIG_YENTA is not set # CONFIG_Z3FOLD is not set # CONFIG_ZBUD is not set # CONFIG_ZCRYPT_DEBUG is not set diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index e624613..855e11f 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -548,7 +548,7 @@ CONFIG_CAN_SOFTING=m CONFIG_CAN_VCAN=m CONFIG_CAN_VXCAN=m # CONFIG_CAN_XILINXCAN is not set -CONFIG_CARDBUS=y +# CONFIG_CARDBUS is not set # CONFIG_CARL9170 is not set CONFIG_CAVIUM_ERRATUM_30115=y CONFIG_CB710_CORE=m @@ -6023,7 +6023,7 @@ CONFIG_XZ_DEC_POWERPC=y CONFIG_XZ_DEC_X86=y CONFIG_XZ_DEC=y # CONFIG_YAMAHA_YAS530 is not set -CONFIG_YENTA=m +# CONFIG_YENTA is not set # CONFIG_Z3FOLD is not set # CONFIG_ZBUD is not set # CONFIG_ZCRYPT_DEBUG is not set diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 07491dc..0cacb07 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -569,7 +569,7 @@ CONFIG_CAN_SOFTING=m CONFIG_CAN_VCAN=m CONFIG_CAN_VXCAN=m # CONFIG_CAN_XILINXCAN is not set -CONFIG_CARDBUS=y +# CONFIG_CARDBUS is not set # CONFIG_CARL9170 is not set CONFIG_CAVIUM_ERRATUM_30115=y CONFIG_CB710_CORE=m @@ -6315,7 +6315,7 @@ CONFIG_XZ_DEC_POWERPC=y CONFIG_XZ_DEC_X86=y CONFIG_XZ_DEC=y # CONFIG_YAMAHA_YAS530 is not set -CONFIG_YENTA=m +# CONFIG_YENTA is not set # CONFIG_Z3FOLD is not set CONFIG_ZBUD=y # CONFIG_ZEROPLUS_FF is not set diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index ea8e80f..2cc207f 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -569,7 +569,7 @@ CONFIG_CAN_SOFTING=m CONFIG_CAN_VCAN=m CONFIG_CAN_VXCAN=m # CONFIG_CAN_XILINXCAN is not set -CONFIG_CARDBUS=y +# CONFIG_CARDBUS is not set # CONFIG_CARL9170 is not set CONFIG_CAVIUM_ERRATUM_30115=y CONFIG_CB710_CORE=m @@ -6292,7 +6292,7 @@ CONFIG_XZ_DEC_POWERPC=y CONFIG_XZ_DEC_X86=y CONFIG_XZ_DEC=y # CONFIG_YAMAHA_YAS530 is not set -CONFIG_YENTA=m +# CONFIG_YENTA is not set # CONFIG_Z3FOLD is not set CONFIG_ZBUD=y # CONFIG_ZEROPLUS_FF is not set diff --git a/kernel.spec b/kernel.spec index 1088761..ab2b5fe 100755 --- a/kernel.spec +++ b/kernel.spec @@ -79,7 +79,7 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 -%global distro_build 67 +%global distro_build 68 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -123,13 +123,13 @@ Summary: The Linux kernel %define kversion 5.14 %define rpmversion 5.14.0 -%define pkgrelease 67.el9 +%define pkgrelease 68.el9 # This is needed to do merge window version magic %define patchlevel 14 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 67%{?buildid}%{?dist} +%define specrelease 68%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -566,6 +566,9 @@ BuildRequires: net-tools, hostname, bc, elfutils-devel BuildRequires: dwarves BuildRequires: python3-devel BuildRequires: gcc-plugin-devel +# glibc-static is required for a consistent build environment (specifically +# CONFIG_CC_CAN_LINK_STATIC=y). +BuildRequires: glibc-static BuildRequires: kernel-rpm-macros >= 185-9 %ifnarch %{nobuildarches} noarch BuildRequires: bpftool @@ -675,7 +678,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.14.0-67.el9.tar.xz +Source0: linux-5.14.0-68.el9.tar.xz Source1: Makefile.rhelver @@ -1342,8 +1345,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.14.0-67.el9 -c -mv linux-5.14.0-67.el9 linux-%{KVERREL} +%setup -q -n kernel-5.14.0-68.el9 -c +mv linux-5.14.0-68.el9 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -2942,6 +2945,48 @@ fi # # %changelog +* Tue Feb 22 2022 Herton R. Krzesinski [5.14.0-68.el9] +- net: ena: Extract recurring driver reset code into a function (Petr Oros) [2038150] +- net: ena: Change the name of bad_csum variable (Petr Oros) [2038150] +- net: ena: Add debug prints for invalid req_id resets (Petr Oros) [2038150] +- net: ena: Remove ena_calc_queue_size_ctx struct (Petr Oros) [2038150] +- net: ena: Move reset completion print to the reset function (Petr Oros) [2038150] +- net: ena: Remove redundant return code check (Petr Oros) [2038150] +- net: ena: Update LLQ header length in ena documentation (Petr Oros) [2038150] +- net: ena: Change ENI stats support check to use capabilities field (Petr Oros) [2038150] +- net: ena: Add capabilities field with support for ENI stats capability (Petr Oros) [2038150] +- net: ena: Change return value of ena_calc_io_queue_size() to void (Petr Oros) [2038150] +- net: ena: Fix error handling when calculating max IO queues number (Petr Oros) [2038150] +- net: ena: Fix wrong rx request id by resetting device (Petr Oros) [2038150] +- net: ena: Fix undefined state when tx request id is out of bounds (Petr Oros) [2038150] +- net/packet: rx_owner_map depends on pg_vec (Hangbin Liu) [2050329] {CVE-2021-22600} +- powerpc: security: Lock down the kernel if booted in secure boot mode (Desnes A. Nunes do Rosario) [2041984] +- drm/i915: Flush TLBs before releasing backing store (Dave Airlie) [2044335] {CVE-2022-0330} +- sfc: The RX page_ring is optional (Íñigo Huguet) [2042801] +- sfc: Check null pointer of rx_queue->page_ring (Íñigo Huguet) [2042801] +- sfc_ef100: potential dereference of null pointer (Íñigo Huguet) [2042801] +- sfc: Don't use netif_info before net_device setup (Íñigo Huguet) [2042801] +- sfc: Export fibre-specific supported link modes (Íñigo Huguet) [2042801] +- sfc: Fix reading non-legacy supported link modes (Íñigo Huguet) [2042801] +- ethernet: constify references to netdev->dev_addr in drivers (Íñigo Huguet) [2042801] +- sfc: last resort fallback for lack of xdp tx queues (Íñigo Huguet) [2042801] +- sfc: fallback for lack of xdp tx queues (Íñigo Huguet) [2042801] +- RDMA/cma: Do not change route.addr.src_addr.ss_family (Kamal Heib) [2032069] {CVE-2021-4028} +- kernel/sched/sched.h: Exclude cpuidle from KABI (Prarit Bhargava) [2033340] +- redhat/configs: Disable CONFIG_SENSORS_NCT6683 in RHEL for arm/aarch64 (Dean Nelson) [2041186] +- kernel.spec: Add glibc-static build requirement (Prarit Bhargava) +- libbpf: Fix memleak in libbpf_netlink_recv() (Toke Høiland-Jørgensen) [2052543] +- libbpf: Use dynamically allocated buffer when receiving netlink messages (Toke Høiland-Jørgensen) [2052543] +- redhat/configs: Disable arch_hw disabled CONFIGS (Prarit Bhargava) [2053029] +- netfilter: conntrack: re-init state for retransmitted syn-ack (Florian Westphal) [2051973] +- netfilter: conntrack: move synack init code to helper (Florian Westphal) [2051973] +- ext4: fix remount with 'abort' option (Lukas Czerner) [2049657] +- thunderbolt: Enable retry logic for intra-domain control packets (David Arcari) [1960445] +- thunderbolt: Handle ring interrupt by reading interrupt status register (David Arcari) [1960445] +- thunderbolt: Add vendor specific NHI quirk for auto-clearing interrupt status (David Arcari) [1960445] +- thunderbolt: Fix port linking by checking all adapters (David Arcari) [1960445] +- thunderbolt: Do not read control adapter config space (David Arcari) [1960445] + * Tue Feb 22 2022 Herton R. Krzesinski [5.14.0-67.el9] - kabi: Adding symbol strncpy_from_user (lib/strncpy_from_user.c) (Čestmír Kalina) [2008872] - kabi: Adding symbol strlcpy (lib/string.c) (Čestmír Kalina) [2008872] diff --git a/sources b/sources index f4514fd..561878f 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-5.14.0-67.el9.tar.xz) = 1b228dc645834d76d7f89a9c560f0fb9249c9c11117a49a7a5d69f6553e6b9aa388f1f7b0068cc7a68cee460b3a4b057c39f0a7a322c3c87f3d8d4a7b6f87d09 -SHA512 (kernel-abi-stablelists-5.14.0-67.tar.bz2) = 9ae1d648dfe4b8599da7db6d53ed5c513bf2116f37750bced7c5054933be2d9586802dd655638f25ae815a6ab9895d78d304871e713d3f9907c9f45cbc525531 -SHA512 (kernel-kabi-dw-5.14.0-67.tar.bz2) = 237d55ea4b384956280d9c149d51454ff5752675de58b1135ca870c987cef31b3371b0524345f5ffe5017bdfece49052fafd7d3e4dd79a15452643b5f2ada038 +SHA512 (linux-5.14.0-68.el9.tar.xz) = 6fc17c233d1ae3140b4c87a75c3bc81223e07f50f8be32591dddb7b5fd4ff8551b9d30694a8a119e19de060f62e17e1d5f751c5d1a976d24c9c819cb47010525 +SHA512 (kernel-abi-stablelists-5.14.0-68.tar.bz2) = 09a2fad20cf3c2c9c2d5b8029765210eca451d9d7f9f1216afd3a49183ce32bd1323047fcbdcb3bfc34d16ba8f5524c3af8b5f4c0d6fcff59107ddba59e08eb4 +SHA512 (kernel-kabi-dw-5.14.0-68.tar.bz2) = e31b0918ba8b6e20f18e25193120e831b1271df7256cc741a9880c9a8e0e9edb6c5eaacd601b1591827a1ab02484e8b40d1fc78126fc0509b6e7156876305161