diff --git a/Makefile.rhelver b/Makefile.rhelver index 211b84a..9893e05 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 = 348 +RHEL_RELEASE = 349 # # ZSTREAM diff --git a/kernel-aarch64-64k-debug-rhel.config b/kernel-aarch64-64k-debug-rhel.config index 87cf486..da91c9e 100644 --- a/kernel-aarch64-64k-debug-rhel.config +++ b/kernel-aarch64-64k-debug-rhel.config @@ -4275,6 +4275,7 @@ CONFIG_PHY_NS2_USB_DRD=y # CONFIG_PHY_QCOM_PCIE2 is not set # CONFIG_PHY_QCOM_QMP is not set # CONFIG_PHY_QCOM_QUSB2 is not set +# CONFIG_PHY_QCOM_SGMII_ETH is not set # CONFIG_PHY_QCOM_SNPS_EUSB2 is not set # CONFIG_PHY_QCOM_USB_HS_28NM is not set # CONFIG_PHY_QCOM_USB_HSIC is not set diff --git a/kernel-aarch64-64k-rhel.config b/kernel-aarch64-64k-rhel.config index cdd3391..2da709f 100644 --- a/kernel-aarch64-64k-rhel.config +++ b/kernel-aarch64-64k-rhel.config @@ -4253,6 +4253,7 @@ CONFIG_PHY_NS2_USB_DRD=y # CONFIG_PHY_QCOM_PCIE2 is not set # CONFIG_PHY_QCOM_QMP is not set # CONFIG_PHY_QCOM_QUSB2 is not set +# CONFIG_PHY_QCOM_SGMII_ETH is not set # CONFIG_PHY_QCOM_SNPS_EUSB2 is not set # CONFIG_PHY_QCOM_USB_HS_28NM is not set # CONFIG_PHY_QCOM_USB_HSIC is not set diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index e31ce55..6cf0a8a 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -4272,6 +4272,7 @@ CONFIG_PHY_NS2_USB_DRD=y # CONFIG_PHY_QCOM_PCIE2 is not set # CONFIG_PHY_QCOM_QMP is not set # CONFIG_PHY_QCOM_QUSB2 is not set +# CONFIG_PHY_QCOM_SGMII_ETH is not set # CONFIG_PHY_QCOM_SNPS_EUSB2 is not set # CONFIG_PHY_QCOM_USB_HS_28NM is not set # CONFIG_PHY_QCOM_USB_HSIC is not set diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index 7a566a5..d1564aa 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -4250,6 +4250,7 @@ CONFIG_PHY_NS2_USB_DRD=y # CONFIG_PHY_QCOM_PCIE2 is not set # CONFIG_PHY_QCOM_QMP is not set # CONFIG_PHY_QCOM_QUSB2 is not set +# CONFIG_PHY_QCOM_SGMII_ETH is not set # CONFIG_PHY_QCOM_SNPS_EUSB2 is not set # CONFIG_PHY_QCOM_USB_HS_28NM is not set # CONFIG_PHY_QCOM_USB_HSIC is not set diff --git a/kernel-aarch64-rt-debug-rhel.config b/kernel-aarch64-rt-debug-rhel.config index 29076fc..fd10668 100644 --- a/kernel-aarch64-rt-debug-rhel.config +++ b/kernel-aarch64-rt-debug-rhel.config @@ -4352,6 +4352,7 @@ CONFIG_PHY_NS2_USB_DRD=y # CONFIG_PHY_QCOM_PCIE2 is not set # CONFIG_PHY_QCOM_QMP is not set # CONFIG_PHY_QCOM_QUSB2 is not set +# CONFIG_PHY_QCOM_SGMII_ETH is not set # CONFIG_PHY_QCOM_SNPS_EUSB2 is not set # CONFIG_PHY_QCOM_USB_HS_28NM is not set # CONFIG_PHY_QCOM_USB_HSIC is not set diff --git a/kernel-aarch64-rt-rhel.config b/kernel-aarch64-rt-rhel.config index 3677d0d..542a3a1 100644 --- a/kernel-aarch64-rt-rhel.config +++ b/kernel-aarch64-rt-rhel.config @@ -4330,6 +4330,7 @@ CONFIG_PHY_NS2_USB_DRD=y # CONFIG_PHY_QCOM_PCIE2 is not set # CONFIG_PHY_QCOM_QMP is not set # CONFIG_PHY_QCOM_QUSB2 is not set +# CONFIG_PHY_QCOM_SGMII_ETH is not set # CONFIG_PHY_QCOM_SNPS_EUSB2 is not set # CONFIG_PHY_QCOM_USB_HS_28NM is not set # CONFIG_PHY_QCOM_USB_HSIC is not set diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index c00c9ab..c5c5a4f 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -3888,6 +3888,7 @@ CONFIG_PHYLIB=y # CONFIG_PHY_QCOM_IPQ806X_USB is not set # CONFIG_PHY_QCOM_QMP is not set # CONFIG_PHY_QCOM_QUSB2 is not set +# CONFIG_PHY_QCOM_SGMII_ETH is not set # CONFIG_PHY_QCOM_SNPS_EUSB2 is not set # CONFIG_PHY_QCOM_USB_HS_28NM is not set # CONFIG_PHY_QCOM_USB_HSIC is not set diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index d63ac86..198d1e1 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -3868,6 +3868,7 @@ CONFIG_PHYLIB=y # CONFIG_PHY_QCOM_IPQ806X_USB is not set # CONFIG_PHY_QCOM_QMP is not set # CONFIG_PHY_QCOM_QUSB2 is not set +# CONFIG_PHY_QCOM_SGMII_ETH is not set # CONFIG_PHY_QCOM_SNPS_EUSB2 is not set # CONFIG_PHY_QCOM_USB_HS_28NM is not set # CONFIG_PHY_QCOM_USB_HSIC is not set diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index 14ef4cc..8ec8da9 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -3876,6 +3876,7 @@ CONFIG_PHY_BCM_SR_USB=m # CONFIG_PHY_QCOM_IPQ806X_USB is not set # CONFIG_PHY_QCOM_QMP is not set # CONFIG_PHY_QCOM_QUSB2 is not set +# CONFIG_PHY_QCOM_SGMII_ETH is not set # CONFIG_PHY_QCOM_SNPS_EUSB2 is not set # CONFIG_PHY_QCOM_USB_HS_28NM is not set # CONFIG_PHY_QCOM_USB_HSIC is not set diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 01bb266..8ed9877 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -3856,6 +3856,7 @@ CONFIG_PHY_BCM_SR_USB=m # CONFIG_PHY_QCOM_IPQ806X_USB is not set # CONFIG_PHY_QCOM_QMP is not set # CONFIG_PHY_QCOM_QUSB2 is not set +# CONFIG_PHY_QCOM_SGMII_ETH is not set # CONFIG_PHY_QCOM_SNPS_EUSB2 is not set # CONFIG_PHY_QCOM_USB_HS_28NM is not set # CONFIG_PHY_QCOM_USB_HSIC is not set diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 76276dd..10fc6d9 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -3871,6 +3871,7 @@ CONFIG_PHY_BCM_SR_USB=m # CONFIG_PHY_QCOM_IPQ806X_USB is not set # CONFIG_PHY_QCOM_QMP is not set # CONFIG_PHY_QCOM_QUSB2 is not set +# CONFIG_PHY_QCOM_SGMII_ETH is not set # CONFIG_PHY_QCOM_SNPS_EUSB2 is not set # CONFIG_PHY_QCOM_USB_HS_28NM is not set # CONFIG_PHY_QCOM_USB_HSIC is not set diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index b69bc3d..0ae440d 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -4092,6 +4092,7 @@ CONFIG_PHYLINK=m # CONFIG_PHY_QCOM_IPQ806X_USB is not set # CONFIG_PHY_QCOM_QMP is not set # CONFIG_PHY_QCOM_QUSB2 is not set +# CONFIG_PHY_QCOM_SGMII_ETH is not set # CONFIG_PHY_QCOM_SNPS_EUSB2 is not set # CONFIG_PHY_QCOM_USB_HS_28NM is not set # CONFIG_PHY_QCOM_USB_HSIC is not set diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 5c27b81..9a61fbb 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -4072,6 +4072,7 @@ CONFIG_PHYLINK=m # CONFIG_PHY_QCOM_IPQ806X_USB is not set # CONFIG_PHY_QCOM_QMP is not set # CONFIG_PHY_QCOM_QUSB2 is not set +# CONFIG_PHY_QCOM_SGMII_ETH is not set # CONFIG_PHY_QCOM_SNPS_EUSB2 is not set # CONFIG_PHY_QCOM_USB_HS_28NM is not set # CONFIG_PHY_QCOM_USB_HSIC is not set diff --git a/kernel-x86_64-rt-debug-rhel.config b/kernel-x86_64-rt-debug-rhel.config index 24e3bd2..fd90e62 100644 --- a/kernel-x86_64-rt-debug-rhel.config +++ b/kernel-x86_64-rt-debug-rhel.config @@ -4171,6 +4171,7 @@ CONFIG_PHYLINK=m # CONFIG_PHY_QCOM_IPQ806X_USB is not set # CONFIG_PHY_QCOM_QMP is not set # CONFIG_PHY_QCOM_QUSB2 is not set +# CONFIG_PHY_QCOM_SGMII_ETH is not set # CONFIG_PHY_QCOM_SNPS_EUSB2 is not set # CONFIG_PHY_QCOM_USB_HS_28NM is not set # CONFIG_PHY_QCOM_USB_HSIC is not set diff --git a/kernel-x86_64-rt-rhel.config b/kernel-x86_64-rt-rhel.config index d0dd92c..b9d4478 100644 --- a/kernel-x86_64-rt-rhel.config +++ b/kernel-x86_64-rt-rhel.config @@ -4151,6 +4151,7 @@ CONFIG_PHYLINK=m # CONFIG_PHY_QCOM_IPQ806X_USB is not set # CONFIG_PHY_QCOM_QMP is not set # CONFIG_PHY_QCOM_QUSB2 is not set +# CONFIG_PHY_QCOM_SGMII_ETH is not set # CONFIG_PHY_QCOM_SNPS_EUSB2 is not set # CONFIG_PHY_QCOM_USB_HS_28NM is not set # CONFIG_PHY_QCOM_USB_HSIC is not set diff --git a/kernel.spec b/kernel.spec index 820807b..bbbb89e 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 348 +%define pkgrelease 349 %define kversion 5 -%define tarfile_release 5.14.0-348.el9 +%define tarfile_release 5.14.0-349.el9 # This is needed to do merge window version magic %define patchlevel 14 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 348%{?buildid}%{?dist} +%define specrelease 349%{?buildid}%{?dist} # This defines the kabi tarball version -%define kabiversion 5.14.0-348.el9 +%define kabiversion 5.14.0-349.el9 # # End of genspec.sh variables @@ -3698,6 +3698,45 @@ fi # # %changelog +* Wed Aug 02 2023 Jan Stancek [5.14.0-349.el9] +- x86/speculation: Allow enabling STIBP with legacy IBRS (Ricardo Robaina) [2187269] {CVE-2023-1998} +- gfs2: retry interrupted internal reads (Andreas Gruenbacher) [2192392] +- gfs2: ignore rindex_update failure in dinode_dealloc (Bob Peterson) [2192392] +- selinux: make labeled NFS work when mounted before policy load (Juraj Marcin) [2218207] +- redhat/configs: Disable new PHY_QCOM_SGMII_ETH config (Andrew Halaney) [RHEL-799] +- arm64: dts: qcom: sa8775p-ride: enable ethernet0 (Andrew Halaney) [RHEL-799] +- arm64: dts: qcom: sa8775p-ride: add pin functions for ethernet0 (Andrew Halaney) [RHEL-799] +- arm64: dts: qcom: sa8775p-ride: enable the SerDes PHY (Andrew Halaney) [RHEL-799] +- arm64: dts: qcom: sa8775p: add the first 1Gb ethernet interface (Andrew Halaney) [RHEL-799] +- arm64: dts: qcom: sa8775p: add the SGMII PHY node (Andrew Halaney) [RHEL-799] +- phy: qcom: add the SGMII SerDes PHY driver (Andrew Halaney) [RHEL-799] +- phy: qualcomm: fix indentation in Makefile (Andrew Halaney) [RHEL-799] +- net: stmmac: fix double serdes powerdown (Andrew Halaney) [RHEL-799] +- net: stmmac: dwmac-qcom-ethqos: add support for emac4 on sa8775p platforms (Andrew Halaney) [RHEL-799] +- net: stmmac: add new switch to struct plat_stmmacenet_data (Andrew Halaney) [RHEL-799] +- net: stmmac: dwmac-qcom-ethqos: add support for SGMII (Andrew Halaney) [RHEL-799] +- net: stmmac: dwmac-qcom-ethqos: prepare the driver for more PHY modes (Andrew Halaney) [RHEL-799] +- net: stmmac: dwmac-qcom-ethqos: add support for the phyaux clock (Andrew Halaney) [RHEL-799] +- net: stmmac: dwmac-qcom-ethqos: add support for the optional serdes phy (Andrew Halaney) [RHEL-799] +- net: stmmac: dwmac-qcom-ethqos: remove stray space (Andrew Halaney) [RHEL-799] +- net: stmmac: dwmac-qcom-ethqos: add a newline between headers (Andrew Halaney) [RHEL-799] +- net: stmmac: dwmac-qcom-ethqos: add missing include (Andrew Halaney) [RHEL-799] +- net: stmmac: dwmac-qcom-ethqos: use a helper variable for &pdev->dev (Andrew Halaney) [RHEL-799] +- net: stmmac: dwmac-qcom-ethqos: tweak the order of local variables (Andrew Halaney) [RHEL-799] +- net: stmmac: dwmac-qcom-ethqos: rename a label in probe() (Andrew Halaney) [RHEL-799] +- net: stmmac: dwmac-qcom-ethqos: shrink clock code with devres (Andrew Halaney) [RHEL-799] +- net: stmmac: dwmac-qcom-ethqos: fix a regression on EMAC < 3 (Andrew Halaney) [RHEL-799] +- Revert "NFSv4: Retry LOCK on OLD_STATEID during delegation return" (Benjamin Coddington) [2217659] +- ACPI: sleep: Avoid breaking S3 wakeup due to might_sleep() (Mark Langsdorf) [2215972] +- fs: dlm: fix mismatch of plock results from userspace (Alexander Aring) [2192751] +- fs: dlm: make F_SETLK use unkillable wait_event (Alexander Aring) [2204519] +- fs: dlm: interrupt posix locks only when process is killed (Alexander Aring) [2192746] +- fs: dlm: fix cleanup pending ops when interrupted (Alexander Aring) [2192744] +- fs: dlm: return positive pid value for F_GETLK (Alexander Aring) [2192747] +- vmstat: skip periodic vmstat update for isolated CPUs (Marcelo Tosatti) [2118482] +- memcg: do not drain charge pcp caches on remote isolated cpus (Marcelo Tosatti) [2118482] +- sched/isolation: add cpu_is_isolated() API (Marcelo Tosatti) [2118482] + * Mon Jul 31 2023 Jan Stancek [5.14.0-348.el9] - i2c: tegra: Fix PEC support for SMBUS block read (Steve Best) [2214531] - perf: arm_cspmu: Add missing MODULE_DEVICE_TABLE (Steve Best) [2224685] diff --git a/sources b/sources index 02f7bd3..be78259 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-5.14.0-348.el9.tar.xz) = d17ec8daea67491c5ec3487d6a29149a655073c55211a9cd367ca8d550325c32eca907d2b54e8e189f090eb32f78b7a28bfa185ed8a9f98428279dc9d1a9d205 -SHA512 (kernel-abi-stablelists-5.14.0-348.el9.tar.bz2) = 4f918c9b9475e8ddfca8f253ceaece76f1c1df80a21c0b9ee0f45337aac2a0b0b56e8f57cda9eed5286618f439bf83904c96af5a575a5a1c00e291766da75913 -SHA512 (kernel-kabi-dw-5.14.0-348.el9.tar.bz2) = 119e820407c58c1868a04aa69c969a881bd672f0f7111a8b382a7369bc89e57667faab180be0b4932dbfbfeb25267787c56fb155dba1ccb244922a7a130d187b +SHA512 (linux-5.14.0-349.el9.tar.xz) = a5d2c2d277b80164318efaa561000aa2be76349a04fc1d690766cc30385dfffa9e88d8aa5ee7a477b502cd24e4ae642d3f6c5a08cd8bee0e62790ce719e3b2ec +SHA512 (kernel-abi-stablelists-5.14.0-349.el9.tar.bz2) = 09ae8990255d4fa0e4e8ef9526c4c5e3e25b7206da6aa07bcdec54d72e3b515c520b3a9a89413eee70d614f3ec5e49d2deb3ebb10cbdb1e178765f469662a064 +SHA512 (kernel-kabi-dw-5.14.0-349.el9.tar.bz2) = 119e820407c58c1868a04aa69c969a881bd672f0f7111a8b382a7369bc89e57667faab180be0b4932dbfbfeb25267787c56fb155dba1ccb244922a7a130d187b