diff --git a/Makefile.rhelver b/Makefile.rhelver index 5ec3fb3a4..5e0fdae4a 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 = 26 +RHEL_RELEASE = 27 # # RHEL_REBASE_NUM diff --git a/Patchlist.changelog b/Patchlist.changelog index 009bec3fd..b169aff89 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,3 +1,6 @@ +https://gitlab.com/cki-project/kernel-ark/-/commit/6ae23a2899f457adcbd4e081dec7a49a62b5ec87 + 6ae23a2899f457adcbd4e081dec7a49a62b5ec87 Add support to rh_waived cmdline boot parameter + https://gitlab.com/cki-project/kernel-ark/-/commit/ea1b0021eef49f13c5a0ccf1e2e1e506a9992250 ea1b0021eef49f13c5a0ccf1e2e1e506a9992250 rh_flags: fix failed when register_sysctl_sz rh_flags_table to kernel diff --git a/kernel-aarch64-64k-debug-rhel.config b/kernel-aarch64-64k-debug-rhel.config index 9d9587a0c..d61c3772e 100644 --- a/kernel-aarch64-64k-debug-rhel.config +++ b/kernel-aarch64-64k-debug-rhel.config @@ -1538,7 +1538,7 @@ CONFIG_DP83867_PHY=m # CONFIG_DP83869_PHY is not set CONFIG_DP83TC811_PHY=m # CONFIG_DP83TD510_PHY is not set -# CONFIG_DP83TG720_PHY is not set +CONFIG_DP83TG720_PHY=m CONFIG_DPAA2_CONSOLE=m # CONFIG_DPM_WATCHDOG is not set # CONFIG_DPOT_DAC is not set @@ -3649,7 +3649,7 @@ CONFIG_MELLANOX_PLATFORM=y # CONFIG_MEM_ALLOC_PROFILING is not set CONFIG_MEMBARRIER=y CONFIG_MEMCG_SWAP=y -# CONFIG_MEMCG_V1 is not set +CONFIG_MEMCG_V1=y CONFIG_MEMCG=y CONFIG_MEMCPY_KUNIT_TEST=m CONFIG_MEMCPY_SLOW_KUNIT_TEST=y @@ -5158,9 +5158,9 @@ CONFIG_PWRSEQ_EMMC=m CONFIG_PWRSEQ_SIMPLE=m # CONFIG_QAT_VFIO_PCI is not set # CONFIG_QCA7000_SPI is not set -# CONFIG_QCA807X_PHY is not set -# CONFIG_QCA808X_PHY is not set -# CONFIG_QCA83XX_PHY is not set +CONFIG_QCA807X_PHY=m +CONFIG_QCA808X_PHY=m +CONFIG_QCA83XX_PHY=m # CONFIG_QCOM_AOSS_QMP is not set # CONFIG_QCOM_APCS_IPC is not set # CONFIG_QCOM_BAM_DMA is not set diff --git a/kernel-aarch64-64k-rhel.config b/kernel-aarch64-64k-rhel.config index a172692af..3d0bcd8d2 100644 --- a/kernel-aarch64-64k-rhel.config +++ b/kernel-aarch64-64k-rhel.config @@ -1530,7 +1530,7 @@ CONFIG_DP83867_PHY=m # CONFIG_DP83869_PHY is not set CONFIG_DP83TC811_PHY=m # CONFIG_DP83TD510_PHY is not set -# CONFIG_DP83TG720_PHY is not set +CONFIG_DP83TG720_PHY=m CONFIG_DPAA2_CONSOLE=m # CONFIG_DPM_WATCHDOG is not set # CONFIG_DPOT_DAC is not set @@ -3628,7 +3628,7 @@ CONFIG_MELLANOX_PLATFORM=y # CONFIG_MEM_ALLOC_PROFILING is not set CONFIG_MEMBARRIER=y CONFIG_MEMCG_SWAP=y -# CONFIG_MEMCG_V1 is not set +CONFIG_MEMCG_V1=y CONFIG_MEMCG=y CONFIG_MEMCPY_KUNIT_TEST=m CONFIG_MEMCPY_SLOW_KUNIT_TEST=y @@ -5135,9 +5135,9 @@ CONFIG_PWRSEQ_EMMC=m CONFIG_PWRSEQ_SIMPLE=m # CONFIG_QAT_VFIO_PCI is not set # CONFIG_QCA7000_SPI is not set -# CONFIG_QCA807X_PHY is not set -# CONFIG_QCA808X_PHY is not set -# CONFIG_QCA83XX_PHY is not set +CONFIG_QCA807X_PHY=m +CONFIG_QCA808X_PHY=m +CONFIG_QCA83XX_PHY=m # CONFIG_QCOM_AOSS_QMP is not set # CONFIG_QCOM_APCS_IPC is not set # CONFIG_QCOM_BAM_DMA is not set diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 82afbd5c9..1408a2f47 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -1536,7 +1536,7 @@ CONFIG_DP83867_PHY=m # CONFIG_DP83869_PHY is not set CONFIG_DP83TC811_PHY=m # CONFIG_DP83TD510_PHY is not set -# CONFIG_DP83TG720_PHY is not set +CONFIG_DP83TG720_PHY=m CONFIG_DPAA2_CONSOLE=m # CONFIG_DPM_WATCHDOG is not set # CONFIG_DPOT_DAC is not set @@ -3646,7 +3646,7 @@ CONFIG_MELLANOX_PLATFORM=y # CONFIG_MEM_ALLOC_PROFILING is not set CONFIG_MEMBARRIER=y CONFIG_MEMCG_SWAP=y -# CONFIG_MEMCG_V1 is not set +CONFIG_MEMCG_V1=y CONFIG_MEMCG=y CONFIG_MEMCPY_KUNIT_TEST=m CONFIG_MEMCPY_SLOW_KUNIT_TEST=y @@ -5154,9 +5154,9 @@ CONFIG_PWRSEQ_EMMC=m CONFIG_PWRSEQ_SIMPLE=m # CONFIG_QAT_VFIO_PCI is not set # CONFIG_QCA7000_SPI is not set -# CONFIG_QCA807X_PHY is not set -# CONFIG_QCA808X_PHY is not set -# CONFIG_QCA83XX_PHY is not set +CONFIG_QCA807X_PHY=m +CONFIG_QCA808X_PHY=m +CONFIG_QCA83XX_PHY=m # CONFIG_QCOM_AOSS_QMP is not set # CONFIG_QCOM_APCS_IPC is not set # CONFIG_QCOM_BAM_DMA is not set diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index b57006b40..0a8a28c7c 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -1528,7 +1528,7 @@ CONFIG_DP83867_PHY=m # CONFIG_DP83869_PHY is not set CONFIG_DP83TC811_PHY=m # CONFIG_DP83TD510_PHY is not set -# CONFIG_DP83TG720_PHY is not set +CONFIG_DP83TG720_PHY=m CONFIG_DPAA2_CONSOLE=m # CONFIG_DPM_WATCHDOG is not set # CONFIG_DPOT_DAC is not set @@ -3625,7 +3625,7 @@ CONFIG_MELLANOX_PLATFORM=y # CONFIG_MEM_ALLOC_PROFILING is not set CONFIG_MEMBARRIER=y CONFIG_MEMCG_SWAP=y -# CONFIG_MEMCG_V1 is not set +CONFIG_MEMCG_V1=y CONFIG_MEMCG=y CONFIG_MEMCPY_KUNIT_TEST=m CONFIG_MEMCPY_SLOW_KUNIT_TEST=y @@ -5131,9 +5131,9 @@ CONFIG_PWRSEQ_EMMC=m CONFIG_PWRSEQ_SIMPLE=m # CONFIG_QAT_VFIO_PCI is not set # CONFIG_QCA7000_SPI is not set -# CONFIG_QCA807X_PHY is not set -# CONFIG_QCA808X_PHY is not set -# CONFIG_QCA83XX_PHY is not set +CONFIG_QCA807X_PHY=m +CONFIG_QCA808X_PHY=m +CONFIG_QCA83XX_PHY=m # CONFIG_QCOM_AOSS_QMP is not set # CONFIG_QCOM_APCS_IPC is not set # CONFIG_QCOM_BAM_DMA is not set diff --git a/kernel-aarch64-rt-debug-rhel.config b/kernel-aarch64-rt-debug-rhel.config index e2441c750..503ff5f03 100644 --- a/kernel-aarch64-rt-debug-rhel.config +++ b/kernel-aarch64-rt-debug-rhel.config @@ -1538,7 +1538,7 @@ CONFIG_DP83867_PHY=m # CONFIG_DP83869_PHY is not set CONFIG_DP83TC811_PHY=m # CONFIG_DP83TD510_PHY is not set -# CONFIG_DP83TG720_PHY is not set +CONFIG_DP83TG720_PHY=m CONFIG_DPAA2_CONSOLE=m # CONFIG_DPM_WATCHDOG is not set # CONFIG_DPOT_DAC is not set @@ -3686,7 +3686,7 @@ CONFIG_MELLANOX_PLATFORM=y # CONFIG_MEM_ALLOC_PROFILING is not set CONFIG_MEMBARRIER=y CONFIG_MEMCG_SWAP=y -# CONFIG_MEMCG_V1 is not set +CONFIG_MEMCG_V1=y CONFIG_MEMCG=y CONFIG_MEMCPY_KUNIT_TEST=m CONFIG_MEMCPY_SLOW_KUNIT_TEST=y @@ -5198,9 +5198,9 @@ CONFIG_PWRSEQ_EMMC=m CONFIG_PWRSEQ_SIMPLE=m # CONFIG_QAT_VFIO_PCI is not set # CONFIG_QCA7000_SPI is not set -# CONFIG_QCA807X_PHY is not set -# CONFIG_QCA808X_PHY is not set -# CONFIG_QCA83XX_PHY is not set +CONFIG_QCA807X_PHY=m +CONFIG_QCA808X_PHY=m +CONFIG_QCA83XX_PHY=m # CONFIG_QCOM_AOSS_QMP is not set # CONFIG_QCOM_APCS_IPC is not set # CONFIG_QCOM_BAM_DMA is not set diff --git a/kernel-aarch64-rt-rhel.config b/kernel-aarch64-rt-rhel.config index c79cc2628..a44d2d47f 100644 --- a/kernel-aarch64-rt-rhel.config +++ b/kernel-aarch64-rt-rhel.config @@ -1530,7 +1530,7 @@ CONFIG_DP83867_PHY=m # CONFIG_DP83869_PHY is not set CONFIG_DP83TC811_PHY=m # CONFIG_DP83TD510_PHY is not set -# CONFIG_DP83TG720_PHY is not set +CONFIG_DP83TG720_PHY=m CONFIG_DPAA2_CONSOLE=m # CONFIG_DPM_WATCHDOG is not set # CONFIG_DPOT_DAC is not set @@ -3665,7 +3665,7 @@ CONFIG_MELLANOX_PLATFORM=y # CONFIG_MEM_ALLOC_PROFILING is not set CONFIG_MEMBARRIER=y CONFIG_MEMCG_SWAP=y -# CONFIG_MEMCG_V1 is not set +CONFIG_MEMCG_V1=y CONFIG_MEMCG=y CONFIG_MEMCPY_KUNIT_TEST=m CONFIG_MEMCPY_SLOW_KUNIT_TEST=y @@ -5175,9 +5175,9 @@ CONFIG_PWRSEQ_EMMC=m CONFIG_PWRSEQ_SIMPLE=m # CONFIG_QAT_VFIO_PCI is not set # CONFIG_QCA7000_SPI is not set -# CONFIG_QCA807X_PHY is not set -# CONFIG_QCA808X_PHY is not set -# CONFIG_QCA83XX_PHY is not set +CONFIG_QCA807X_PHY=m +CONFIG_QCA808X_PHY=m +CONFIG_QCA83XX_PHY=m # CONFIG_QCOM_AOSS_QMP is not set # CONFIG_QCOM_APCS_IPC is not set # CONFIG_QCOM_BAM_DMA is not set diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index 4d2b95f86..55126a6ea 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -1316,7 +1316,7 @@ CONFIG_DP83867_PHY=m # CONFIG_DP83869_PHY is not set CONFIG_DP83TC811_PHY=m # CONFIG_DP83TD510_PHY is not set -# CONFIG_DP83TG720_PHY is not set +CONFIG_DP83TG720_PHY=m # CONFIG_DPM_WATCHDOG is not set # CONFIG_DPOT_DAC is not set # CONFIG_DPS310 is not set @@ -3324,7 +3324,7 @@ CONFIG_MELLANOX_PLATFORM=y # CONFIG_MEM_ALLOC_PROFILING is not set CONFIG_MEMBARRIER=y CONFIG_MEMCG_SWAP=y -# CONFIG_MEMCG_V1 is not set +CONFIG_MEMCG_V1=y CONFIG_MEMCG=y CONFIG_MEMCPY_KUNIT_TEST=m CONFIG_MEMCPY_SLOW_KUNIT_TEST=y @@ -4751,9 +4751,9 @@ CONFIG_PWM=y # CONFIG_PWRSEQ_SIMPLE is not set # CONFIG_QAT_VFIO_PCI is not set # CONFIG_QCA7000_SPI is not set -# CONFIG_QCA807X_PHY is not set -# CONFIG_QCA808X_PHY is not set -# CONFIG_QCA83XX_PHY is not set +CONFIG_QCA807X_PHY=m +CONFIG_QCA808X_PHY=m +CONFIG_QCA83XX_PHY=m # CONFIG_QCOM_AOSS_QMP is not set # CONFIG_QCOM_APCS_IPC is not set # CONFIG_QCOM_COMMAND_DB is not set diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index 14de8096a..8a1a4dd80 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -1308,7 +1308,7 @@ CONFIG_DP83867_PHY=m # CONFIG_DP83869_PHY is not set CONFIG_DP83TC811_PHY=m # CONFIG_DP83TD510_PHY is not set -# CONFIG_DP83TG720_PHY is not set +CONFIG_DP83TG720_PHY=m # CONFIG_DPM_WATCHDOG is not set # CONFIG_DPOT_DAC is not set # CONFIG_DPS310 is not set @@ -3304,7 +3304,7 @@ CONFIG_MELLANOX_PLATFORM=y # CONFIG_MEM_ALLOC_PROFILING is not set CONFIG_MEMBARRIER=y CONFIG_MEMCG_SWAP=y -# CONFIG_MEMCG_V1 is not set +CONFIG_MEMCG_V1=y CONFIG_MEMCG=y CONFIG_MEMCPY_KUNIT_TEST=m CONFIG_MEMCPY_SLOW_KUNIT_TEST=y @@ -4730,9 +4730,9 @@ CONFIG_PWM=y # CONFIG_PWRSEQ_SIMPLE is not set # CONFIG_QAT_VFIO_PCI is not set # CONFIG_QCA7000_SPI is not set -# CONFIG_QCA807X_PHY is not set -# CONFIG_QCA808X_PHY is not set -# CONFIG_QCA83XX_PHY is not set +CONFIG_QCA807X_PHY=m +CONFIG_QCA808X_PHY=m +CONFIG_QCA83XX_PHY=m # CONFIG_QCOM_AOSS_QMP is not set # CONFIG_QCOM_APCS_IPC is not set # CONFIG_QCOM_COMMAND_DB is not set diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index efb6d582c..d3289c98a 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -1318,7 +1318,7 @@ CONFIG_DP83867_PHY=m # CONFIG_DP83869_PHY is not set CONFIG_DP83TC811_PHY=m # CONFIG_DP83TD510_PHY is not set -# CONFIG_DP83TG720_PHY is not set +CONFIG_DP83TG720_PHY=m # CONFIG_DPM_WATCHDOG is not set # CONFIG_DPOT_DAC is not set # CONFIG_DPS310 is not set @@ -3305,7 +3305,7 @@ CONFIG_MELLANOX_PLATFORM=y # CONFIG_MEM_ALLOC_PROFILING is not set CONFIG_MEMBARRIER=y CONFIG_MEMCG_SWAP=y -# CONFIG_MEMCG_V1 is not set +CONFIG_MEMCG_V1=y CONFIG_MEMCG=y CONFIG_MEMCPY_KUNIT_TEST=m CONFIG_MEMCPY_SLOW_KUNIT_TEST=y @@ -4683,9 +4683,9 @@ CONFIG_PWRSEQ_EMMC=m CONFIG_PWRSEQ_SIMPLE=m # CONFIG_QAT_VFIO_PCI is not set # CONFIG_QCA7000_SPI is not set -# CONFIG_QCA807X_PHY is not set -# CONFIG_QCA808X_PHY is not set -# CONFIG_QCA83XX_PHY is not set +CONFIG_QCA807X_PHY=m +CONFIG_QCA808X_PHY=m +CONFIG_QCA83XX_PHY=m # CONFIG_QCOM_AOSS_QMP is not set # CONFIG_QCOM_APCS_IPC is not set # CONFIG_QCOM_COMMAND_DB is not set diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index af0f96f59..52624dfee 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -1310,7 +1310,7 @@ CONFIG_DP83867_PHY=m # CONFIG_DP83869_PHY is not set CONFIG_DP83TC811_PHY=m # CONFIG_DP83TD510_PHY is not set -# CONFIG_DP83TG720_PHY is not set +CONFIG_DP83TG720_PHY=m # CONFIG_DPM_WATCHDOG is not set # CONFIG_DPOT_DAC is not set # CONFIG_DPS310 is not set @@ -3285,7 +3285,7 @@ CONFIG_MELLANOX_PLATFORM=y # CONFIG_MEM_ALLOC_PROFILING is not set CONFIG_MEMBARRIER=y CONFIG_MEMCG_SWAP=y -# CONFIG_MEMCG_V1 is not set +CONFIG_MEMCG_V1=y CONFIG_MEMCG=y CONFIG_MEMCPY_KUNIT_TEST=m CONFIG_MEMCPY_SLOW_KUNIT_TEST=y @@ -4662,9 +4662,9 @@ CONFIG_PWRSEQ_EMMC=m CONFIG_PWRSEQ_SIMPLE=m # CONFIG_QAT_VFIO_PCI is not set # CONFIG_QCA7000_SPI is not set -# CONFIG_QCA807X_PHY is not set -# CONFIG_QCA808X_PHY is not set -# CONFIG_QCA83XX_PHY is not set +CONFIG_QCA807X_PHY=m +CONFIG_QCA808X_PHY=m +CONFIG_QCA83XX_PHY=m # CONFIG_QCOM_AOSS_QMP is not set # CONFIG_QCOM_APCS_IPC is not set # CONFIG_QCOM_COMMAND_DB is not set diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index a42ce9424..370f4e04a 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -1311,7 +1311,7 @@ CONFIG_DP83867_PHY=m # CONFIG_DP83869_PHY is not set CONFIG_DP83TC811_PHY=m # CONFIG_DP83TD510_PHY is not set -# CONFIG_DP83TG720_PHY is not set +CONFIG_DP83TG720_PHY=m # CONFIG_DPM_WATCHDOG is not set # CONFIG_DPOT_DAC is not set # CONFIG_DPS310 is not set @@ -3294,7 +3294,7 @@ CONFIG_MELLANOX_PLATFORM=y # CONFIG_MEM_ALLOC_PROFILING is not set CONFIG_MEMBARRIER=y CONFIG_MEMCG_SWAP=y -# CONFIG_MEMCG_V1 is not set +CONFIG_MEMCG_V1=y CONFIG_MEMCG=y CONFIG_MEMCPY_KUNIT_TEST=m CONFIG_MEMCPY_SLOW_KUNIT_TEST=y @@ -4674,9 +4674,9 @@ CONFIG_PWRSEQ_EMMC=m CONFIG_PWRSEQ_SIMPLE=m # CONFIG_QAT_VFIO_PCI is not set # CONFIG_QCA7000_SPI is not set -# CONFIG_QCA807X_PHY is not set -# CONFIG_QCA808X_PHY is not set -# CONFIG_QCA83XX_PHY is not set +CONFIG_QCA807X_PHY=m +CONFIG_QCA808X_PHY=m +CONFIG_QCA83XX_PHY=m # CONFIG_QCOM_AOSS_QMP is not set # CONFIG_QCOM_APCS_IPC is not set # CONFIG_QCOM_COMMAND_DB is not set diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 7e232144e..51d88b7c2 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -1391,7 +1391,7 @@ CONFIG_DP83867_PHY=m # CONFIG_DP83869_PHY is not set CONFIG_DP83TC811_PHY=m # CONFIG_DP83TD510_PHY is not set -# CONFIG_DP83TG720_PHY is not set +CONFIG_DP83TG720_PHY=m # CONFIG_DPM_WATCHDOG is not set # CONFIG_DPOT_DAC is not set # CONFIG_DPS310 is not set @@ -3515,7 +3515,7 @@ CONFIG_MELLANOX_PLATFORM=y # CONFIG_MEM_ALLOC_PROFILING is not set CONFIG_MEMBARRIER=y CONFIG_MEMCG_SWAP=y -# CONFIG_MEMCG_V1 is not set +CONFIG_MEMCG_V1=y CONFIG_MEMCG=y CONFIG_MEMCPY_KUNIT_TEST=m CONFIG_MEMCPY_SLOW_KUNIT_TEST=y @@ -4971,9 +4971,9 @@ CONFIG_PWRSEQ_EMMC=m CONFIG_PWRSEQ_SIMPLE=m # CONFIG_QAT_VFIO_PCI is not set # CONFIG_QCA7000_SPI is not set -# CONFIG_QCA807X_PHY is not set -# CONFIG_QCA808X_PHY is not set -# CONFIG_QCA83XX_PHY is not set +CONFIG_QCA807X_PHY=m +CONFIG_QCA808X_PHY=m +CONFIG_QCA83XX_PHY=m # CONFIG_QCOM_AOSS_QMP is not set # CONFIG_QCOM_APCS_IPC is not set # CONFIG_QCOM_COMMAND_DB is not set diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index eb4738f35..42ed505b1 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -1383,7 +1383,7 @@ CONFIG_DP83867_PHY=m # CONFIG_DP83869_PHY is not set CONFIG_DP83TC811_PHY=m # CONFIG_DP83TD510_PHY is not set -# CONFIG_DP83TG720_PHY is not set +CONFIG_DP83TG720_PHY=m # CONFIG_DPM_WATCHDOG is not set # CONFIG_DPOT_DAC is not set # CONFIG_DPS310 is not set @@ -3495,7 +3495,7 @@ CONFIG_MELLANOX_PLATFORM=y # CONFIG_MEM_ALLOC_PROFILING is not set CONFIG_MEMBARRIER=y CONFIG_MEMCG_SWAP=y -# CONFIG_MEMCG_V1 is not set +CONFIG_MEMCG_V1=y CONFIG_MEMCG=y CONFIG_MEMCPY_KUNIT_TEST=m CONFIG_MEMCPY_SLOW_KUNIT_TEST=y @@ -4949,9 +4949,9 @@ CONFIG_PWRSEQ_EMMC=m CONFIG_PWRSEQ_SIMPLE=m # CONFIG_QAT_VFIO_PCI is not set # CONFIG_QCA7000_SPI is not set -# CONFIG_QCA807X_PHY is not set -# CONFIG_QCA808X_PHY is not set -# CONFIG_QCA83XX_PHY is not set +CONFIG_QCA807X_PHY=m +CONFIG_QCA808X_PHY=m +CONFIG_QCA83XX_PHY=m # CONFIG_QCOM_AOSS_QMP is not set # CONFIG_QCOM_APCS_IPC is not set # CONFIG_QCOM_COMMAND_DB is not set diff --git a/kernel-x86_64-rt-debug-rhel.config b/kernel-x86_64-rt-debug-rhel.config index 17aa14cab..453296267 100644 --- a/kernel-x86_64-rt-debug-rhel.config +++ b/kernel-x86_64-rt-debug-rhel.config @@ -1393,7 +1393,7 @@ CONFIG_DP83867_PHY=m # CONFIG_DP83869_PHY is not set CONFIG_DP83TC811_PHY=m # CONFIG_DP83TD510_PHY is not set -# CONFIG_DP83TG720_PHY is not set +CONFIG_DP83TG720_PHY=m # CONFIG_DPM_WATCHDOG is not set # CONFIG_DPOT_DAC is not set # CONFIG_DPS310 is not set @@ -3555,7 +3555,7 @@ CONFIG_MELLANOX_PLATFORM=y # CONFIG_MEM_ALLOC_PROFILING is not set CONFIG_MEMBARRIER=y CONFIG_MEMCG_SWAP=y -# CONFIG_MEMCG_V1 is not set +CONFIG_MEMCG_V1=y CONFIG_MEMCG=y CONFIG_MEMCPY_KUNIT_TEST=m CONFIG_MEMCPY_SLOW_KUNIT_TEST=y @@ -5015,9 +5015,9 @@ CONFIG_PWRSEQ_EMMC=m CONFIG_PWRSEQ_SIMPLE=m # CONFIG_QAT_VFIO_PCI is not set # CONFIG_QCA7000_SPI is not set -# CONFIG_QCA807X_PHY is not set -# CONFIG_QCA808X_PHY is not set -# CONFIG_QCA83XX_PHY is not set +CONFIG_QCA807X_PHY=m +CONFIG_QCA808X_PHY=m +CONFIG_QCA83XX_PHY=m # CONFIG_QCOM_AOSS_QMP is not set # CONFIG_QCOM_APCS_IPC is not set # CONFIG_QCOM_COMMAND_DB is not set diff --git a/kernel-x86_64-rt-rhel.config b/kernel-x86_64-rt-rhel.config index 80fb00d52..14b61a000 100644 --- a/kernel-x86_64-rt-rhel.config +++ b/kernel-x86_64-rt-rhel.config @@ -1385,7 +1385,7 @@ CONFIG_DP83867_PHY=m # CONFIG_DP83869_PHY is not set CONFIG_DP83TC811_PHY=m # CONFIG_DP83TD510_PHY is not set -# CONFIG_DP83TG720_PHY is not set +CONFIG_DP83TG720_PHY=m # CONFIG_DPM_WATCHDOG is not set # CONFIG_DPOT_DAC is not set # CONFIG_DPS310 is not set @@ -3535,7 +3535,7 @@ CONFIG_MELLANOX_PLATFORM=y # CONFIG_MEM_ALLOC_PROFILING is not set CONFIG_MEMBARRIER=y CONFIG_MEMCG_SWAP=y -# CONFIG_MEMCG_V1 is not set +CONFIG_MEMCG_V1=y CONFIG_MEMCG=y CONFIG_MEMCPY_KUNIT_TEST=m CONFIG_MEMCPY_SLOW_KUNIT_TEST=y @@ -4993,9 +4993,9 @@ CONFIG_PWRSEQ_EMMC=m CONFIG_PWRSEQ_SIMPLE=m # CONFIG_QAT_VFIO_PCI is not set # CONFIG_QCA7000_SPI is not set -# CONFIG_QCA807X_PHY is not set -# CONFIG_QCA808X_PHY is not set -# CONFIG_QCA83XX_PHY is not set +CONFIG_QCA807X_PHY=m +CONFIG_QCA808X_PHY=m +CONFIG_QCA83XX_PHY=m # CONFIG_QCOM_AOSS_QMP is not set # CONFIG_QCOM_APCS_IPC is not set # CONFIG_QCOM_COMMAND_DB is not set diff --git a/kernel.changelog b/kernel.changelog index 89138c298..36f79a34f 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,7 +1,14 @@ -* Thu Aug 08 2024 Fedora Kernel Team [6.11.0-0.rc2.6a0e38264012.26] +* Fri Aug 09 2024 Fedora Kernel Team [6.11.0-0.rc2.ee9a43b7cfe2.27] - fedora: disable CONFIG_DRM_WERROR (Patrick Talbert) Resolves: +* Fri Aug 09 2024 Fedora Kernel Team [6.11.0-0.rc2.ee9a43b7cfe2.26] +- redhat: Fix the ownership of /lib/modules/ directory (Vitaly Kuznetsov) +- new configs in drivers/phy (Izabela Bakollari) +- Add support to rh_waived cmdline boot parameter (Ricardo Robaina) [RHEL-26170] +- Linux v6.11.0-0.rc2.ee9a43b7cfe2 +Resolves: RHEL-26170 + * Thu Aug 08 2024 Fedora Kernel Team [6.11.0-0.rc2.6a0e38264012.25] - Linux v6.11.0-0.rc2.6a0e38264012 Resolves: diff --git a/kernel.spec b/kernel.spec index 2908f1297..98de00a89 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.rc2.20240808git6a0e38264012.26 +%define pkgrelease 0.rc2.20240809gitee9a43b7cfe2.27 %define kversion 6 -%define tarfile_release 6.11-rc2-27-g6a0e38264012 +%define tarfile_release 6.11-rc2-111-gee9a43b7cfe2 # This is needed to do merge window version magic %define patchlevel 11 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc2.20240808git6a0e38264012.26%{?buildid}%{?dist} +%define specrelease 0.rc2.20240809gitee9a43b7cfe2.27%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.11.0 @@ -3959,6 +3959,8 @@ fi\ %ghost %attr(0600, root, root) /boot/initramfs-%{KVERREL}%{?3:+%{3}}.img\ %ghost %attr(0644, root, root) /boot/config-%{KVERREL}%{?3:+%{3}}\ %{expand:%%files -f kernel-%{?3:%{3}-}modules-core.list %{?3:%{3}-}modules-core}\ +%dir /lib/modules\ +%dir /lib/modules/%{KVERREL}%{?3:+%{3}}\ %dir /lib/modules/%{KVERREL}%{?3:+%{3}}/kernel\ /lib/modules/%{KVERREL}%{?3:+%{3}}/build\ /lib/modules/%{KVERREL}%{?3:+%{3}}/source\ @@ -4004,6 +4006,8 @@ fi\ %else\ %if %{with_efiuki}\ %{expand:%%files %{?3:%{3}-}uki-virt}\ +%dir /lib/modules\ +%dir /lib/modules/%{KVERREL}%{?3:+%{3}}\ /lib/modules/%{KVERREL}%{?3:+%{3}}/System.map\ /lib/modules/%{KVERREL}%{?3:+%{3}}/symvers.%compext\ /lib/modules/%{KVERREL}%{?3:+%{3}}/config\ @@ -4087,9 +4091,15 @@ fi\ # # %changelog -* Thu Aug 08 2024 Fedora Kernel Team [6.11.0-0.rc2.6a0e38264012.26] +* Fri Aug 09 2024 Fedora Kernel Team [6.11.0-0.rc2.ee9a43b7cfe2.27] - fedora: disable CONFIG_DRM_WERROR (Patrick Talbert) +* Fri Aug 09 2024 Fedora Kernel Team [6.11.0-0.rc2.ee9a43b7cfe2.26] +- redhat: Fix the ownership of /lib/modules/ directory (Vitaly Kuznetsov) +- new configs in drivers/phy (Izabela Bakollari) +- Add support to rh_waived cmdline boot parameter (Ricardo Robaina) [RHEL-26170] +- Linux v6.11.0-0.rc2.ee9a43b7cfe2 + * Thu Aug 08 2024 Fedora Kernel Team [6.11.0-0.rc2.6a0e38264012.25] - Linux v6.11.0-0.rc2.6a0e38264012 diff --git a/patch-6.11-redhat.patch b/patch-6.11-redhat.patch index eeafe4931..615d60c3e 100644 --- a/patch-6.11-redhat.patch +++ b/patch-6.11-redhat.patch @@ -1,4 +1,5 @@ - Documentation/admin-guide/kernel-parameters.txt | 9 + + Documentation/admin-guide/kernel-parameters.txt | 20 + + Documentation/admin-guide/rh-waived-features.rst | 21 + Kconfig | 2 + Kconfig.redhat | 26 + Makefile | 20 +- @@ -57,6 +58,7 @@ include/linux/random.h | 10 + include/linux/rh_flags.h | 34 ++ include/linux/rh_kabi.h | 541 +++++++++++++++++++++ + include/linux/rh_waived.h | 19 + include/linux/rmi.h | 1 + include/linux/security.h | 5 + init/main.c | 3 + @@ -68,6 +70,7 @@ kernel/rh_flags.c | 115 +++++ kernel/rh_messages.c | 414 ++++++++++++++++ kernel/rh_messages.h | 325 +++++++++++++ + kernel/rh_waived.c | 104 ++++ scripts/mod/modpost.c | 8 + scripts/sign-file.c | 29 +- scripts/tags.sh | 2 + @@ -75,13 +78,31 @@ security/lockdown/Kconfig | 13 + security/lockdown/lockdown.c | 1 + security/security.c | 12 + - 77 files changed, 2527 insertions(+), 257 deletions(-) + 80 files changed, 2682 insertions(+), 257 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt -index 09126bb8cc9f..0a68fc52e2fb 100644 +index 09126bb8cc9f..ee2984e46c06 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt -@@ -6965,6 +6965,15 @@ +@@ -5790,6 +5790,17 @@ + 2 The "airplane mode" button toggles between everything + blocked and everything unblocked. + ++ rh_waived= ++ Enable waived features in RHEL. ++ ++ Waived features are disabled by default in RHEL, this parameter ++ provides support to enable such features, as needed. ++ ++ Format: ,... ++ ++ Use 'rh_waived' to enable all waived features listed at ++ Documentation/admin-guide/rh-waived-features.rst ++ + ring3mwait=disable + [KNL] Disable ring 3 MONITOR/MWAIT feature on supported + CPUs. +@@ -6965,6 +6976,15 @@ unknown_nmi_panic [X86] Cause panic on unknown NMI. @@ -97,6 +118,33 @@ index 09126bb8cc9f..0a68fc52e2fb 100644 unwind_debug [X86-64,EARLY] Enable unwinder debug output. This can be useful for debugging certain unwinder error +diff --git a/Documentation/admin-guide/rh-waived-features.rst b/Documentation/admin-guide/rh-waived-features.rst +new file mode 100644 +index 000000000000..45caec7fbae6 +--- /dev/null ++++ b/Documentation/admin-guide/rh-waived-features.rst +@@ -0,0 +1,21 @@ ++.. _rh_waived_features: ++ ++======================= ++Red Hat Waived Features ++======================= ++ ++Red Hat waived features are features considered unmaintained, insecure, rudimentary, or ++deprecated and are shipped in RHEL only for customer convenience. These features are disabled ++by default but can be enabled on demand via the ``rh_waived`` kernel boot parameter. To allow ++a set of waived features, append ``rh_waived=,...,`` to the kernel ++cmdline. Appending only ``rh_waived`` (with no arguments) will enable all waived features ++listed below. ++ ++The waived features listed in the next session follow the pattern below: ++ ++- feature name ++ feature description ++ ++List of Red Hat Waived Features ++=============================== ++ diff --git a/Kconfig b/Kconfig index 745bc773f567..f57ff40109d7 100644 --- a/Kconfig @@ -3132,6 +3180,31 @@ index 000000000000..5139cb2cabdc +}) + +#endif /* _LINUX_RH_KABI_H */ +diff --git a/include/linux/rh_waived.h b/include/linux/rh_waived.h +new file mode 100644 +index 000000000000..945dd71cc082 +--- /dev/null ++++ b/include/linux/rh_waived.h +@@ -0,0 +1,19 @@ ++/* SPDX-License-Identifier: GPL-2.0 */ ++/* ++ * include/linux/rh_waived.h ++ * ++ * rh_waived cmdline parameter interface. ++ * ++ * Copyright (C) 2024, Red Hat, Inc. Ricardo Robaina ++ */ ++#ifndef _RH_WAIVED_H ++#define _RH_WAIVED_H ++ ++enum rh_waived_feat { ++ /* RH_WAIVED_FEAT_ITEMS must always be the last item in the enum */ ++ RH_WAIVED_FEAT_ITEMS, ++}; ++ ++bool is_rh_waived(enum rh_waived_feat feat); ++ ++#endif /* _RH_WAIVED_H */ diff --git a/include/linux/rmi.h b/include/linux/rmi.h index ab7eea01ab42..fff7c5f737fc 100644 --- a/include/linux/rmi.h @@ -3182,14 +3255,14 @@ index 206acdde51f5..2296734522f7 100644 if (!strcmp(fn_name, entry->buf)) { pr_debug("initcall %s blacklisted\n", fn_name); diff --git a/kernel/Makefile b/kernel/Makefile -index 3c13240dfc9f..61b2ac156a3e 100644 +index 3c13240dfc9f..dc6723d84302 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -12,6 +12,7 @@ obj-y = fork.o exec_domain.o panic.o \ notifier.o ksysfs.o cred.o reboot.o \ async.o range.o smpboot.o ucount.o regset.o ksyms_common.o -+obj-$(CONFIG_RHEL_DIFFERENCES) += rh_messages.o rh_flags.o ++obj-$(CONFIG_RHEL_DIFFERENCES) += rh_messages.o rh_flags.o rh_waived.o obj-$(CONFIG_USERMODE_DRIVER) += usermode_driver.o obj-$(CONFIG_MULTIUSER) += groups.o obj-$(CONFIG_VHOST_TASK) += vhost_task.o @@ -3242,7 +3315,7 @@ index bf6c5f685ea2..649f2fccaddd 100644 } diff --git a/kernel/module/main.c b/kernel/module/main.c -index d9592195c5bb..ebddbe3ec4af 100644 +index 6f4ec857bdef..c8e66b448d1b 100644 --- a/kernel/module/main.c +++ b/kernel/module/main.c @@ -65,6 +65,8 @@ @@ -3282,7 +3355,7 @@ index d9592195c5bb..ebddbe3ec4af 100644 err = rewrite_section_headers(info, flags); if (err) return err; -@@ -3380,6 +3389,10 @@ void print_modules(void) +@@ -3393,6 +3402,10 @@ void print_modules(void) pr_cont(" [last unloaded: %s%s]", last_unloaded_module.name, last_unloaded_module.taints); pr_cont("\n"); @@ -4212,6 +4285,116 @@ index 000000000000..3ac7e00e0def +}; + +#endif /* __RH_MESSAGES_H */ +diff --git a/kernel/rh_waived.c b/kernel/rh_waived.c +new file mode 100644 +index 000000000000..84e22b1730cc +--- /dev/null ++++ b/kernel/rh_waived.c +@@ -0,0 +1,104 @@ ++/* SPDX-License-Identifier: GPL-2.0 */ ++/* ++ * kernel/rh_waived.c ++ * ++ * rh_waived cmdline parameter support. ++ * ++ * Copyright (C) 2024, Red Hat, Inc. Ricardo Robaina ++ */ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++/* ++ * RH_INSERT_WAIVED_FEAT ++ * This macro is intended to be used to insert items into the ++ * rh_waived_feat_list array. It expects to get an item from ++ * enum rh_waived_feat as its first argument, and a string ++ * holding the feature name as its second argument. ++ * ++ * The feature name is also utilized as the token for the ++ * boot parameter parser. ++ * ++ * Example usage: ++ * struct rh_waived_feat_item foo[RH_WAIVED_FEAT_ITEMS] = { ++ * RH_INSERT_WAIVED_FEAT(FOO_FEAT, "foo_feat_short_str"), ++ * }; ++ */ ++#define RH_INSERT_WAIVED_FEAT(enum_item, name) \ ++ [(enum_item)] = {.feat_name = (name), .enabled = 0,} ++ ++/* Indicates if the rh_flag 'rh_waived' should be added. */ ++bool __initdata add_rh_flag = false; ++ ++struct rh_waived_feat_item { ++ char *feat_name; ++ unsigned int enabled; ++}; ++ ++/* Always use the marco RH_INSERT_WAIVED_FEAT to insert items to this array. */ ++struct rh_waived_feat_item rh_waived_feat_list[RH_WAIVED_FEAT_ITEMS] = { ++}; ++ ++/* ++ * is_rh_waived() - Checks if a given waived feature has been enabled. ++ * ++ * @feat: waived feature. ++ */ ++__inline__ bool is_rh_waived(enum rh_waived_feat feat) ++{ ++ return !!rh_waived_feat_list[feat].enabled; ++} ++EXPORT_SYMBOL(is_rh_waived); ++ ++static int __init rh_waived_setup(char *s) ++{ ++ int i; ++ char *token; ++ ++ pr_info(KERN_CONT "rh_waived: "); ++ ++ if (!s) { ++ for (i = 0; i < RH_WAIVED_FEAT_ITEMS; i++) { ++ rh_waived_feat_list[i].enabled = 1; ++ pr_info(KERN_CONT "%s%s", rh_waived_feat_list[i].feat_name, ++ i < RH_WAIVED_FEAT_ITEMS - 1 ? " " : "\n"); ++ } ++ } ++ ++ while ((token = strsep(&s, ",")) != NULL) { ++ for (i = 0; i < RH_WAIVED_FEAT_ITEMS; i++) { ++ if (!strcmp(token, rh_waived_feat_list[i].feat_name)) { ++ rh_waived_feat_list[i].enabled = 1; ++ pr_info(KERN_CONT "%s%s", rh_waived_feat_list[i].feat_name, ++ i < RH_WAIVED_FEAT_ITEMS - 1 ? " " : "\n"); ++ } ++ } ++ } ++ ++ add_rh_flag = true; ++ ++ return 0; ++} ++early_param("rh_waived", rh_waived_setup); ++ ++/* ++ * rh_flags is initialized at subsys_initcall, calling rh_add_flag() ++ * from rh_waived_setup() would result in a can't boot situation. ++ * Deffering the inclusion 'rh_waived' rh_flag to late_initcall to ++ * avoid this issue. ++ */ ++static int __init __add_rh_flag(void) ++{ ++ if (add_rh_flag) ++ rh_add_flag("rh_waived"); ++ ++ return 0; ++} ++late_initcall(__add_rh_flag); diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index d16d0ace2775..e0aab60d74c4 100644 --- a/scripts/mod/modpost.c diff --git a/sources b/sources index 5ab11fb42..da42af8b7 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.11-rc2-27-g6a0e38264012.tar.xz) = 57be66b6d21cd38f249e5217fcac97bff5f6a6270651be193e2df7dab99c26c848e0c162238f875bb4faa05a69a47fe18c4cc65fae73af52fc1dba82f617e9db -SHA512 (kernel-abi-stablelists-6.11.0.tar.xz) = 3c342ce6023958c6cc43e5664e29b0c8ce89240cb928f0b440dc7ac281af9ff5660f5a9ecba4a25bc789702089261fa440112d8bbea015f063f27c8ef042a6db -SHA512 (kernel-kabi-dw-6.11.0.tar.xz) = 006468f472e26d33933ba64f3588cdbc0697388aeef8414d0290e3145de009a6d86413abd978096dea96867a5368d001930257f596c0bde2009b803fdbb5ee55 +SHA512 (linux-6.11-rc2-111-gee9a43b7cfe2.tar.xz) = 32464fc3c86dca7ae11b98d333b2c64a95010a67aa3bbe95bfd3ecaceb380ebef805c5574761c0f9a1beee6a21ed71856f46f86796a3f39cff034858d5f6a481 +SHA512 (kernel-abi-stablelists-6.11.0.tar.xz) = a9c98eb0a653e8a476f74f91fd12008bb55c513229c2c09888bea08df949cf6fa6692d8325d257f60121540223fd1baa4736125849418ca94b99fd010f8a0f2c +SHA512 (kernel-kabi-dw-6.11.0.tar.xz) = aa35be4115f6e001979d1db393d85b85e269381bda6ce31db0bd3671d8cc147a46b685c490f51133daf735c759a925fe910c4c6f28675d09de17aeba942a40e4