diff --git a/Makefile.rhelver b/Makefile.rhelver index 04b70169c..6c04b97b0 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 = 5 +RHEL_RELEASE = 6 # # RHEL_REBASE_NUM diff --git a/kernel-aarch64-16k-debug-fedora.config b/kernel-aarch64-16k-debug-fedora.config index c04ffc92c..80767d237 100644 --- a/kernel-aarch64-16k-debug-fedora.config +++ b/kernel-aarch64-16k-debug-fedora.config @@ -4266,6 +4266,7 @@ CONFIG_KEYBOARD_ADP5585=m CONFIG_KEYBOARD_ATKBD=y # CONFIG_KEYBOARD_BCM is not set # CONFIG_KEYBOARD_CAP11XX is not set +# CONFIG_KEYBOARD_CHARLIEPLEX is not set CONFIG_KEYBOARD_CROS_EC=m CONFIG_KEYBOARD_CYPRESS_SF=m # CONFIG_KEYBOARD_DLINK_DIR685 is not set diff --git a/kernel-aarch64-16k-fedora.config b/kernel-aarch64-16k-fedora.config index ba121593d..e220c1d64 100644 --- a/kernel-aarch64-16k-fedora.config +++ b/kernel-aarch64-16k-fedora.config @@ -4241,6 +4241,7 @@ CONFIG_KEYBOARD_ADP5585=m CONFIG_KEYBOARD_ATKBD=y # CONFIG_KEYBOARD_BCM is not set # CONFIG_KEYBOARD_CAP11XX is not set +# CONFIG_KEYBOARD_CHARLIEPLEX is not set CONFIG_KEYBOARD_CROS_EC=m CONFIG_KEYBOARD_CYPRESS_SF=m # CONFIG_KEYBOARD_DLINK_DIR685 is not set diff --git a/kernel-aarch64-64k-debug-rhel.config b/kernel-aarch64-64k-debug-rhel.config index 36a730e89..727f92f26 100644 --- a/kernel-aarch64-64k-debug-rhel.config +++ b/kernel-aarch64-64k-debug-rhel.config @@ -2012,7 +2012,7 @@ CONFIG_DW_DMAC=m CONFIG_DW_DMAC_PCI=m # CONFIG_DW_EDMA is not set # CONFIG_DW_EDMA_PCIE is not set -# CONFIG_DW_I3C_MASTER is not set +CONFIG_DW_I3C_MASTER=m CONFIG_DWMAC_DWC_QOS_ETH=m # CONFIG_DWMAC_GENERIC is not set CONFIG_DWMAC_IMX8=m @@ -3473,6 +3473,7 @@ CONFIG_KEXEC_SIG=y CONFIG_KEYBOARD_ATKBD=y # CONFIG_KEYBOARD_BCM is not set # CONFIG_KEYBOARD_CAP11XX is not set +# CONFIG_KEYBOARD_CHARLIEPLEX is not set # CONFIG_KEYBOARD_CYPRESS_SF is not set # CONFIG_KEYBOARD_DLINK_DIR685 is not set CONFIG_KEYBOARD_GPIO=m @@ -6511,7 +6512,8 @@ CONFIG_SENSORS_SMPRO=m # CONFIG_SENSORS_SMSC47B397 is not set # CONFIG_SENSORS_SMSC47M192 is not set # CONFIG_SENSORS_SMSC47M1 is not set -# CONFIG_SENSORS_SPD5118 is not set +CONFIG_SENSORS_SPD5118_DETECT=y +CONFIG_SENSORS_SPD5118=m # CONFIG_SENSORS_STEF48H28 is not set # CONFIG_SENSORS_STPDDC60 is not set # CONFIG_SENSORS_STTS751 is not set diff --git a/kernel-aarch64-64k-rhel.config b/kernel-aarch64-64k-rhel.config index f5687d3b8..d9661d0a2 100644 --- a/kernel-aarch64-64k-rhel.config +++ b/kernel-aarch64-64k-rhel.config @@ -2004,7 +2004,7 @@ CONFIG_DW_DMAC=m CONFIG_DW_DMAC_PCI=m # CONFIG_DW_EDMA is not set # CONFIG_DW_EDMA_PCIE is not set -# CONFIG_DW_I3C_MASTER is not set +CONFIG_DW_I3C_MASTER=m CONFIG_DWMAC_DWC_QOS_ETH=m # CONFIG_DWMAC_GENERIC is not set CONFIG_DWMAC_IMX8=m @@ -3452,6 +3452,7 @@ CONFIG_KEXEC_SIG=y CONFIG_KEYBOARD_ATKBD=y # CONFIG_KEYBOARD_BCM is not set # CONFIG_KEYBOARD_CAP11XX is not set +# CONFIG_KEYBOARD_CHARLIEPLEX is not set # CONFIG_KEYBOARD_CYPRESS_SF is not set # CONFIG_KEYBOARD_DLINK_DIR685 is not set CONFIG_KEYBOARD_GPIO=m @@ -6486,7 +6487,8 @@ CONFIG_SENSORS_SMPRO=m # CONFIG_SENSORS_SMSC47B397 is not set # CONFIG_SENSORS_SMSC47M192 is not set # CONFIG_SENSORS_SMSC47M1 is not set -# CONFIG_SENSORS_SPD5118 is not set +CONFIG_SENSORS_SPD5118_DETECT=y +CONFIG_SENSORS_SPD5118=m # CONFIG_SENSORS_STEF48H28 is not set # CONFIG_SENSORS_STPDDC60 is not set # CONFIG_SENSORS_STTS751 is not set diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 96fcd24fc..fd592cace 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -4266,6 +4266,7 @@ CONFIG_KEYBOARD_ADP5585=m CONFIG_KEYBOARD_ATKBD=y # CONFIG_KEYBOARD_BCM is not set # CONFIG_KEYBOARD_CAP11XX is not set +# CONFIG_KEYBOARD_CHARLIEPLEX is not set CONFIG_KEYBOARD_CROS_EC=m CONFIG_KEYBOARD_CYPRESS_SF=m # CONFIG_KEYBOARD_DLINK_DIR685 is not set diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index e5f1a8a10..117371844 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -2010,7 +2010,7 @@ CONFIG_DW_DMAC=m CONFIG_DW_DMAC_PCI=m # CONFIG_DW_EDMA is not set # CONFIG_DW_EDMA_PCIE is not set -# CONFIG_DW_I3C_MASTER is not set +CONFIG_DW_I3C_MASTER=m CONFIG_DWMAC_DWC_QOS_ETH=m # CONFIG_DWMAC_GENERIC is not set CONFIG_DWMAC_IMX8=m @@ -3471,6 +3471,7 @@ CONFIG_KEXEC_SIG=y CONFIG_KEYBOARD_ATKBD=y # CONFIG_KEYBOARD_BCM is not set # CONFIG_KEYBOARD_CAP11XX is not set +# CONFIG_KEYBOARD_CHARLIEPLEX is not set # CONFIG_KEYBOARD_CYPRESS_SF is not set # CONFIG_KEYBOARD_DLINK_DIR685 is not set CONFIG_KEYBOARD_GPIO=m @@ -6508,7 +6509,8 @@ CONFIG_SENSORS_SMPRO=m # CONFIG_SENSORS_SMSC47B397 is not set # CONFIG_SENSORS_SMSC47M192 is not set # CONFIG_SENSORS_SMSC47M1 is not set -# CONFIG_SENSORS_SPD5118 is not set +CONFIG_SENSORS_SPD5118_DETECT=y +CONFIG_SENSORS_SPD5118=m # CONFIG_SENSORS_STEF48H28 is not set # CONFIG_SENSORS_STPDDC60 is not set # CONFIG_SENSORS_STTS751 is not set diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 204e17665..3ef6775e9 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -4241,6 +4241,7 @@ CONFIG_KEYBOARD_ADP5585=m CONFIG_KEYBOARD_ATKBD=y # CONFIG_KEYBOARD_BCM is not set # CONFIG_KEYBOARD_CAP11XX is not set +# CONFIG_KEYBOARD_CHARLIEPLEX is not set CONFIG_KEYBOARD_CROS_EC=m CONFIG_KEYBOARD_CYPRESS_SF=m # CONFIG_KEYBOARD_DLINK_DIR685 is not set diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index 47dceadbf..dd432423f 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -2002,7 +2002,7 @@ CONFIG_DW_DMAC=m CONFIG_DW_DMAC_PCI=m # CONFIG_DW_EDMA is not set # CONFIG_DW_EDMA_PCIE is not set -# CONFIG_DW_I3C_MASTER is not set +CONFIG_DW_I3C_MASTER=m CONFIG_DWMAC_DWC_QOS_ETH=m # CONFIG_DWMAC_GENERIC is not set CONFIG_DWMAC_IMX8=m @@ -3450,6 +3450,7 @@ CONFIG_KEXEC_SIG=y CONFIG_KEYBOARD_ATKBD=y # CONFIG_KEYBOARD_BCM is not set # CONFIG_KEYBOARD_CAP11XX is not set +# CONFIG_KEYBOARD_CHARLIEPLEX is not set # CONFIG_KEYBOARD_CYPRESS_SF is not set # CONFIG_KEYBOARD_DLINK_DIR685 is not set CONFIG_KEYBOARD_GPIO=m @@ -6483,7 +6484,8 @@ CONFIG_SENSORS_SMPRO=m # CONFIG_SENSORS_SMSC47B397 is not set # CONFIG_SENSORS_SMSC47M192 is not set # CONFIG_SENSORS_SMSC47M1 is not set -# CONFIG_SENSORS_SPD5118 is not set +CONFIG_SENSORS_SPD5118_DETECT=y +CONFIG_SENSORS_SPD5118=m # CONFIG_SENSORS_STEF48H28 is not set # CONFIG_SENSORS_STPDDC60 is not set # CONFIG_SENSORS_STTS751 is not set diff --git a/kernel-aarch64-rt-64k-debug-fedora.config b/kernel-aarch64-rt-64k-debug-fedora.config index e54753b8f..f09579543 100644 --- a/kernel-aarch64-rt-64k-debug-fedora.config +++ b/kernel-aarch64-rt-64k-debug-fedora.config @@ -4274,6 +4274,7 @@ CONFIG_KEYBOARD_ADP5585=m CONFIG_KEYBOARD_ATKBD=y # CONFIG_KEYBOARD_BCM is not set # CONFIG_KEYBOARD_CAP11XX is not set +# CONFIG_KEYBOARD_CHARLIEPLEX is not set CONFIG_KEYBOARD_CROS_EC=m CONFIG_KEYBOARD_CYPRESS_SF=m # CONFIG_KEYBOARD_DLINK_DIR685 is not set diff --git a/kernel-aarch64-rt-64k-debug-rhel.config b/kernel-aarch64-rt-64k-debug-rhel.config index 37dbc27eb..910b99a01 100644 --- a/kernel-aarch64-rt-64k-debug-rhel.config +++ b/kernel-aarch64-rt-64k-debug-rhel.config @@ -2052,7 +2052,7 @@ CONFIG_DW_DMAC=m CONFIG_DW_DMAC_PCI=m # CONFIG_DW_EDMA is not set # CONFIG_DW_EDMA_PCIE is not set -# CONFIG_DW_I3C_MASTER is not set +CONFIG_DW_I3C_MASTER=m CONFIG_DWMAC_DWC_QOS_ETH=m # CONFIG_DWMAC_GENERIC is not set CONFIG_DWMAC_IMX8=m @@ -3515,6 +3515,7 @@ CONFIG_KEXEC_SIG=y CONFIG_KEYBOARD_ATKBD=y # CONFIG_KEYBOARD_BCM is not set # CONFIG_KEYBOARD_CAP11XX is not set +# CONFIG_KEYBOARD_CHARLIEPLEX is not set # CONFIG_KEYBOARD_CYPRESS_SF is not set # CONFIG_KEYBOARD_DLINK_DIR685 is not set CONFIG_KEYBOARD_GPIO=m @@ -6556,7 +6557,8 @@ CONFIG_SENSORS_SMPRO=m # CONFIG_SENSORS_SMSC47B397 is not set # CONFIG_SENSORS_SMSC47M192 is not set # CONFIG_SENSORS_SMSC47M1 is not set -# CONFIG_SENSORS_SPD5118 is not set +CONFIG_SENSORS_SPD5118_DETECT=y +CONFIG_SENSORS_SPD5118=m # CONFIG_SENSORS_STEF48H28 is not set # CONFIG_SENSORS_STPDDC60 is not set # CONFIG_SENSORS_STTS751 is not set diff --git a/kernel-aarch64-rt-64k-fedora.config b/kernel-aarch64-rt-64k-fedora.config index ca44a4ef7..27fcaf945 100644 --- a/kernel-aarch64-rt-64k-fedora.config +++ b/kernel-aarch64-rt-64k-fedora.config @@ -4249,6 +4249,7 @@ CONFIG_KEYBOARD_ADP5585=m CONFIG_KEYBOARD_ATKBD=y # CONFIG_KEYBOARD_BCM is not set # CONFIG_KEYBOARD_CAP11XX is not set +# CONFIG_KEYBOARD_CHARLIEPLEX is not set CONFIG_KEYBOARD_CROS_EC=m CONFIG_KEYBOARD_CYPRESS_SF=m # CONFIG_KEYBOARD_DLINK_DIR685 is not set diff --git a/kernel-aarch64-rt-64k-rhel.config b/kernel-aarch64-rt-64k-rhel.config index 4394c167a..e561091e5 100644 --- a/kernel-aarch64-rt-64k-rhel.config +++ b/kernel-aarch64-rt-64k-rhel.config @@ -2044,7 +2044,7 @@ CONFIG_DW_DMAC=m CONFIG_DW_DMAC_PCI=m # CONFIG_DW_EDMA is not set # CONFIG_DW_EDMA_PCIE is not set -# CONFIG_DW_I3C_MASTER is not set +CONFIG_DW_I3C_MASTER=m CONFIG_DWMAC_DWC_QOS_ETH=m # CONFIG_DWMAC_GENERIC is not set CONFIG_DWMAC_IMX8=m @@ -3494,6 +3494,7 @@ CONFIG_KEXEC_SIG=y CONFIG_KEYBOARD_ATKBD=y # CONFIG_KEYBOARD_BCM is not set # CONFIG_KEYBOARD_CAP11XX is not set +# CONFIG_KEYBOARD_CHARLIEPLEX is not set # CONFIG_KEYBOARD_CYPRESS_SF is not set # CONFIG_KEYBOARD_DLINK_DIR685 is not set CONFIG_KEYBOARD_GPIO=m @@ -6531,7 +6532,8 @@ CONFIG_SENSORS_SMPRO=m # CONFIG_SENSORS_SMSC47B397 is not set # CONFIG_SENSORS_SMSC47M192 is not set # CONFIG_SENSORS_SMSC47M1 is not set -# CONFIG_SENSORS_SPD5118 is not set +CONFIG_SENSORS_SPD5118_DETECT=y +CONFIG_SENSORS_SPD5118=m # CONFIG_SENSORS_STEF48H28 is not set # CONFIG_SENSORS_STPDDC60 is not set # CONFIG_SENSORS_STTS751 is not set diff --git a/kernel-aarch64-rt-debug-fedora.config b/kernel-aarch64-rt-debug-fedora.config index abd4ca841..a9d71002f 100644 --- a/kernel-aarch64-rt-debug-fedora.config +++ b/kernel-aarch64-rt-debug-fedora.config @@ -4271,6 +4271,7 @@ CONFIG_KEYBOARD_ADP5585=m CONFIG_KEYBOARD_ATKBD=y # CONFIG_KEYBOARD_BCM is not set # CONFIG_KEYBOARD_CAP11XX is not set +# CONFIG_KEYBOARD_CHARLIEPLEX is not set CONFIG_KEYBOARD_CROS_EC=m CONFIG_KEYBOARD_CYPRESS_SF=m # CONFIG_KEYBOARD_DLINK_DIR685 is not set diff --git a/kernel-aarch64-rt-debug-rhel.config b/kernel-aarch64-rt-debug-rhel.config index 43cbde459..d5c7bf5ac 100644 --- a/kernel-aarch64-rt-debug-rhel.config +++ b/kernel-aarch64-rt-debug-rhel.config @@ -2049,7 +2049,7 @@ CONFIG_DW_DMAC=m CONFIG_DW_DMAC_PCI=m # CONFIG_DW_EDMA is not set # CONFIG_DW_EDMA_PCIE is not set -# CONFIG_DW_I3C_MASTER is not set +CONFIG_DW_I3C_MASTER=m CONFIG_DWMAC_DWC_QOS_ETH=m # CONFIG_DWMAC_GENERIC is not set CONFIG_DWMAC_IMX8=m @@ -3512,6 +3512,7 @@ CONFIG_KEXEC_SIG=y CONFIG_KEYBOARD_ATKBD=y # CONFIG_KEYBOARD_BCM is not set # CONFIG_KEYBOARD_CAP11XX is not set +# CONFIG_KEYBOARD_CHARLIEPLEX is not set # CONFIG_KEYBOARD_CYPRESS_SF is not set # CONFIG_KEYBOARD_DLINK_DIR685 is not set CONFIG_KEYBOARD_GPIO=m @@ -6552,7 +6553,8 @@ CONFIG_SENSORS_SMPRO=m # CONFIG_SENSORS_SMSC47B397 is not set # CONFIG_SENSORS_SMSC47M192 is not set # CONFIG_SENSORS_SMSC47M1 is not set -# CONFIG_SENSORS_SPD5118 is not set +CONFIG_SENSORS_SPD5118_DETECT=y +CONFIG_SENSORS_SPD5118=m # CONFIG_SENSORS_STEF48H28 is not set # CONFIG_SENSORS_STPDDC60 is not set # CONFIG_SENSORS_STTS751 is not set diff --git a/kernel-aarch64-rt-fedora.config b/kernel-aarch64-rt-fedora.config index 914a4ca5a..2c314dbd7 100644 --- a/kernel-aarch64-rt-fedora.config +++ b/kernel-aarch64-rt-fedora.config @@ -4246,6 +4246,7 @@ CONFIG_KEYBOARD_ADP5585=m CONFIG_KEYBOARD_ATKBD=y # CONFIG_KEYBOARD_BCM is not set # CONFIG_KEYBOARD_CAP11XX is not set +# CONFIG_KEYBOARD_CHARLIEPLEX is not set CONFIG_KEYBOARD_CROS_EC=m CONFIG_KEYBOARD_CYPRESS_SF=m # CONFIG_KEYBOARD_DLINK_DIR685 is not set diff --git a/kernel-aarch64-rt-rhel.config b/kernel-aarch64-rt-rhel.config index c5cc752d1..7c9ec3f2d 100644 --- a/kernel-aarch64-rt-rhel.config +++ b/kernel-aarch64-rt-rhel.config @@ -2041,7 +2041,7 @@ CONFIG_DW_DMAC=m CONFIG_DW_DMAC_PCI=m # CONFIG_DW_EDMA is not set # CONFIG_DW_EDMA_PCIE is not set -# CONFIG_DW_I3C_MASTER is not set +CONFIG_DW_I3C_MASTER=m CONFIG_DWMAC_DWC_QOS_ETH=m # CONFIG_DWMAC_GENERIC is not set CONFIG_DWMAC_IMX8=m @@ -3491,6 +3491,7 @@ CONFIG_KEXEC_SIG=y CONFIG_KEYBOARD_ATKBD=y # CONFIG_KEYBOARD_BCM is not set # CONFIG_KEYBOARD_CAP11XX is not set +# CONFIG_KEYBOARD_CHARLIEPLEX is not set # CONFIG_KEYBOARD_CYPRESS_SF is not set # CONFIG_KEYBOARD_DLINK_DIR685 is not set CONFIG_KEYBOARD_GPIO=m @@ -6527,7 +6528,8 @@ CONFIG_SENSORS_SMPRO=m # CONFIG_SENSORS_SMSC47B397 is not set # CONFIG_SENSORS_SMSC47M192 is not set # CONFIG_SENSORS_SMSC47M1 is not set -# CONFIG_SENSORS_SPD5118 is not set +CONFIG_SENSORS_SPD5118_DETECT=y +CONFIG_SENSORS_SPD5118=m # CONFIG_SENSORS_STEF48H28 is not set # CONFIG_SENSORS_STPDDC60 is not set # CONFIG_SENSORS_STTS751 is not set diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index 224b53cd3..d5bb37ee9 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -3380,6 +3380,7 @@ CONFIG_KEYBOARD_ADP5585=m # CONFIG_KEYBOARD_ATKBD is not set CONFIG_KEYBOARD_BCM=m # CONFIG_KEYBOARD_CAP11XX is not set +# CONFIG_KEYBOARD_CHARLIEPLEX is not set CONFIG_KEYBOARD_CYPRESS_SF=m # CONFIG_KEYBOARD_DLINK_DIR685 is not set # CONFIG_KEYBOARD_GPIO is not set diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index 18cc92889..5b09df83e 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -3083,6 +3083,7 @@ CONFIG_KEXEC_SIG=y # CONFIG_KEYBOARD_ATKBD is not set # CONFIG_KEYBOARD_BCM is not set # CONFIG_KEYBOARD_CAP11XX is not set +# CONFIG_KEYBOARD_CHARLIEPLEX is not set # CONFIG_KEYBOARD_CYPRESS_SF is not set # CONFIG_KEYBOARD_DLINK_DIR685 is not set # CONFIG_KEYBOARD_GPIO is not set diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index 0c355d18b..053127a61 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -3354,6 +3354,7 @@ CONFIG_KEYBOARD_ADP5585=m # CONFIG_KEYBOARD_ATKBD is not set CONFIG_KEYBOARD_BCM=m # CONFIG_KEYBOARD_CAP11XX is not set +# CONFIG_KEYBOARD_CHARLIEPLEX is not set CONFIG_KEYBOARD_CYPRESS_SF=m # CONFIG_KEYBOARD_DLINK_DIR685 is not set # CONFIG_KEYBOARD_GPIO is not set diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index 27d0247f5..21a6e2e5d 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -3063,6 +3063,7 @@ CONFIG_KEXEC_SIG=y # CONFIG_KEYBOARD_ATKBD is not set # CONFIG_KEYBOARD_BCM is not set # CONFIG_KEYBOARD_CAP11XX is not set +# CONFIG_KEYBOARD_CHARLIEPLEX is not set # CONFIG_KEYBOARD_CYPRESS_SF is not set # CONFIG_KEYBOARD_DLINK_DIR685 is not set # CONFIG_KEYBOARD_GPIO is not set diff --git a/kernel-riscv64-debug-fedora.config b/kernel-riscv64-debug-fedora.config index 761853484..6b7b3a0c7 100644 --- a/kernel-riscv64-debug-fedora.config +++ b/kernel-riscv64-debug-fedora.config @@ -3416,6 +3416,7 @@ CONFIG_KEYBOARD_ADP5585=m # CONFIG_KEYBOARD_ATKBD is not set # CONFIG_KEYBOARD_BCM is not set # CONFIG_KEYBOARD_CAP11XX is not set +# CONFIG_KEYBOARD_CHARLIEPLEX is not set CONFIG_KEYBOARD_CYPRESS_SF=m # CONFIG_KEYBOARD_DLINK_DIR685 is not set # CONFIG_KEYBOARD_GOLDFISH_EVENTS is not set diff --git a/kernel-riscv64-debug-rhel.config b/kernel-riscv64-debug-rhel.config index c883e86bc..3679bebbe 100644 --- a/kernel-riscv64-debug-rhel.config +++ b/kernel-riscv64-debug-rhel.config @@ -3090,6 +3090,7 @@ CONFIG_KEXEC_SIG=y # CONFIG_KEYBOARD_ATKBD is not set # CONFIG_KEYBOARD_BCM is not set # CONFIG_KEYBOARD_CAP11XX is not set +# CONFIG_KEYBOARD_CHARLIEPLEX is not set # CONFIG_KEYBOARD_CYPRESS_SF is not set # CONFIG_KEYBOARD_DLINK_DIR685 is not set # CONFIG_KEYBOARD_GOLDFISH_EVENTS is not set diff --git a/kernel-riscv64-fedora.config b/kernel-riscv64-fedora.config index a32bafbfc..2323f5989 100644 --- a/kernel-riscv64-fedora.config +++ b/kernel-riscv64-fedora.config @@ -3390,6 +3390,7 @@ CONFIG_KEYBOARD_ADP5585=m # CONFIG_KEYBOARD_ATKBD is not set # CONFIG_KEYBOARD_BCM is not set # CONFIG_KEYBOARD_CAP11XX is not set +# CONFIG_KEYBOARD_CHARLIEPLEX is not set CONFIG_KEYBOARD_CYPRESS_SF=m # CONFIG_KEYBOARD_DLINK_DIR685 is not set # CONFIG_KEYBOARD_GOLDFISH_EVENTS is not set diff --git a/kernel-riscv64-rhel.config b/kernel-riscv64-rhel.config index 0b1b833b2..22d461af9 100644 --- a/kernel-riscv64-rhel.config +++ b/kernel-riscv64-rhel.config @@ -3070,6 +3070,7 @@ CONFIG_KEXEC_SIG=y # CONFIG_KEYBOARD_ATKBD is not set # CONFIG_KEYBOARD_BCM is not set # CONFIG_KEYBOARD_CAP11XX is not set +# CONFIG_KEYBOARD_CHARLIEPLEX is not set # CONFIG_KEYBOARD_CYPRESS_SF is not set # CONFIG_KEYBOARD_DLINK_DIR685 is not set # CONFIG_KEYBOARD_GOLDFISH_EVENTS is not set diff --git a/kernel-riscv64-rt-debug-fedora.config b/kernel-riscv64-rt-debug-fedora.config index d092d8f7c..a7491bb5c 100644 --- a/kernel-riscv64-rt-debug-fedora.config +++ b/kernel-riscv64-rt-debug-fedora.config @@ -3421,6 +3421,7 @@ CONFIG_KEYBOARD_ADP5585=m # CONFIG_KEYBOARD_ATKBD is not set # CONFIG_KEYBOARD_BCM is not set # CONFIG_KEYBOARD_CAP11XX is not set +# CONFIG_KEYBOARD_CHARLIEPLEX is not set CONFIG_KEYBOARD_CYPRESS_SF=m # CONFIG_KEYBOARD_DLINK_DIR685 is not set # CONFIG_KEYBOARD_GOLDFISH_EVENTS is not set diff --git a/kernel-riscv64-rt-fedora.config b/kernel-riscv64-rt-fedora.config index 65380b523..a28a629c8 100644 --- a/kernel-riscv64-rt-fedora.config +++ b/kernel-riscv64-rt-fedora.config @@ -3395,6 +3395,7 @@ CONFIG_KEYBOARD_ADP5585=m # CONFIG_KEYBOARD_ATKBD is not set # CONFIG_KEYBOARD_BCM is not set # CONFIG_KEYBOARD_CAP11XX is not set +# CONFIG_KEYBOARD_CHARLIEPLEX is not set CONFIG_KEYBOARD_CYPRESS_SF=m # CONFIG_KEYBOARD_DLINK_DIR685 is not set # CONFIG_KEYBOARD_GOLDFISH_EVENTS is not set diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 7ae3c0e88..4a3b0d843 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -3359,6 +3359,7 @@ CONFIG_KEYBOARD_ADP5585=m # CONFIG_KEYBOARD_ATKBD is not set CONFIG_KEYBOARD_BCM=m # CONFIG_KEYBOARD_CAP11XX is not set +# CONFIG_KEYBOARD_CHARLIEPLEX is not set CONFIG_KEYBOARD_CYPRESS_SF=m # CONFIG_KEYBOARD_DLINK_DIR685 is not set # CONFIG_KEYBOARD_GPIO is not set diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index 4ffb21850..712719f21 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -3073,6 +3073,7 @@ CONFIG_KEXEC_SIG=y # CONFIG_KEYBOARD_ATKBD is not set # CONFIG_KEYBOARD_BCM is not set # CONFIG_KEYBOARD_CAP11XX is not set +# CONFIG_KEYBOARD_CHARLIEPLEX is not set # CONFIG_KEYBOARD_CYPRESS_SF is not set # CONFIG_KEYBOARD_DLINK_DIR685 is not set # CONFIG_KEYBOARD_GPIO is not set diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 6f2f5386a..7da6674d9 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -3333,6 +3333,7 @@ CONFIG_KEYBOARD_ADP5585=m # CONFIG_KEYBOARD_ATKBD is not set CONFIG_KEYBOARD_BCM=m # CONFIG_KEYBOARD_CAP11XX is not set +# CONFIG_KEYBOARD_CHARLIEPLEX is not set CONFIG_KEYBOARD_CYPRESS_SF=m # CONFIG_KEYBOARD_DLINK_DIR685 is not set # CONFIG_KEYBOARD_GPIO is not set diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 44697ccca..e84d465e4 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -3053,6 +3053,7 @@ CONFIG_KEXEC_SIG=y # CONFIG_KEYBOARD_ATKBD is not set # CONFIG_KEYBOARD_BCM is not set # CONFIG_KEYBOARD_CAP11XX is not set +# CONFIG_KEYBOARD_CHARLIEPLEX is not set # CONFIG_KEYBOARD_CYPRESS_SF is not set # CONFIG_KEYBOARD_DLINK_DIR685 is not set # CONFIG_KEYBOARD_GPIO is not set diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 3549c19d0..bdc01743c 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -3061,6 +3061,7 @@ CONFIG_KEXEC_IMAGE_VERIFY_SIG=y # CONFIG_KEYBOARD_ATKBD is not set # CONFIG_KEYBOARD_BCM is not set # CONFIG_KEYBOARD_CAP11XX is not set +# CONFIG_KEYBOARD_CHARLIEPLEX is not set # CONFIG_KEYBOARD_CYPRESS_SF is not set # CONFIG_KEYBOARD_DLINK_DIR685 is not set # CONFIG_KEYBOARD_GPIO is not set diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index ac88310a4..d392cb5aa 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -3724,6 +3724,7 @@ CONFIG_KEYBOARD_APPLESPI=m CONFIG_KEYBOARD_ATKBD=y CONFIG_KEYBOARD_BCM=m # CONFIG_KEYBOARD_CAP11XX is not set +# CONFIG_KEYBOARD_CHARLIEPLEX is not set CONFIG_KEYBOARD_CROS_EC=m CONFIG_KEYBOARD_CYPRESS_SF=m # CONFIG_KEYBOARD_DLINK_DIR685 is not set diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index de1da4257..21d370014 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -3299,6 +3299,7 @@ CONFIG_KEXEC_SIG=y CONFIG_KEYBOARD_ATKBD=y # CONFIG_KEYBOARD_BCM is not set # CONFIG_KEYBOARD_CAP11XX is not set +# CONFIG_KEYBOARD_CHARLIEPLEX is not set # CONFIG_KEYBOARD_CYPRESS_SF is not set # CONFIG_KEYBOARD_DLINK_DIR685 is not set # CONFIG_KEYBOARD_GPIO is not set diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index fc13b62ec..a16653ebd 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -3698,6 +3698,7 @@ CONFIG_KEYBOARD_APPLESPI=m CONFIG_KEYBOARD_ATKBD=y CONFIG_KEYBOARD_BCM=m # CONFIG_KEYBOARD_CAP11XX is not set +# CONFIG_KEYBOARD_CHARLIEPLEX is not set CONFIG_KEYBOARD_CROS_EC=m CONFIG_KEYBOARD_CYPRESS_SF=m # CONFIG_KEYBOARD_DLINK_DIR685 is not set diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 6379bb9af..a5d47e03b 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -3279,6 +3279,7 @@ CONFIG_KEXEC_SIG=y CONFIG_KEYBOARD_ATKBD=y # CONFIG_KEYBOARD_BCM is not set # CONFIG_KEYBOARD_CAP11XX is not set +# CONFIG_KEYBOARD_CHARLIEPLEX is not set # CONFIG_KEYBOARD_CYPRESS_SF is not set # CONFIG_KEYBOARD_DLINK_DIR685 is not set # CONFIG_KEYBOARD_GPIO is not set diff --git a/kernel-x86_64-rt-debug-fedora.config b/kernel-x86_64-rt-debug-fedora.config index f5f65d9c8..5a77a29b7 100644 --- a/kernel-x86_64-rt-debug-fedora.config +++ b/kernel-x86_64-rt-debug-fedora.config @@ -3729,6 +3729,7 @@ CONFIG_KEYBOARD_APPLESPI=m CONFIG_KEYBOARD_ATKBD=y CONFIG_KEYBOARD_BCM=m # CONFIG_KEYBOARD_CAP11XX is not set +# CONFIG_KEYBOARD_CHARLIEPLEX is not set CONFIG_KEYBOARD_CROS_EC=m CONFIG_KEYBOARD_CYPRESS_SF=m # CONFIG_KEYBOARD_DLINK_DIR685 is not set diff --git a/kernel-x86_64-rt-debug-rhel.config b/kernel-x86_64-rt-debug-rhel.config index e243a056d..23ae1b1c6 100644 --- a/kernel-x86_64-rt-debug-rhel.config +++ b/kernel-x86_64-rt-debug-rhel.config @@ -3340,6 +3340,7 @@ CONFIG_KEXEC_SIG=y CONFIG_KEYBOARD_ATKBD=y # CONFIG_KEYBOARD_BCM is not set # CONFIG_KEYBOARD_CAP11XX is not set +# CONFIG_KEYBOARD_CHARLIEPLEX is not set # CONFIG_KEYBOARD_CYPRESS_SF is not set # CONFIG_KEYBOARD_DLINK_DIR685 is not set # CONFIG_KEYBOARD_GPIO is not set diff --git a/kernel-x86_64-rt-fedora.config b/kernel-x86_64-rt-fedora.config index fbc1d2e4e..ceb1c1798 100644 --- a/kernel-x86_64-rt-fedora.config +++ b/kernel-x86_64-rt-fedora.config @@ -3703,6 +3703,7 @@ CONFIG_KEYBOARD_APPLESPI=m CONFIG_KEYBOARD_ATKBD=y CONFIG_KEYBOARD_BCM=m # CONFIG_KEYBOARD_CAP11XX is not set +# CONFIG_KEYBOARD_CHARLIEPLEX is not set CONFIG_KEYBOARD_CROS_EC=m CONFIG_KEYBOARD_CYPRESS_SF=m # CONFIG_KEYBOARD_DLINK_DIR685 is not set diff --git a/kernel-x86_64-rt-rhel.config b/kernel-x86_64-rt-rhel.config index eb2f1f2da..ef44bb5d5 100644 --- a/kernel-x86_64-rt-rhel.config +++ b/kernel-x86_64-rt-rhel.config @@ -3320,6 +3320,7 @@ CONFIG_KEXEC_SIG=y CONFIG_KEYBOARD_ATKBD=y # CONFIG_KEYBOARD_BCM is not set # CONFIG_KEYBOARD_CAP11XX is not set +# CONFIG_KEYBOARD_CHARLIEPLEX is not set # CONFIG_KEYBOARD_CYPRESS_SF is not set # CONFIG_KEYBOARD_DLINK_DIR685 is not set # CONFIG_KEYBOARD_GPIO is not set diff --git a/kernel.changelog b/kernel.changelog index efb804916..9334a9042 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,9 +1,14 @@ -* Thu Apr 23 2026 Fedora Kernel Team [7.1.0-0.rc0.2e6803928193.5] +* Fri Apr 24 2026 Fedora Kernel Team [7.1.0-0.rc0.dd6c438c3e64.6] - automotive: enable HUGETLBFS to workaround build error (Scott Weaver) - add man-page for rv-mon-stall (Thorsten Leemhuis) - disable selftests by default for now (Thorsten Leemhuis) Resolves: +* Fri Apr 24 2026 Fedora Kernel Team [7.1.0-0.rc0.dd6c438c3e64.5] +- redhat/configs: rhel: Enable SPD5118 sensor driver (Jennifer Berringer) +- Linux v7.1.0-0.rc0.dd6c438c3e64 +Resolves: + * Thu Apr 23 2026 Fedora Kernel Team [7.1.0-0.rc0.2e6803928193.4] - Linux v7.1.0-0.rc0.2e6803928193 Resolves: diff --git a/kernel.spec b/kernel.spec index 0ae10d32d..f39af8a10 100644 --- a/kernel.spec +++ b/kernel.spec @@ -190,13 +190,13 @@ Summary: The Linux kernel %define specrpmversion 7.1.0 %define specversion 7.1.0 %define patchversion 7.1 -%define pkgrelease 0.rc0.260423g2e6803928193.5 +%define pkgrelease 0.rc0.260424gdd6c438c3e64.6 %define kversion 7 -%define tarfile_release 7.0-12687-g2e6803928193 +%define tarfile_release 7.0-13096-gdd6c438c3e64 # This is needed to do merge window version magic %define patchlevel 1 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc0.260423g2e6803928193.5%{?buildid}%{?dist} +%define specrelease 0.rc0.260424gdd6c438c3e64.6%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 7.1.0 @@ -4835,11 +4835,15 @@ fi\ # # %changelog -* Thu Apr 23 2026 Fedora Kernel Team [7.1.0-0.rc0.2e6803928193.5] +* Fri Apr 24 2026 Fedora Kernel Team [7.1.0-0.rc0.dd6c438c3e64.6] - automotive: enable HUGETLBFS to workaround build error (Scott Weaver) - add man-page for rv-mon-stall (Thorsten Leemhuis) - disable selftests by default for now (Thorsten Leemhuis) +* Fri Apr 24 2026 Fedora Kernel Team [7.1.0-0.rc0.dd6c438c3e64.5] +- redhat/configs: rhel: Enable SPD5118 sensor driver (Jennifer Berringer) +- Linux v7.1.0-0.rc0.dd6c438c3e64 + * Thu Apr 23 2026 Fedora Kernel Team [7.1.0-0.rc0.2e6803928193.4] - Linux v7.1.0-0.rc0.2e6803928193 diff --git a/patch-7.1-redhat.patch b/patch-7.1-redhat.patch index 82c48f114..3cdc84979 100644 --- a/patch-7.1-redhat.patch +++ b/patch-7.1-redhat.patch @@ -1041,7 +1041,7 @@ index d1595156c86a..9485212f1a6d 100644 return ctx.rc; } diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c -index e8cdbdb46fdb..71366d15a7db 100644 +index 530547cda8b2..dc046780c74d 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -1792,6 +1792,15 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device) @@ -2097,10 +2097,10 @@ index d10ece0889f0..e35c9d168794 100644 return rc; if (rc < 0) { diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c -index 757a296eae41..096e8bedc7ef 100644 +index caaed1a01dc0..ec7b94de5515 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c -@@ -4508,6 +4508,30 @@ static void quirk_aspeed_pci_bridge_no_alias(struct pci_dev *pdev) +@@ -4506,6 +4506,30 @@ static void quirk_aspeed_pci_bridge_no_alias(struct pci_dev *pdev) } DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ASPEED, 0x1150, quirk_aspeed_pci_bridge_no_alias); diff --git a/sources b/sources index 9fbc75d81..61de5f9ac 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-7.0-12687-g2e6803928193.tar.xz) = e110c9c91ac6ed409a56fdc699eeac33d5c9e04ac289fd9796252142c8d16862f298bce79b6e910a4837ef84e306784bb7a45c87c5235626f5c9efa69881feb6 -SHA512 (kernel-abi-stablelists-7.1.0.tar.xz) = 20dedb5eb03c26f92177675fd2dd2006b64cbd790185cfbeae93ecb1bfe74bee7e6192545e427ddad8a5fb15889a5dba332afbed11bcd53ccfdbcef384615f36 -SHA512 (kernel-kabi-dw-7.1.0.tar.xz) = 3f24aa92e1a8f36c9440012334176d31838e6ed3d45a9a40c12f8e757cbfadd639da9a2b033f65019b7dbb7b98b79aea4bc391431d80f7927eea94bde7699e20 +SHA512 (linux-7.0-13096-gdd6c438c3e64.tar.xz) = 2afead92de0f5165e6fa79b5461f3192ff99375876e290853cd2dec694f2df262bdbc1519f89b8938124bb05ba8eb4858d1015f3e0eb70435f26c7442e526830 +SHA512 (kernel-abi-stablelists-7.1.0.tar.xz) = 3c744858a69a302b77647637c0abcbc8a37e923e1b1ffe3a5576019962feaa67c779d1822f9a83320356fc044fc8358b2d487b3dd3b64af7f0f2f796cd056805 +SHA512 (kernel-kabi-dw-7.1.0.tar.xz) = 50e985f257dd8c7a3a09a20dd5636978b295af876d82c768ee3cec00610a7fca63f930bad4dff4f9f57ac7c56bb8fbc7379e3c40b229ff05656ff072600580c2