From d8cc5d5c73e7d50efbac33bef1659dc163141201 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Wed, 24 Jul 2024 10:30:13 -0600 Subject: [PATCH] kernel-6.11.0-0.rc0.20240724git786c8248dbd3.12 * Wed Jul 24 2024 Fedora Kernel Team [6.11.0-0.rc0.786c8248dbd3.12] - fedora: disable CONFIG_DRM_WERROR (Patrick Talbert) Resolves: Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- kernel-aarch64-16k-debug-fedora.config | 2 ++ kernel-aarch64-16k-fedora.config | 2 ++ kernel-aarch64-64k-debug-rhel.config | 2 ++ kernel-aarch64-64k-rhel.config | 2 ++ kernel-aarch64-debug-fedora.config | 2 ++ kernel-aarch64-debug-rhel.config | 2 ++ kernel-aarch64-fedora.config | 2 ++ kernel-aarch64-rhel.config | 2 ++ kernel-aarch64-rt-debug-rhel.config | 2 ++ kernel-aarch64-rt-rhel.config | 2 ++ kernel-ppc64le-debug-fedora.config | 2 ++ kernel-ppc64le-debug-rhel.config | 2 ++ kernel-ppc64le-fedora.config | 2 ++ kernel-ppc64le-rhel.config | 2 ++ kernel-s390x-debug-fedora.config | 2 ++ kernel-s390x-debug-rhel.config | 2 ++ kernel-s390x-fedora.config | 2 ++ kernel-s390x-rhel.config | 2 ++ kernel-s390x-zfcpdump-rhel.config | 2 ++ kernel-x86_64-debug-fedora.config | 2 ++ kernel-x86_64-debug-rhel.config | 2 ++ kernel-x86_64-fedora.config | 2 ++ kernel-x86_64-rhel.config | 2 ++ kernel-x86_64-rt-debug-rhel.config | 2 ++ kernel-x86_64-rt-rhel.config | 2 ++ kernel.changelog | 6 +++++- kernel.spec | 11 +++++++---- patch-6.11-redhat.patch | 24 ++++++++++++------------ sources | 6 +++--- 30 files changed, 78 insertions(+), 21 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 7f148a411..3606a7785 100644 --- a/Makefile.rhelver +++ b/Makefile.rhelver @@ -12,7 +12,7 @@ RHEL_MINOR = 99 # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -RHEL_RELEASE = 11 +RHEL_RELEASE = 12 # # RHEL_REBASE_NUM diff --git a/kernel-aarch64-16k-debug-fedora.config b/kernel-aarch64-16k-debug-fedora.config index c6ac5787e..bd40f02a8 100644 --- a/kernel-aarch64-16k-debug-fedora.config +++ b/kernel-aarch64-16k-debug-fedora.config @@ -756,6 +756,7 @@ CONFIG_BATTERY_GAUGE_LTC2941=m # CONFIG_BATTERY_GOLDFISH is not set CONFIG_BATTERY_MAX17040=m CONFIG_BATTERY_MAX17042=m +# CONFIG_BATTERY_MAX1720X is not set # CONFIG_BATTERY_MAX1721X is not set # CONFIG_BATTERY_PM8916_BMS_VM is not set CONFIG_BATTERY_QCOM_BATTMGR=m @@ -6367,6 +6368,7 @@ CONFIG_QCOM_CLK_SMD_RPM=m CONFIG_QCOM_COINCELL=m CONFIG_QCOM_COMMAND_DB=y CONFIG_QCOM_CPR=m +# CONFIG_QCOM_CPUCP_MBOX is not set # CONFIG_QCOM_EBI2 is not set # CONFIG_QCOM_EMAC is not set # CONFIG_QCOM_FALKOR_ERRATUM_1003 is not set diff --git a/kernel-aarch64-16k-fedora.config b/kernel-aarch64-16k-fedora.config index bf58e5420..f782c07c1 100644 --- a/kernel-aarch64-16k-fedora.config +++ b/kernel-aarch64-16k-fedora.config @@ -756,6 +756,7 @@ CONFIG_BATTERY_GAUGE_LTC2941=m # CONFIG_BATTERY_GOLDFISH is not set CONFIG_BATTERY_MAX17040=m CONFIG_BATTERY_MAX17042=m +# CONFIG_BATTERY_MAX1720X is not set # CONFIG_BATTERY_MAX1721X is not set # CONFIG_BATTERY_PM8916_BMS_VM is not set CONFIG_BATTERY_QCOM_BATTMGR=m @@ -6340,6 +6341,7 @@ CONFIG_QCOM_CLK_SMD_RPM=m CONFIG_QCOM_COINCELL=m CONFIG_QCOM_COMMAND_DB=y CONFIG_QCOM_CPR=m +# CONFIG_QCOM_CPUCP_MBOX is not set # CONFIG_QCOM_EBI2 is not set # CONFIG_QCOM_EMAC is not set # CONFIG_QCOM_FALKOR_ERRATUM_1003 is not set diff --git a/kernel-aarch64-64k-debug-rhel.config b/kernel-aarch64-64k-debug-rhel.config index cd7169c3d..48d035f41 100644 --- a/kernel-aarch64-64k-debug-rhel.config +++ b/kernel-aarch64-64k-debug-rhel.config @@ -555,6 +555,7 @@ CONFIG_BASE_FULL=y # CONFIG_BATTERY_GOLDFISH is not set # CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17042 is not set +# CONFIG_BATTERY_MAX1720X is not set # CONFIG_BATTERY_RT5033 is not set # CONFIG_BATTERY_SAMSUNG_SDI is not set # CONFIG_BATTERY_SBS is not set @@ -5163,6 +5164,7 @@ CONFIG_PWRSEQ_SIMPLE=m # CONFIG_QCOM_BAM_DMA is not set # CONFIG_QCOM_COMMAND_DB is not set # CONFIG_QCOM_CPR is not set +# CONFIG_QCOM_CPUCP_MBOX is not set # CONFIG_QCOM_EBI2 is not set CONFIG_QCOM_EMAC=m CONFIG_QCOM_FALKOR_ERRATUM_1003=y diff --git a/kernel-aarch64-64k-rhel.config b/kernel-aarch64-64k-rhel.config index 1593af4db..73364aa88 100644 --- a/kernel-aarch64-64k-rhel.config +++ b/kernel-aarch64-64k-rhel.config @@ -555,6 +555,7 @@ CONFIG_BASE_FULL=y # CONFIG_BATTERY_GOLDFISH is not set # CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17042 is not set +# CONFIG_BATTERY_MAX1720X is not set # CONFIG_BATTERY_RT5033 is not set # CONFIG_BATTERY_SAMSUNG_SDI is not set # CONFIG_BATTERY_SBS is not set @@ -5140,6 +5141,7 @@ CONFIG_PWRSEQ_SIMPLE=m # CONFIG_QCOM_BAM_DMA is not set # CONFIG_QCOM_COMMAND_DB is not set # CONFIG_QCOM_CPR is not set +# CONFIG_QCOM_CPUCP_MBOX is not set # CONFIG_QCOM_EBI2 is not set CONFIG_QCOM_EMAC=m CONFIG_QCOM_FALKOR_ERRATUM_1003=y diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index db4a85e60..965bcbbc8 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -756,6 +756,7 @@ CONFIG_BATTERY_GAUGE_LTC2941=m # CONFIG_BATTERY_GOLDFISH is not set CONFIG_BATTERY_MAX17040=m CONFIG_BATTERY_MAX17042=m +# CONFIG_BATTERY_MAX1720X is not set # CONFIG_BATTERY_MAX1721X is not set # CONFIG_BATTERY_PM8916_BMS_VM is not set CONFIG_BATTERY_QCOM_BATTMGR=m @@ -6366,6 +6367,7 @@ CONFIG_QCOM_CLK_SMD_RPM=m CONFIG_QCOM_COINCELL=m CONFIG_QCOM_COMMAND_DB=y CONFIG_QCOM_CPR=m +# CONFIG_QCOM_CPUCP_MBOX is not set # CONFIG_QCOM_EBI2 is not set # CONFIG_QCOM_EMAC is not set # CONFIG_QCOM_FALKOR_ERRATUM_1003 is not set diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 1a3f51571..8d57bc66c 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -553,6 +553,7 @@ CONFIG_BASE_FULL=y # CONFIG_BATTERY_GOLDFISH is not set # CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17042 is not set +# CONFIG_BATTERY_MAX1720X is not set # CONFIG_BATTERY_RT5033 is not set # CONFIG_BATTERY_SAMSUNG_SDI is not set # CONFIG_BATTERY_SBS is not set @@ -5159,6 +5160,7 @@ CONFIG_PWRSEQ_SIMPLE=m # CONFIG_QCOM_BAM_DMA is not set # CONFIG_QCOM_COMMAND_DB is not set # CONFIG_QCOM_CPR is not set +# CONFIG_QCOM_CPUCP_MBOX is not set # CONFIG_QCOM_EBI2 is not set CONFIG_QCOM_EMAC=m CONFIG_QCOM_FALKOR_ERRATUM_1003=y diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 61bea4ca7..d2cbbe60f 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -756,6 +756,7 @@ CONFIG_BATTERY_GAUGE_LTC2941=m # CONFIG_BATTERY_GOLDFISH is not set CONFIG_BATTERY_MAX17040=m CONFIG_BATTERY_MAX17042=m +# CONFIG_BATTERY_MAX1720X is not set # CONFIG_BATTERY_MAX1721X is not set # CONFIG_BATTERY_PM8916_BMS_VM is not set CONFIG_BATTERY_QCOM_BATTMGR=m @@ -6339,6 +6340,7 @@ CONFIG_QCOM_CLK_SMD_RPM=m CONFIG_QCOM_COINCELL=m CONFIG_QCOM_COMMAND_DB=y CONFIG_QCOM_CPR=m +# CONFIG_QCOM_CPUCP_MBOX is not set # CONFIG_QCOM_EBI2 is not set # CONFIG_QCOM_EMAC is not set # CONFIG_QCOM_FALKOR_ERRATUM_1003 is not set diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index f69bb1269..d3a5f4326 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -553,6 +553,7 @@ CONFIG_BASE_FULL=y # CONFIG_BATTERY_GOLDFISH is not set # CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17042 is not set +# CONFIG_BATTERY_MAX1720X is not set # CONFIG_BATTERY_RT5033 is not set # CONFIG_BATTERY_SAMSUNG_SDI is not set # CONFIG_BATTERY_SBS is not set @@ -5136,6 +5137,7 @@ CONFIG_PWRSEQ_SIMPLE=m # CONFIG_QCOM_BAM_DMA is not set # CONFIG_QCOM_COMMAND_DB is not set # CONFIG_QCOM_CPR is not set +# CONFIG_QCOM_CPUCP_MBOX is not set # CONFIG_QCOM_EBI2 is not set CONFIG_QCOM_EMAC=m CONFIG_QCOM_FALKOR_ERRATUM_1003=y diff --git a/kernel-aarch64-rt-debug-rhel.config b/kernel-aarch64-rt-debug-rhel.config index 51041e897..5b1bfbb98 100644 --- a/kernel-aarch64-rt-debug-rhel.config +++ b/kernel-aarch64-rt-debug-rhel.config @@ -553,6 +553,7 @@ CONFIG_BASE_FULL=y # CONFIG_BATTERY_GOLDFISH is not set # CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17042 is not set +# CONFIG_BATTERY_MAX1720X is not set # CONFIG_BATTERY_RT5033 is not set # CONFIG_BATTERY_SAMSUNG_SDI is not set # CONFIG_BATTERY_SBS is not set @@ -5203,6 +5204,7 @@ CONFIG_PWRSEQ_SIMPLE=m # CONFIG_QCOM_BAM_DMA is not set # CONFIG_QCOM_COMMAND_DB is not set # CONFIG_QCOM_CPR is not set +# CONFIG_QCOM_CPUCP_MBOX is not set # CONFIG_QCOM_EBI2 is not set CONFIG_QCOM_EMAC=m CONFIG_QCOM_FALKOR_ERRATUM_1003=y diff --git a/kernel-aarch64-rt-rhel.config b/kernel-aarch64-rt-rhel.config index 6b83299dd..bed5d5569 100644 --- a/kernel-aarch64-rt-rhel.config +++ b/kernel-aarch64-rt-rhel.config @@ -553,6 +553,7 @@ CONFIG_BASE_FULL=y # CONFIG_BATTERY_GOLDFISH is not set # CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17042 is not set +# CONFIG_BATTERY_MAX1720X is not set # CONFIG_BATTERY_RT5033 is not set # CONFIG_BATTERY_SAMSUNG_SDI is not set # CONFIG_BATTERY_SBS is not set @@ -5180,6 +5181,7 @@ CONFIG_PWRSEQ_SIMPLE=m # CONFIG_QCOM_BAM_DMA is not set # CONFIG_QCOM_COMMAND_DB is not set # CONFIG_QCOM_CPR is not set +# CONFIG_QCOM_CPUCP_MBOX is not set # CONFIG_QCOM_EBI2 is not set CONFIG_QCOM_EMAC=m CONFIG_QCOM_FALKOR_ERRATUM_1003=y diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index d1949463c..fb3693f4b 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -486,6 +486,7 @@ CONFIG_BATTERY_CW2015=m # CONFIG_BATTERY_GOLDFISH is not set # CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17042 is not set +# CONFIG_BATTERY_MAX1720X is not set # CONFIG_BATTERY_MAX1721X is not set CONFIG_BATTERY_RT5033=m CONFIG_BATTERY_SAMSUNG_SDI=y @@ -5224,6 +5225,7 @@ CONFIG_QCA808X_PHY=m CONFIG_QCA83XX_PHY=m # CONFIG_QCOM_A7PLL is not set # CONFIG_QCOM_CPR is not set +# CONFIG_QCOM_CPUCP_MBOX is not set # CONFIG_QCOM_EMAC is not set # CONFIG_QCOM_GPI_DMA is not set # CONFIG_QCOM_HIDMA is not set diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index a5e042434..348e8a24c 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -414,6 +414,7 @@ CONFIG_BASE_FULL=y # CONFIG_BATTERY_GOLDFISH is not set # CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17042 is not set +# CONFIG_BATTERY_MAX1720X is not set # CONFIG_BATTERY_RT5033 is not set # CONFIG_BATTERY_SAMSUNG_SDI is not set # CONFIG_BATTERY_SBS is not set @@ -4757,6 +4758,7 @@ CONFIG_PWM=y # CONFIG_QCOM_APCS_IPC is not set # CONFIG_QCOM_COMMAND_DB is not set # CONFIG_QCOM_CPR is not set +# CONFIG_QCOM_CPUCP_MBOX is not set # CONFIG_QCOM_EBI2 is not set # CONFIG_QCOM_GENI_SE is not set # CONFIG_QCOM_GPI_DMA is not set diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index b8e647951..f15d487fd 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -484,6 +484,7 @@ CONFIG_BATTERY_CW2015=m # CONFIG_BATTERY_GOLDFISH is not set # CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17042 is not set +# CONFIG_BATTERY_MAX1720X is not set # CONFIG_BATTERY_MAX1721X is not set CONFIG_BATTERY_RT5033=m CONFIG_BATTERY_SAMSUNG_SDI=y @@ -5195,6 +5196,7 @@ CONFIG_QCA808X_PHY=m CONFIG_QCA83XX_PHY=m # CONFIG_QCOM_A7PLL is not set # CONFIG_QCOM_CPR is not set +# CONFIG_QCOM_CPUCP_MBOX is not set # CONFIG_QCOM_EMAC is not set # CONFIG_QCOM_GPI_DMA is not set # CONFIG_QCOM_HIDMA is not set diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index 20673c954..097414625 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -414,6 +414,7 @@ CONFIG_BASE_FULL=y # CONFIG_BATTERY_GOLDFISH is not set # CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17042 is not set +# CONFIG_BATTERY_MAX1720X is not set # CONFIG_BATTERY_RT5033 is not set # CONFIG_BATTERY_SAMSUNG_SDI is not set # CONFIG_BATTERY_SBS is not set @@ -4736,6 +4737,7 @@ CONFIG_PWM=y # CONFIG_QCOM_APCS_IPC is not set # CONFIG_QCOM_COMMAND_DB is not set # CONFIG_QCOM_CPR is not set +# CONFIG_QCOM_CPUCP_MBOX is not set # CONFIG_QCOM_EBI2 is not set # CONFIG_QCOM_GENI_SE is not set # CONFIG_QCOM_GPI_DMA is not set diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 10c989e64..4b541862f 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -491,6 +491,7 @@ CONFIG_BATTERY_CW2015=m # CONFIG_BATTERY_GOLDFISH is not set # CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17042 is not set +# CONFIG_BATTERY_MAX1720X is not set # CONFIG_BATTERY_MAX1721X is not set CONFIG_BATTERY_RT5033=m CONFIG_BATTERY_SAMSUNG_SDI=y @@ -5141,6 +5142,7 @@ CONFIG_QCA808X_PHY=m CONFIG_QCA83XX_PHY=m # CONFIG_QCOM_A7PLL is not set # CONFIG_QCOM_CPR is not set +# CONFIG_QCOM_CPUCP_MBOX is not set # CONFIG_QCOM_EMAC is not set # CONFIG_QCOM_GPI_DMA is not set # CONFIG_QCOM_HIDMA is not set diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index b70e65fe6..063ee750e 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -413,6 +413,7 @@ CONFIG_BASE_FULL=y # CONFIG_BATTERY_GOLDFISH is not set # CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17042 is not set +# CONFIG_BATTERY_MAX1720X is not set # CONFIG_BATTERY_RT5033 is not set # CONFIG_BATTERY_SAMSUNG_SDI is not set # CONFIG_BATTERY_SBS is not set @@ -4690,6 +4691,7 @@ CONFIG_PWRSEQ_SIMPLE=m # CONFIG_QCOM_APCS_IPC is not set # CONFIG_QCOM_COMMAND_DB is not set # CONFIG_QCOM_CPR is not set +# CONFIG_QCOM_CPUCP_MBOX is not set # CONFIG_QCOM_EBI2 is not set # CONFIG_QCOM_GENI_SE is not set # CONFIG_QCOM_GPI_DMA is not set diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index a0c8f347c..7a300b09d 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -489,6 +489,7 @@ CONFIG_BATTERY_CW2015=m # CONFIG_BATTERY_GOLDFISH is not set # CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17042 is not set +# CONFIG_BATTERY_MAX1720X is not set # CONFIG_BATTERY_MAX1721X is not set CONFIG_BATTERY_RT5033=m CONFIG_BATTERY_SAMSUNG_SDI=y @@ -5112,6 +5113,7 @@ CONFIG_QCA808X_PHY=m CONFIG_QCA83XX_PHY=m # CONFIG_QCOM_A7PLL is not set # CONFIG_QCOM_CPR is not set +# CONFIG_QCOM_CPUCP_MBOX is not set # CONFIG_QCOM_EMAC is not set # CONFIG_QCOM_GPI_DMA is not set # CONFIG_QCOM_HIDMA is not set diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 0c22f811c..1751607db 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -413,6 +413,7 @@ CONFIG_BASE_FULL=y # CONFIG_BATTERY_GOLDFISH is not set # CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17042 is not set +# CONFIG_BATTERY_MAX1720X is not set # CONFIG_BATTERY_RT5033 is not set # CONFIG_BATTERY_SAMSUNG_SDI is not set # CONFIG_BATTERY_SBS is not set @@ -4669,6 +4670,7 @@ CONFIG_PWRSEQ_SIMPLE=m # CONFIG_QCOM_APCS_IPC is not set # CONFIG_QCOM_COMMAND_DB is not set # CONFIG_QCOM_CPR is not set +# CONFIG_QCOM_CPUCP_MBOX is not set # CONFIG_QCOM_EBI2 is not set # CONFIG_QCOM_GENI_SE is not set # CONFIG_QCOM_GPI_DMA is not set diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 3ae50e96f..96d09fe95 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -414,6 +414,7 @@ CONFIG_BASE_FULL=y # CONFIG_BATTERY_GOLDFISH is not set # CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17042 is not set +# CONFIG_BATTERY_MAX1720X is not set # CONFIG_BATTERY_RT5033 is not set # CONFIG_BATTERY_SAMSUNG_SDI is not set # CONFIG_BATTERY_SBS is not set @@ -4681,6 +4682,7 @@ CONFIG_PWRSEQ_SIMPLE=m # CONFIG_QCOM_APCS_IPC is not set # CONFIG_QCOM_COMMAND_DB is not set # CONFIG_QCOM_CPR is not set +# CONFIG_QCOM_CPUCP_MBOX is not set # CONFIG_QCOM_EBI2 is not set # CONFIG_QCOM_GENI_SE is not set # CONFIG_QCOM_GPI_DMA is not set diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 3be931fd2..a5f6fbf0d 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -542,6 +542,7 @@ CONFIG_BATTERY_CW2015=m # CONFIG_BATTERY_GOLDFISH is not set # CONFIG_BATTERY_MAX17040 is not set CONFIG_BATTERY_MAX17042=m +# CONFIG_BATTERY_MAX1720X is not set # CONFIG_BATTERY_MAX1721X is not set CONFIG_BATTERY_RT5033=m CONFIG_BATTERY_SAMSUNG_SDI=y @@ -5637,6 +5638,7 @@ CONFIG_QCA808X_PHY=m CONFIG_QCA83XX_PHY=m # CONFIG_QCOM_A7PLL is not set # CONFIG_QCOM_CPR is not set +# CONFIG_QCOM_CPUCP_MBOX is not set # CONFIG_QCOM_EMAC is not set # CONFIG_QCOM_GPI_DMA is not set # CONFIG_QCOM_HIDMA is not set diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 2fe5551ca..e2667777a 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -442,6 +442,7 @@ CONFIG_BASE_FULL=y # CONFIG_BATTERY_GOLDFISH is not set # CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17042 is not set +# CONFIG_BATTERY_MAX1720X is not set # CONFIG_BATTERY_RT5033 is not set # CONFIG_BATTERY_SAMSUNG_SDI is not set # CONFIG_BATTERY_SBS is not set @@ -4978,6 +4979,7 @@ CONFIG_PWRSEQ_SIMPLE=m # CONFIG_QCOM_APCS_IPC is not set # CONFIG_QCOM_COMMAND_DB is not set # CONFIG_QCOM_CPR is not set +# CONFIG_QCOM_CPUCP_MBOX is not set # CONFIG_QCOM_EBI2 is not set # CONFIG_QCOM_GENI_SE is not set # CONFIG_QCOM_GPI_DMA is not set diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 3a5a67f05..beb398335 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -540,6 +540,7 @@ CONFIG_BATTERY_CW2015=m # CONFIG_BATTERY_GOLDFISH is not set # CONFIG_BATTERY_MAX17040 is not set CONFIG_BATTERY_MAX17042=m +# CONFIG_BATTERY_MAX1720X is not set # CONFIG_BATTERY_MAX1721X is not set CONFIG_BATTERY_RT5033=m CONFIG_BATTERY_SAMSUNG_SDI=y @@ -5609,6 +5610,7 @@ CONFIG_QCA808X_PHY=m CONFIG_QCA83XX_PHY=m # CONFIG_QCOM_A7PLL is not set # CONFIG_QCOM_CPR is not set +# CONFIG_QCOM_CPUCP_MBOX is not set # CONFIG_QCOM_EMAC is not set # CONFIG_QCOM_GPI_DMA is not set # CONFIG_QCOM_HIDMA is not set diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 8e6dc621c..990453318 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -442,6 +442,7 @@ CONFIG_BASE_FULL=y # CONFIG_BATTERY_GOLDFISH is not set # CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17042 is not set +# CONFIG_BATTERY_MAX1720X is not set # CONFIG_BATTERY_RT5033 is not set # CONFIG_BATTERY_SAMSUNG_SDI is not set # CONFIG_BATTERY_SBS is not set @@ -4956,6 +4957,7 @@ CONFIG_PWRSEQ_SIMPLE=m # CONFIG_QCOM_APCS_IPC is not set # CONFIG_QCOM_COMMAND_DB is not set # CONFIG_QCOM_CPR is not set +# CONFIG_QCOM_CPUCP_MBOX is not set # CONFIG_QCOM_EBI2 is not set # CONFIG_QCOM_GENI_SE is not set # CONFIG_QCOM_GPI_DMA is not set diff --git a/kernel-x86_64-rt-debug-rhel.config b/kernel-x86_64-rt-debug-rhel.config index 2087944df..10b57cc18 100644 --- a/kernel-x86_64-rt-debug-rhel.config +++ b/kernel-x86_64-rt-debug-rhel.config @@ -442,6 +442,7 @@ CONFIG_BASE_FULL=y # CONFIG_BATTERY_GOLDFISH is not set # CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17042 is not set +# CONFIG_BATTERY_MAX1720X is not set # CONFIG_BATTERY_RT5033 is not set # CONFIG_BATTERY_SAMSUNG_SDI is not set # CONFIG_BATTERY_SBS is not set @@ -5022,6 +5023,7 @@ CONFIG_PWRSEQ_SIMPLE=m # CONFIG_QCOM_APCS_IPC is not set # CONFIG_QCOM_COMMAND_DB is not set # CONFIG_QCOM_CPR is not set +# CONFIG_QCOM_CPUCP_MBOX is not set # CONFIG_QCOM_EBI2 is not set # CONFIG_QCOM_GENI_SE is not set # CONFIG_QCOM_GPI_DMA is not set diff --git a/kernel-x86_64-rt-rhel.config b/kernel-x86_64-rt-rhel.config index e50ddbe0d..de03489f1 100644 --- a/kernel-x86_64-rt-rhel.config +++ b/kernel-x86_64-rt-rhel.config @@ -442,6 +442,7 @@ CONFIG_BASE_FULL=y # CONFIG_BATTERY_GOLDFISH is not set # CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17042 is not set +# CONFIG_BATTERY_MAX1720X is not set # CONFIG_BATTERY_RT5033 is not set # CONFIG_BATTERY_SAMSUNG_SDI is not set # CONFIG_BATTERY_SBS is not set @@ -5000,6 +5001,7 @@ CONFIG_PWRSEQ_SIMPLE=m # CONFIG_QCOM_APCS_IPC is not set # CONFIG_QCOM_COMMAND_DB is not set # CONFIG_QCOM_CPR is not set +# CONFIG_QCOM_CPUCP_MBOX is not set # CONFIG_QCOM_EBI2 is not set # CONFIG_QCOM_GENI_SE is not set # CONFIG_QCOM_GPI_DMA is not set diff --git a/kernel.changelog b/kernel.changelog index 22a972817..68ae78361 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,7 +1,11 @@ -* Tue Jul 23 2024 Fedora Kernel Team [6.11.0-0.rc0.66ebbdfdeb09.11] +* Wed Jul 24 2024 Fedora Kernel Team [6.11.0-0.rc0.786c8248dbd3.12] - fedora: disable CONFIG_DRM_WERROR (Patrick Talbert) Resolves: +* Wed Jul 24 2024 Fedora Kernel Team [6.11.0-0.rc0.786c8248dbd3.11] +- Linux v6.11.0-0.rc0.786c8248dbd3 +Resolves: + * Tue Jul 23 2024 Fedora Kernel Team [6.11.0-0.rc0.66ebbdfdeb09.10] - redhat/configs: enable some RTCs for RHEL on aarch64 (Luiz Capitulino) - redhat/configs: enable some regulators for RHEL (Luiz Capitulino) diff --git a/kernel.spec b/kernel.spec index da5ffa775..651230dbf 100644 --- a/kernel.spec +++ b/kernel.spec @@ -163,13 +163,13 @@ Summary: The Linux kernel %define specrpmversion 6.11.0 %define specversion 6.11.0 %define patchversion 6.11 -%define pkgrelease 0.rc0.20240723git66ebbdfdeb09.11 +%define pkgrelease 0.rc0.20240724git786c8248dbd3.12 %define kversion 6 -%define tarfile_release 6.10-12030-g66ebbdfdeb09 +%define tarfile_release 6.10-12246-g786c8248dbd3 # This is needed to do merge window version magic %define patchlevel 11 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc0.20240723git66ebbdfdeb09.11%{?buildid}%{?dist} +%define specrelease 0.rc0.20240724git786c8248dbd3.12%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.11.0 @@ -4043,9 +4043,12 @@ fi\ # # %changelog -* Tue Jul 23 2024 Fedora Kernel Team [6.11.0-0.rc0.66ebbdfdeb09.11] +* Wed Jul 24 2024 Fedora Kernel Team [6.11.0-0.rc0.786c8248dbd3.12] - fedora: disable CONFIG_DRM_WERROR (Patrick Talbert) +* Wed Jul 24 2024 Fedora Kernel Team [6.11.0-0.rc0.786c8248dbd3.11] +- Linux v6.11.0-0.rc0.786c8248dbd3 + * Tue Jul 23 2024 Fedora Kernel Team [6.11.0-0.rc0.66ebbdfdeb09.10] - redhat/configs: enable some RTCs for RHEL on aarch64 (Luiz Capitulino) - redhat/configs: enable some regulators for RHEL (Luiz Capitulino) diff --git a/patch-6.11-redhat.patch b/patch-6.11-redhat.patch index 4b3645a97..93a06abc3 100644 --- a/patch-6.11-redhat.patch +++ b/patch-6.11-redhat.patch @@ -140,7 +140,7 @@ index 000000000000..7465c78a90e6 + +endmenu diff --git a/Makefile b/Makefile -index 67ce3b7d558e..ad826fc40228 100644 +index 11e74386d909..68674e4bc5aa 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -162,7 +162,7 @@ index 67ce3b7d558e..ad826fc40228 100644 # We are using a recursive build, so we need to do a little thinking # to get the ordering right. # -@@ -1256,7 +1268,13 @@ define filechk_version.h +@@ -1242,7 +1254,13 @@ define filechk_version.h ((c) > 255 ? 255 : (c)))'; \ echo \#define LINUX_VERSION_MAJOR $(VERSION); \ echo \#define LINUX_VERSION_PATCHLEVEL $(PATCHLEVEL); \ @@ -178,7 +178,7 @@ index 67ce3b7d558e..ad826fc40228 100644 $(version_h): private PATCHLEVEL := $(or $(PATCHLEVEL), 0) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index a867a7d967aa..7edebe10afd9 100644 +index 954a1916a500..205966cc405a 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1225,9 +1225,9 @@ config HIGHMEM @@ -194,7 +194,7 @@ index a867a7d967aa..7edebe10afd9 100644 The VM uses one page of physical memory for each page table. For systems with a lot of processes, this can use a lot of diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig -index 79a656a62cbc..826a73eec3fa 100644 +index 7fd70be0463f..417518904abc 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -1355,7 +1355,7 @@ endchoice @@ -2445,10 +2445,10 @@ index 855db460e08b..7a8c28cd7510 100644 #ifdef CONFIG_PERF_EVENTS LSM_HOOK(int, 0, perf_event_open, struct perf_event_attr *attr, int type) diff --git a/include/linux/module.h b/include/linux/module.h -index 4213d8993cd8..64712f2ad077 100644 +index 88ecc5e9f523..bcc0377c716a 100644 --- a/include/linux/module.h +++ b/include/linux/module.h -@@ -418,6 +418,7 @@ struct module { +@@ -424,6 +424,7 @@ struct module { struct module_attribute *modinfo_attrs; const char *version; const char *srcversion; @@ -2456,7 +2456,7 @@ index 4213d8993cd8..64712f2ad077 100644 struct kobject *holders_dir; /* Exported symbols */ -@@ -1001,4 +1002,8 @@ static inline unsigned long find_kallsyms_symbol_value(struct module *mod, +@@ -1007,4 +1008,8 @@ static inline unsigned long find_kallsyms_symbol_value(struct module *mod, #endif /* CONFIG_MODULES && CONFIG_KALLSYMS */ @@ -4214,18 +4214,18 @@ index 000000000000..3ac7e00e0def + +#endif /* __RH_MESSAGES_H */ diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c -index 4b1edb257618..1682422ae3c5 100644 +index d16d0ace2775..e0aab60d74c4 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c -@@ -22,6 +22,7 @@ - #include +@@ -25,6 +25,7 @@ + #include #include "modpost.h" #include "../../include/linux/license.h" +#include "../../include/generated/uapi/linux/version.h" static bool module_enabled; /* Are we using CONFIG_MODVERSIONS? */ -@@ -1982,6 +1983,12 @@ static void write_buf(struct buffer *b, const char *fname) +@@ -1931,6 +1932,12 @@ static void write_buf(struct buffer *b, const char *fname) } } @@ -4238,7 +4238,7 @@ index 4b1edb257618..1682422ae3c5 100644 static void write_if_changed(struct buffer *b, const char *fname) { char *tmp; -@@ -2042,6 +2049,7 @@ static void write_mod_c_file(struct module *mod) +@@ -1991,6 +1998,7 @@ static void write_mod_c_file(struct module *mod) add_depends(&buf, mod); add_moddevtable(&buf, mod); add_srcversion(&buf, mod); diff --git a/sources b/sources index 08d1e4f17..b295a9bc8 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.10-12030-g66ebbdfdeb09.tar.xz) = f9a4028ffbe40aa129f2522591e0f4717191f19e4390dd9effb1af294253af577437dfc2d205ec8abdc0e367e39de74f81b7a1f0ac06b80870993f3b0c85402e -SHA512 (kernel-abi-stablelists-6.11.0.tar.xz) = f49b2249d788d76f94abcfb620d9718b7fcfce0fad1cb8198e69aed36784eb0ac42a0c60438b22fef99f107cec12250e272abb5ac349a991a31e01605debe85a -SHA512 (kernel-kabi-dw-6.11.0.tar.xz) = f5d0d42b060130d596e835963833abc08dc115a79fc6519b8cdc39099c42eb4befda41ebf75be7a6dd53464c0b8eb9fafc8f6de95c16a6f436a29384b65edcd1 +SHA512 (linux-6.10-12246-g786c8248dbd3.tar.xz) = dd1f1c7926bff02bfcb3c2d03715ab2215abe07a57b4399486c7fce7ee9a10785146bcd6f066615e6c9556f2f18525a863aa37c11780b763b8e07e2f4a832ef1 +SHA512 (kernel-abi-stablelists-6.11.0.tar.xz) = e8cc4920c4b020c72db1f975b296b69ba0243dc1a9f8624817e5ccbaa872b9afde1a17544b68decca6959d6465b010a48316ded8091d6bc9a1b8c33144e5e8c3 +SHA512 (kernel-kabi-dw-6.11.0.tar.xz) = 142d4b774c35fabdb1aa7601045184dde92a6392ce0df33208f55a717de05f945a692bb8bb42c3553bf3be749efb439a726e08513a2273eab87122d174d94433