diff options
27 files changed, 92 insertions, 41 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver index 4ad6129f1..1079267d3 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 = 137 +RHEL_RELEASE = 141 # # Early y+1 numbering diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 2016f5f21..697c98857 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -3433,6 +3433,7 @@ CONFIG_LEDS_PCA9532=m CONFIG_LEDS_PCA963X=m CONFIG_LEDS_PWM=m CONFIG_LEDS_REGULATOR=m +# CONFIG_LEDS_RT8515 is not set CONFIG_LEDS_SGM3140=m # CONFIG_LEDS_SPI_BYTE is not set CONFIG_LEDS_SYSCON=y @@ -6662,6 +6663,7 @@ CONFIG_SND_SOC_SOF_HDA_PROBES=y CONFIG_SND_SOC_SOF_IMX8M_SUPPORT=y CONFIG_SND_SOC_SOF_IMX8_SUPPORT=y CONFIG_SND_SOC_SOF_IMX_TOPLEVEL=y +# CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE_LINK is not set # CONFIG_SND_SOC_SOF_NOCODEC is not set # CONFIG_SND_SOC_SOF_NOCODEC_SUPPORT is not set CONFIG_SND_SOC_SOF_OF=m @@ -6822,7 +6824,7 @@ CONFIG_SPEAKUP_SYNTH_SOFT=m CONFIG_SPEAKUP_SYNTH_SPKOUT=m CONFIG_SPEAKUP_SYNTH_TXPRT=m # CONFIG_SPI_ALTERA is not set -# CONFIG_SPI_AMD is not set +CONFIG_SPI_AMD=y CONFIG_SPI_ARMADA_3700=m # CONFIG_SPI_AXI_SPI_ENGINE is not set CONFIG_SPI_BCM2835AUX=m diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 376e3085b..7b893fdbe 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -2742,6 +2742,7 @@ CONFIG_LEDS_MLXCPLD=m # CONFIG_LEDS_PCA963X is not set # CONFIG_LEDS_PWM is not set # CONFIG_LEDS_REGULATOR is not set +# CONFIG_LEDS_RT8515 is not set # CONFIG_LEDS_SGM3140 is not set # CONFIG_LEDS_SPI_BYTE is not set # CONFIG_LEDS_SYSCON is not set @@ -5292,6 +5293,7 @@ CONFIG_SND_SOC_SOF_ALDERLAKE_SUPPORT=y CONFIG_SND_SOC_SOF_DEBUG_PROBES=y # CONFIG_SND_SOC_SOF_HDA_ALWAYS_ENABLE_DMI_L1 is not set CONFIG_SND_SOC_SOF_HDA_PROBES=y +# CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE_LINK is not set # CONFIG_SND_SOC_SOF_NOCODEC_SUPPORT is not set # CONFIG_SND_SOC_SOF_OF is not set CONFIG_SND_SOC_SOF_PCI=m @@ -5411,7 +5413,7 @@ CONFIG_SPEAKUP_SYNTH_SOFT=m CONFIG_SPEAKUP_SYNTH_SPKOUT=m CONFIG_SPEAKUP_SYNTH_TXPRT=m # CONFIG_SPI_ALTERA is not set -# CONFIG_SPI_AMD is not set +CONFIG_SPI_AMD=y # CONFIG_SPI_AXI_SPI_ENGINE is not set # CONFIG_SPI_BCM_QSPI is not set # CONFIG_SPI_BITBANG is not set diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 07428359c..6a76bd01c 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -3411,6 +3411,7 @@ CONFIG_LEDS_PCA9532=m CONFIG_LEDS_PCA963X=m CONFIG_LEDS_PWM=m CONFIG_LEDS_REGULATOR=m +# CONFIG_LEDS_RT8515 is not set CONFIG_LEDS_SGM3140=m # CONFIG_LEDS_SPI_BYTE is not set CONFIG_LEDS_SYSCON=y @@ -6637,6 +6638,7 @@ CONFIG_SND_SOC_SOF_ALDERLAKE_SUPPORT=y CONFIG_SND_SOC_SOF_IMX8M_SUPPORT=y CONFIG_SND_SOC_SOF_IMX8_SUPPORT=y CONFIG_SND_SOC_SOF_IMX_TOPLEVEL=y +# CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE_LINK is not set # CONFIG_SND_SOC_SOF_NOCODEC is not set # CONFIG_SND_SOC_SOF_NOCODEC_SUPPORT is not set CONFIG_SND_SOC_SOF_OF=m @@ -6797,7 +6799,7 @@ CONFIG_SPEAKUP_SYNTH_SOFT=m CONFIG_SPEAKUP_SYNTH_SPKOUT=m CONFIG_SPEAKUP_SYNTH_TXPRT=m # CONFIG_SPI_ALTERA is not set -# CONFIG_SPI_AMD is not set +CONFIG_SPI_AMD=y CONFIG_SPI_ARMADA_3700=m # CONFIG_SPI_AXI_SPI_ENGINE is not set CONFIG_SPI_BCM2835AUX=m diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index e355d2c89..3492a420a 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -2722,6 +2722,7 @@ CONFIG_LEDS_MLXCPLD=m # CONFIG_LEDS_PCA963X is not set # CONFIG_LEDS_PWM is not set # CONFIG_LEDS_REGULATOR is not set +# CONFIG_LEDS_RT8515 is not set # CONFIG_LEDS_SGM3140 is not set # CONFIG_LEDS_SPI_BYTE is not set # CONFIG_LEDS_SYSCON is not set @@ -5269,6 +5270,7 @@ CONFIG_SND_SOC_SOF_ALDERLAKE_SUPPORT=y # CONFIG_SND_SOC_SOF_DEBUG is not set # CONFIG_SND_SOC_SOF_DEBUG_PROBES is not set # CONFIG_SND_SOC_SOF_HDA_ALWAYS_ENABLE_DMI_L1 is not set +# CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE_LINK is not set # CONFIG_SND_SOC_SOF_NOCODEC_SUPPORT is not set # CONFIG_SND_SOC_SOF_OF is not set CONFIG_SND_SOC_SOF_PCI=m @@ -5388,7 +5390,7 @@ CONFIG_SPEAKUP_SYNTH_SOFT=m CONFIG_SPEAKUP_SYNTH_SPKOUT=m CONFIG_SPEAKUP_SYNTH_TXPRT=m # CONFIG_SPI_ALTERA is not set -# CONFIG_SPI_AMD is not set +CONFIG_SPI_AMD=y # CONFIG_SPI_AXI_SPI_ENGINE is not set # CONFIG_SPI_BCM_QSPI is not set # CONFIG_SPI_BITBANG is not set diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index c7464e8cb..ebb8d97ad 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -3483,6 +3483,7 @@ CONFIG_LEDS_PCA963X=m CONFIG_LEDS_PM8058=m CONFIG_LEDS_PWM=m CONFIG_LEDS_REGULATOR=m +# CONFIG_LEDS_RT8515 is not set CONFIG_LEDS_SGM3140=m # CONFIG_LEDS_SPI_BYTE is not set CONFIG_LEDS_SYSCON=y @@ -6840,6 +6841,7 @@ CONFIG_SND_SOC_SOF_ALDERLAKE_SUPPORT=y # CONFIG_SND_SOC_SOF_DEBUG_PROBES is not set # CONFIG_SND_SOC_SOF_HDA_ALWAYS_ENABLE_DMI_L1 is not set CONFIG_SND_SOC_SOF_HDA_PROBES=y +# CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE_LINK is not set # CONFIG_SND_SOC_SOF_NOCODEC is not set # CONFIG_SND_SOC_SOF_NOCODEC_SUPPORT is not set # CONFIG_SND_SOC_SOF_OF is not set @@ -7034,7 +7036,7 @@ CONFIG_SPEAKUP_SYNTH_SOFT=m CONFIG_SPEAKUP_SYNTH_SPKOUT=m CONFIG_SPEAKUP_SYNTH_TXPRT=m # CONFIG_SPI_ALTERA is not set -# CONFIG_SPI_AMD is not set +CONFIG_SPI_AMD=y CONFIG_SPI_ARMADA_3700=m # CONFIG_SPI_AXI_SPI_ENGINE is not set CONFIG_SPI_BCM2835AUX=m diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index 2f8f79344..fc7aec0aa 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -3464,6 +3464,7 @@ CONFIG_LEDS_PCA963X=m CONFIG_LEDS_PM8058=m CONFIG_LEDS_PWM=m CONFIG_LEDS_REGULATOR=m +# CONFIG_LEDS_RT8515 is not set CONFIG_LEDS_SGM3140=m # CONFIG_LEDS_SPI_BYTE is not set CONFIG_LEDS_SYSCON=y @@ -6818,6 +6819,7 @@ CONFIG_SND_SOC_SOF_ALDERLAKE_SUPPORT=y # CONFIG_SND_SOC_SOF_DEBUG is not set # CONFIG_SND_SOC_SOF_DEBUG_PROBES is not set # CONFIG_SND_SOC_SOF_HDA_ALWAYS_ENABLE_DMI_L1 is not set +# CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE_LINK is not set # CONFIG_SND_SOC_SOF_NOCODEC is not set # CONFIG_SND_SOC_SOF_NOCODEC_SUPPORT is not set # CONFIG_SND_SOC_SOF_OF is not set @@ -7012,7 +7014,7 @@ CONFIG_SPEAKUP_SYNTH_SOFT=m CONFIG_SPEAKUP_SYNTH_SPKOUT=m CONFIG_SPEAKUP_SYNTH_TXPRT=m # CONFIG_SPI_ALTERA is not set -# CONFIG_SPI_AMD is not set +CONFIG_SPI_AMD=y CONFIG_SPI_ARMADA_3700=m # CONFIG_SPI_AXI_SPI_ENGINE is not set CONFIG_SPI_BCM2835AUX=m diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index 1c51ad499..5650ddfcb 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -3410,6 +3410,7 @@ CONFIG_LEDS_PCA9532=m CONFIG_LEDS_PCA963X=m CONFIG_LEDS_PWM=m CONFIG_LEDS_REGULATOR=m +# CONFIG_LEDS_RT8515 is not set CONFIG_LEDS_SGM3140=m # CONFIG_LEDS_SPI_BYTE is not set CONFIG_LEDS_SYSCON=y @@ -6632,6 +6633,7 @@ CONFIG_SND_SOC_SOF_ALDERLAKE_SUPPORT=y # CONFIG_SND_SOC_SOF_DEBUG_PROBES is not set # CONFIG_SND_SOC_SOF_HDA_ALWAYS_ENABLE_DMI_L1 is not set CONFIG_SND_SOC_SOF_HDA_PROBES=y +# CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE_LINK is not set # CONFIG_SND_SOC_SOF_NOCODEC is not set # CONFIG_SND_SOC_SOF_NOCODEC_SUPPORT is not set # CONFIG_SND_SOC_SOF_OF is not set @@ -6803,7 +6805,7 @@ CONFIG_SPEAKUP_SYNTH_SOFT=m CONFIG_SPEAKUP_SYNTH_SPKOUT=m CONFIG_SPEAKUP_SYNTH_TXPRT=m # CONFIG_SPI_ALTERA is not set -# CONFIG_SPI_AMD is not set +CONFIG_SPI_AMD=y CONFIG_SPI_ARMADA_3700=m # CONFIG_SPI_AXI_SPI_ENGINE is not set CONFIG_SPI_BCM2835AUX=m diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index d49510d1c..68b2251df 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -3391,6 +3391,7 @@ CONFIG_LEDS_PCA9532=m CONFIG_LEDS_PCA963X=m CONFIG_LEDS_PWM=m CONFIG_LEDS_REGULATOR=m +# CONFIG_LEDS_RT8515 is not set CONFIG_LEDS_SGM3140=m # CONFIG_LEDS_SPI_BYTE is not set CONFIG_LEDS_SYSCON=y @@ -6610,6 +6611,7 @@ CONFIG_SND_SOC_SOF_ALDERLAKE_SUPPORT=y # CONFIG_SND_SOC_SOF_DEBUG is not set # CONFIG_SND_SOC_SOF_DEBUG_PROBES is not set # CONFIG_SND_SOC_SOF_HDA_ALWAYS_ENABLE_DMI_L1 is not set +# CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE_LINK is not set # CONFIG_SND_SOC_SOF_NOCODEC is not set # CONFIG_SND_SOC_SOF_NOCODEC_SUPPORT is not set # CONFIG_SND_SOC_SOF_OF is not set @@ -6781,7 +6783,7 @@ CONFIG_SPEAKUP_SYNTH_SOFT=m CONFIG_SPEAKUP_SYNTH_SPKOUT=m CONFIG_SPEAKUP_SYNTH_TXPRT=m # CONFIG_SPI_ALTERA is not set -# CONFIG_SPI_AMD is not set +CONFIG_SPI_AMD=y CONFIG_SPI_ARMADA_3700=m # CONFIG_SPI_AXI_SPI_ENGINE is not set CONFIG_SPI_BCM2835AUX=m diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config index c3fd5a470..266ba8820 100644 --- a/kernel-i686-debug-fedora.config +++ b/kernel-i686-debug-fedora.config @@ -3114,6 +3114,7 @@ CONFIG_LEDS_PCA9532=m # CONFIG_LEDS_PCA963X is not set # CONFIG_LEDS_PWM is not set CONFIG_LEDS_REGULATOR=m +# CONFIG_LEDS_RT8515 is not set # CONFIG_LEDS_SGM3140 is not set # CONFIG_LEDS_SPI_BYTE is not set # CONFIG_LEDS_SYSCON is not set @@ -6177,7 +6178,7 @@ CONFIG_SPEAKUP_SYNTH_SOFT=m CONFIG_SPEAKUP_SYNTH_SPKOUT=m CONFIG_SPEAKUP_SYNTH_TXPRT=m # CONFIG_SPI_ALTERA is not set -# CONFIG_SPI_AMD is not set +CONFIG_SPI_AMD=y # CONFIG_SPI_AXI_SPI_ENGINE is not set # CONFIG_SPI_BITBANG is not set # CONFIG_SPI_BUTTERFLY is not set diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config index 00c97bbf8..0e794194d 100644 --- a/kernel-i686-fedora.config +++ b/kernel-i686-fedora.config @@ -3094,6 +3094,7 @@ CONFIG_LEDS_PCA9532=m # CONFIG_LEDS_PCA963X is not set # CONFIG_LEDS_PWM is not set CONFIG_LEDS_REGULATOR=m +# CONFIG_LEDS_RT8515 is not set # CONFIG_LEDS_SGM3140 is not set # CONFIG_LEDS_SPI_BYTE is not set # CONFIG_LEDS_SYSCON is not set @@ -6155,7 +6156,7 @@ CONFIG_SPEAKUP_SYNTH_SOFT=m CONFIG_SPEAKUP_SYNTH_SPKOUT=m CONFIG_SPEAKUP_SYNTH_TXPRT=m # CONFIG_SPI_ALTERA is not set -# CONFIG_SPI_AMD is not set +CONFIG_SPI_AMD=y # CONFIG_SPI_AXI_SPI_ENGINE is not set # CONFIG_SPI_BITBANG is not set # CONFIG_SPI_BUTTERFLY is not set diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index 3f94c4417..ffc756b7d 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -2868,6 +2868,7 @@ CONFIG_LEDS_PCA9532=m CONFIG_LEDS_POWERNV=m # CONFIG_LEDS_PWM is not set CONFIG_LEDS_REGULATOR=m +# CONFIG_LEDS_RT8515 is not set # CONFIG_LEDS_SGM3140 is not set # CONFIG_LEDS_SPI_BYTE is not set # CONFIG_LEDS_SYSCON is not set @@ -5650,6 +5651,7 @@ CONFIG_SND_SOC_SOF_ALDERLAKE_SUPPORT=y # CONFIG_SND_SOC_SOF_DEBUG_PROBES is not set # CONFIG_SND_SOC_SOF_HDA_ALWAYS_ENABLE_DMI_L1 is not set CONFIG_SND_SOC_SOF_HDA_PROBES=y +# CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE_LINK is not set # CONFIG_SND_SOC_SOF_NOCODEC is not set # CONFIG_SND_SOC_SOF_NOCODEC_SUPPORT is not set # CONFIG_SND_SOC_SOF_OF is not set @@ -5777,7 +5779,7 @@ CONFIG_SPEAKUP_SYNTH_SOFT=m CONFIG_SPEAKUP_SYNTH_SPKOUT=m CONFIG_SPEAKUP_SYNTH_TXPRT=m # CONFIG_SPI_ALTERA is not set -# CONFIG_SPI_AMD is not set +CONFIG_SPI_AMD=y # CONFIG_SPI_AXI_SPI_ENGINE is not set # CONFIG_SPI_BITBANG is not set # CONFIG_SPI_BUTTERFLY is not set diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index 2165d2d70..38f5f3be1 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -2619,6 +2619,7 @@ CONFIG_LEDS_MLXCPLD=m CONFIG_LEDS_POWERNV=m # CONFIG_LEDS_PWM is not set # CONFIG_LEDS_REGULATOR is not set +# CONFIG_LEDS_RT8515 is not set # CONFIG_LEDS_SGM3140 is not set # CONFIG_LEDS_SPI_BYTE is not set # CONFIG_LEDS_SYSCON is not set @@ -5138,6 +5139,7 @@ CONFIG_SND_SOC_SOF_ALDERLAKE_SUPPORT=y CONFIG_SND_SOC_SOF_DEBUG_PROBES=y # CONFIG_SND_SOC_SOF_HDA_ALWAYS_ENABLE_DMI_L1 is not set CONFIG_SND_SOC_SOF_HDA_PROBES=y +# CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE_LINK is not set # CONFIG_SND_SOC_SOF_NOCODEC_SUPPORT is not set # CONFIG_SND_SOC_SOF_OF is not set CONFIG_SND_SOC_SOF_PCI=m @@ -5258,7 +5260,7 @@ CONFIG_SPEAKUP_SYNTH_SOFT=m CONFIG_SPEAKUP_SYNTH_SPKOUT=m CONFIG_SPEAKUP_SYNTH_TXPRT=m # CONFIG_SPI_ALTERA is not set -# CONFIG_SPI_AMD is not set +CONFIG_SPI_AMD=y # CONFIG_SPI_AXI_SPI_ENGINE is not set # CONFIG_SPI_BITBANG is not set # CONFIG_SPI_BUTTERFLY is not set diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index 2f05413c8..35501008a 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -2848,6 +2848,7 @@ CONFIG_LEDS_PCA9532=m CONFIG_LEDS_POWERNV=m # CONFIG_LEDS_PWM is not set CONFIG_LEDS_REGULATOR=m +# CONFIG_LEDS_RT8515 is not set # CONFIG_LEDS_SGM3140 is not set # CONFIG_LEDS_SPI_BYTE is not set # CONFIG_LEDS_SYSCON is not set @@ -5627,6 +5628,7 @@ CONFIG_SND_SOC_SOF_ALDERLAKE_SUPPORT=y # CONFIG_SND_SOC_SOF_DEBUG is not set # CONFIG_SND_SOC_SOF_DEBUG_PROBES is not set # CONFIG_SND_SOC_SOF_HDA_ALWAYS_ENABLE_DMI_L1 is not set +# CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE_LINK is not set # CONFIG_SND_SOC_SOF_NOCODEC is not set # CONFIG_SND_SOC_SOF_NOCODEC_SUPPORT is not set # CONFIG_SND_SOC_SOF_OF is not set @@ -5754,7 +5756,7 @@ CONFIG_SPEAKUP_SYNTH_SOFT=m CONFIG_SPEAKUP_SYNTH_SPKOUT=m CONFIG_SPEAKUP_SYNTH_TXPRT=m # CONFIG_SPI_ALTERA is not set -# CONFIG_SPI_AMD is not set +CONFIG_SPI_AMD=y # CONFIG_SPI_AXI_SPI_ENGINE is not set # CONFIG_SPI_BITBANG is not set # CONFIG_SPI_BUTTERFLY is not set diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index a61f7792c..c728d5be5 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -2602,6 +2602,7 @@ CONFIG_LEDS_MLXCPLD=m CONFIG_LEDS_POWERNV=m # CONFIG_LEDS_PWM is not set # CONFIG_LEDS_REGULATOR is not set +# CONFIG_LEDS_RT8515 is not set # CONFIG_LEDS_SGM3140 is not set # CONFIG_LEDS_SPI_BYTE is not set # CONFIG_LEDS_SYSCON is not set @@ -5119,6 +5120,7 @@ CONFIG_SND_SOC_SOF_ALDERLAKE_SUPPORT=y # CONFIG_SND_SOC_SOF_DEBUG is not set # CONFIG_SND_SOC_SOF_DEBUG_PROBES is not set # CONFIG_SND_SOC_SOF_HDA_ALWAYS_ENABLE_DMI_L1 is not set +# CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE_LINK is not set # CONFIG_SND_SOC_SOF_NOCODEC_SUPPORT is not set # CONFIG_SND_SOC_SOF_OF is not set CONFIG_SND_SOC_SOF_PCI=m @@ -5239,7 +5241,7 @@ CONFIG_SPEAKUP_SYNTH_SOFT=m CONFIG_SPEAKUP_SYNTH_SPKOUT=m CONFIG_SPEAKUP_SYNTH_TXPRT=m # CONFIG_SPI_ALTERA is not set -# CONFIG_SPI_AMD is not set +CONFIG_SPI_AMD=y # CONFIG_SPI_AXI_SPI_ENGINE is not set # CONFIG_SPI_BITBANG is not set # CONFIG_SPI_BUTTERFLY is not set diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index e37706292..edf7492c7 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -2842,6 +2842,7 @@ CONFIG_LEDS_PCA9532=m # CONFIG_LEDS_PCA963X is not set # CONFIG_LEDS_PWM is not set CONFIG_LEDS_REGULATOR=m +# CONFIG_LEDS_RT8515 is not set # CONFIG_LEDS_SGM3140 is not set # CONFIG_LEDS_SPI_BYTE is not set # CONFIG_LEDS_SYSCON is not set @@ -5592,6 +5593,7 @@ CONFIG_SND_SOC_SOF_ALDERLAKE_SUPPORT=y # CONFIG_SND_SOC_SOF_DEBUG_PROBES is not set # CONFIG_SND_SOC_SOF_HDA_ALWAYS_ENABLE_DMI_L1 is not set CONFIG_SND_SOC_SOF_HDA_PROBES=y +# CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE_LINK is not set # CONFIG_SND_SOC_SOF_NOCODEC is not set # CONFIG_SND_SOC_SOF_NOCODEC_SUPPORT is not set # CONFIG_SND_SOC_SOF_OF is not set @@ -5716,7 +5718,7 @@ CONFIG_SPEAKUP_SYNTH_SOFT=m CONFIG_SPEAKUP_SYNTH_SPKOUT=m CONFIG_SPEAKUP_SYNTH_TXPRT=m # CONFIG_SPI_ALTERA is not set -# CONFIG_SPI_AMD is not set +CONFIG_SPI_AMD=y # CONFIG_SPI_AXI_SPI_ENGINE is not set # CONFIG_SPI_BITBANG is not set # CONFIG_SPI_BUTTERFLY is not set diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index ef303cc24..9e8990489 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -2591,6 +2591,7 @@ CONFIG_LEDS_MLXCPLD=m # CONFIG_LEDS_PCA963X is not set # CONFIG_LEDS_PWM is not set # CONFIG_LEDS_REGULATOR is not set +# CONFIG_LEDS_RT8515 is not set # CONFIG_LEDS_SGM3140 is not set # CONFIG_LEDS_SPI_BYTE is not set # CONFIG_LEDS_SYSCON is not set @@ -5081,6 +5082,7 @@ CONFIG_SND_SOC_SOF_ALDERLAKE_SUPPORT=y CONFIG_SND_SOC_SOF_DEBUG_PROBES=y # CONFIG_SND_SOC_SOF_HDA_ALWAYS_ENABLE_DMI_L1 is not set CONFIG_SND_SOC_SOF_HDA_PROBES=y +# CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE_LINK is not set # CONFIG_SND_SOC_SOF_NOCODEC_SUPPORT is not set # CONFIG_SND_SOC_SOF_OF is not set CONFIG_SND_SOC_SOF_PCI=m @@ -5200,7 +5202,7 @@ CONFIG_SPEAKUP_SYNTH_SOFT=m CONFIG_SPEAKUP_SYNTH_SPKOUT=m CONFIG_SPEAKUP_SYNTH_TXPRT=m # CONFIG_SPI_ALTERA is not set -# CONFIG_SPI_AMD is not set +CONFIG_SPI_AMD=y # CONFIG_SPI_AXI_SPI_ENGINE is not set # CONFIG_SPI_BITBANG is not set # CONFIG_SPI_BUTTERFLY is not set diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 45a9a2392..832f21e24 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -2822,6 +2822,7 @@ CONFIG_LEDS_PCA9532=m # CONFIG_LEDS_PCA963X is not set # CONFIG_LEDS_PWM is not set CONFIG_LEDS_REGULATOR=m +# CONFIG_LEDS_RT8515 is not set # CONFIG_LEDS_SGM3140 is not set # CONFIG_LEDS_SPI_BYTE is not set # CONFIG_LEDS_SYSCON is not set @@ -5569,6 +5570,7 @@ CONFIG_SND_SOC_SOF_ALDERLAKE_SUPPORT=y # CONFIG_SND_SOC_SOF_DEBUG is not set # CONFIG_SND_SOC_SOF_DEBUG_PROBES is not set # CONFIG_SND_SOC_SOF_HDA_ALWAYS_ENABLE_DMI_L1 is not set +# CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE_LINK is not set # CONFIG_SND_SOC_SOF_NOCODEC is not set # CONFIG_SND_SOC_SOF_NOCODEC_SUPPORT is not set # CONFIG_SND_SOC_SOF_OF is not set @@ -5693,7 +5695,7 @@ CONFIG_SPEAKUP_SYNTH_SOFT=m CONFIG_SPEAKUP_SYNTH_SPKOUT=m CONFIG_SPEAKUP_SYNTH_TXPRT=m # CONFIG_SPI_ALTERA is not set -# CONFIG_SPI_AMD is not set +CONFIG_SPI_AMD=y # CONFIG_SPI_AXI_SPI_ENGINE is not set # CONFIG_SPI_BITBANG is not set # CONFIG_SPI_BUTTERFLY is not set diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 91fece993..b58ba0c17 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -2574,6 +2574,7 @@ CONFIG_LEDS_MLXCPLD=m # CONFIG_LEDS_PCA963X is not set # CONFIG_LEDS_PWM is not set # CONFIG_LEDS_REGULATOR is not set +# CONFIG_LEDS_RT8515 is not set # CONFIG_LEDS_SGM3140 is not set # CONFIG_LEDS_SPI_BYTE is not set # CONFIG_LEDS_SYSCON is not set @@ -5062,6 +5063,7 @@ CONFIG_SND_SOC_SOF_ALDERLAKE_SUPPORT=y # CONFIG_SND_SOC_SOF_DEBUG is not set # CONFIG_SND_SOC_SOF_DEBUG_PROBES is not set # CONFIG_SND_SOC_SOF_HDA_ALWAYS_ENABLE_DMI_L1 is not set +# CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE_LINK is not set # CONFIG_SND_SOC_SOF_NOCODEC_SUPPORT is not set # CONFIG_SND_SOC_SOF_OF is not set CONFIG_SND_SOC_SOF_PCI=m @@ -5181,7 +5183,7 @@ CONFIG_SPEAKUP_SYNTH_SOFT=m CONFIG_SPEAKUP_SYNTH_SPKOUT=m CONFIG_SPEAKUP_SYNTH_TXPRT=m # CONFIG_SPI_ALTERA is not set -# CONFIG_SPI_AMD is not set +CONFIG_SPI_AMD=y # CONFIG_SPI_AXI_SPI_ENGINE is not set # CONFIG_SPI_BITBANG is not set # CONFIG_SPI_BUTTERFLY is not set diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index a92a429c0..17c90712e 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -2593,6 +2593,7 @@ CONFIG_LEDS_MLXCPLD=m # CONFIG_LEDS_PCA963X is not set # CONFIG_LEDS_PWM is not set # CONFIG_LEDS_REGULATOR is not set +# CONFIG_LEDS_RT8515 is not set # CONFIG_LEDS_SGM3140 is not set # CONFIG_LEDS_SPI_BYTE is not set # CONFIG_LEDS_SYSCON is not set @@ -5091,6 +5092,7 @@ CONFIG_SND_SOC_SOF_ALDERLAKE_SUPPORT=y # CONFIG_SND_SOC_SOF_DEBUG is not set # CONFIG_SND_SOC_SOF_DEBUG_PROBES is not set # CONFIG_SND_SOC_SOF_HDA_ALWAYS_ENABLE_DMI_L1 is not set +# CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE_LINK is not set # CONFIG_SND_SOC_SOF_NOCODEC_SUPPORT is not set # CONFIG_SND_SOC_SOF_OF is not set CONFIG_SND_SOC_SOF_PCI=m @@ -5210,7 +5212,7 @@ CONFIG_SPEAKUP_SYNTH_SOFT=m CONFIG_SPEAKUP_SYNTH_SPKOUT=m CONFIG_SPEAKUP_SYNTH_TXPRT=m # CONFIG_SPI_ALTERA is not set -# CONFIG_SPI_AMD is not set +CONFIG_SPI_AMD=y # CONFIG_SPI_AXI_SPI_ENGINE is not set # CONFIG_SPI_BITBANG is not set # CONFIG_SPI_BUTTERFLY is not set diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 8aea208f0..979153c45 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -3170,6 +3170,7 @@ CONFIG_LEDS_PCA9532=m # CONFIG_LEDS_PCA963X is not set # CONFIG_LEDS_PWM is not set # CONFIG_LEDS_REGULATOR is not set +# CONFIG_LEDS_RT8515 is not set # CONFIG_LEDS_SGM3140 is not set # CONFIG_LEDS_SPI_BYTE is not set # CONFIG_LEDS_SYSCON is not set @@ -6234,7 +6235,7 @@ CONFIG_SPEAKUP_SYNTH_SOFT=m CONFIG_SPEAKUP_SYNTH_SPKOUT=m CONFIG_SPEAKUP_SYNTH_TXPRT=m # CONFIG_SPI_ALTERA is not set -# CONFIG_SPI_AMD is not set +CONFIG_SPI_AMD=y # CONFIG_SPI_AXI_SPI_ENGINE is not set # CONFIG_SPI_BITBANG is not set # CONFIG_SPI_BUTTERFLY is not set diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index ae500fcb8..76ac17d3c 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -2779,6 +2779,7 @@ CONFIG_LEDS_MLXCPLD=m # CONFIG_LEDS_PCA963X is not set # CONFIG_LEDS_PWM is not set # CONFIG_LEDS_REGULATOR is not set +# CONFIG_LEDS_RT8515 is not set # CONFIG_LEDS_SGM3140 is not set # CONFIG_LEDS_SPI_BYTE is not set # CONFIG_LEDS_SYSCON is not set @@ -5327,6 +5328,7 @@ CONFIG_SND_SOC_SOF_HDA_COMMON_HDMI_CODEC=y CONFIG_SND_SOC_SOF_HDA_LINK=y CONFIG_SND_SOC_SOF_HDA_PROBES=y CONFIG_SND_SOC_SOF_ICELAKE_SUPPORT=y +# CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE_LINK is not set CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL=y # CONFIG_SND_SOC_SOF_JASPERLAKE_SUPPORT is not set CONFIG_SND_SOC_SOF_MERRIFIELD_SUPPORT=y @@ -5456,7 +5458,7 @@ CONFIG_SPEAKUP_SYNTH_SOFT=m CONFIG_SPEAKUP_SYNTH_SPKOUT=m CONFIG_SPEAKUP_SYNTH_TXPRT=m # CONFIG_SPI_ALTERA is not set -# CONFIG_SPI_AMD is not set +CONFIG_SPI_AMD=y # CONFIG_SPI_AXI_SPI_ENGINE is not set # CONFIG_SPI_BITBANG is not set # CONFIG_SPI_BUTTERFLY is not set diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index dfd9169dd..ef8c8ae5c 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -3148,6 +3148,7 @@ CONFIG_LEDS_PCA9532=m # CONFIG_LEDS_PCA963X is not set # CONFIG_LEDS_PWM is not set # CONFIG_LEDS_REGULATOR is not set +# CONFIG_LEDS_RT8515 is not set # CONFIG_LEDS_SGM3140 is not set # CONFIG_LEDS_SPI_BYTE is not set # CONFIG_LEDS_SYSCON is not set @@ -6210,7 +6211,7 @@ CONFIG_SPEAKUP_SYNTH_SOFT=m CONFIG_SPEAKUP_SYNTH_SPKOUT=m CONFIG_SPEAKUP_SYNTH_TXPRT=m # CONFIG_SPI_ALTERA is not set -# CONFIG_SPI_AMD is not set +CONFIG_SPI_AMD=y # CONFIG_SPI_AXI_SPI_ENGINE is not set # CONFIG_SPI_BITBANG is not set # CONFIG_SPI_BUTTERFLY is not set diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 7f9fdda72..290eb588e 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -2760,6 +2760,7 @@ CONFIG_LEDS_MLXCPLD=m # CONFIG_LEDS_PCA963X is not set # CONFIG_LEDS_PWM is not set # CONFIG_LEDS_REGULATOR is not set +# CONFIG_LEDS_RT8515 is not set # CONFIG_LEDS_SGM3140 is not set # CONFIG_LEDS_SPI_BYTE is not set # CONFIG_LEDS_SYSCON is not set @@ -5305,6 +5306,7 @@ CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC=y CONFIG_SND_SOC_SOF_HDA_COMMON_HDMI_CODEC=y CONFIG_SND_SOC_SOF_HDA_LINK=y CONFIG_SND_SOC_SOF_ICELAKE_SUPPORT=y +# CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE_LINK is not set CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL=y # CONFIG_SND_SOC_SOF_JASPERLAKE_SUPPORT is not set CONFIG_SND_SOC_SOF_MERRIFIELD_SUPPORT=y @@ -5434,7 +5436,7 @@ CONFIG_SPEAKUP_SYNTH_SOFT=m CONFIG_SPEAKUP_SYNTH_SPKOUT=m CONFIG_SPEAKUP_SYNTH_TXPRT=m # CONFIG_SPI_ALTERA is not set -# CONFIG_SPI_AMD is not set +CONFIG_SPI_AMD=y # CONFIG_SPI_AXI_SPI_ENGINE is not set # CONFIG_SPI_BITBANG is not set # CONFIG_SPI_BUTTERFLY is not set diff --git a/kernel.spec b/kernel.spec index 1dbd91099..757eae64d 100755 --- a/kernel.spec +++ b/kernel.spec @@ -64,7 +64,7 @@ Summary: The Linux kernel # For a stable, released kernel, released_kernel should be 1. %global released_kernel 0 -%global distro_build 0.rc5.20210128git76c057c84d28.137 +%global distro_build 0.rc6.141 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -105,13 +105,13 @@ Summary: The Linux kernel %endif %define rpmversion 5.11.0 -%define pkgrelease 0.rc5.20210128git76c057c84d28.137 +%define pkgrelease 0.rc6.141 # This is needed to do merge window version magic %define patchlevel 11 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc5.20210128git76c057c84d28.137%{?buildid}%{?dist} +%define specrelease 0.rc6.141%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -201,7 +201,7 @@ Summary: The Linux kernel # Set debugbuildsenabled to 1 for production (build separate debug kernels) # and 0 for rawhide (all kernels are debug kernels). # See also 'make debug' and 'make release'. -%define debugbuildsenabled 0 +%define debugbuildsenabled 1 # The kernel tarball/base version %define kversion 5.11 @@ -601,7 +601,7 @@ BuildRequires: asciidoc # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-20210128git76c057c84d28.tar.xz +Source0: linux-5.11-rc6.tar.xz Source1: Makefile.rhelver @@ -1246,8 +1246,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-20210128git76c057c84d28 -c -mv linux-20210128git76c057c84d28 linux-%{KVERREL} +%setup -q -n kernel-5.11-rc6 -c +mv linux-5.11-rc6 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -2296,6 +2296,8 @@ popd pushd tools/bpf/bpftool %{bpftool_make} prefix=%{_prefix} bash_compdir=%{_sysconfdir}/bash_completion.d/ mandir=%{_mandir} install doc-install popd +# man-pages packages this (rhbz #1686954, #1918707) +rm %{buildroot}%{_mandir}/man7/bpf-helpers.7 %endif %if %{with_selftests} @@ -2622,7 +2624,6 @@ fi %{_mandir}/man8/bpftool-prog.8.gz %{_mandir}/man8/bpftool-perf.8.gz %{_mandir}/man8/bpftool.8.gz -%{_mandir}/man7/bpf-helpers.7.gz %{_mandir}/man8/bpftool-net.8.gz %{_mandir}/man8/bpftool-feature.8.gz %{_mandir}/man8/bpftool-btf.8.gz @@ -2735,12 +2736,20 @@ fi # # %changelog -* Thu Jan 28 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-0.rc5.20210128git76c057c84d28.137] -- Turn off CONFIG_VIRTIO_CONSOLE for s390x zfcpdump (Justin M. Forbes) +* Mon Feb 01 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-0.rc6.141] - redhat: replace inline awk script with genlog.py call (Herton R. Krzesinski) - redhat: add genlog.py script (Herton R. Krzesinski) - Turn off vdso_install for ppc (Justin M. Forbes) +* Sun Jan 31 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-0.rc5.20210131git0e9bcda5d286.139] +- Remove bpf-helpers.7 from bpftool package (Jiri Olsa) + +* Sat Jan 30 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-0.rc5.20210130git0e9bcda5d286.138] +- New configs in lib/Kconfig.debug (Fedora Kernel Team) + +* Fri Jan 29 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-0.rc5.20210129gitbec4c2968fce.137] +- Turn off CONFIG_VIRTIO_CONSOLE for s390x zfcpdump ("Justin M. Forbes") + * Thu Jan 28 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-0.rc5.20210128git76c057c84d28.136] - Keep VIRTIO_CONSOLE on s390x available. (=?UTF-8?q?Jakub=20=C4=8Cajka?=) - New configs in drivers/clk ("Justin M. Forbes") diff --git a/patch-5.11.0-redhat.patch b/patch-5.11.0-redhat.patch index 1ba0d7328..c7c24aa63 100644 --- a/patch-5.11.0-redhat.patch +++ b/patch-5.11.0-redhat.patch @@ -201,7 +201,7 @@ index 000000000000..effb81d04bfd + +endmenu diff --git a/Makefile b/Makefile -index e0af7a4a5598..ef96c9dae155 100644 +index f5842126e89d..5d5845be64e8 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -1731,10 +1731,10 @@ index af0ce5611e4a..1c226920c12d 100644 out_mptspi_probe: diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c -index c52b9bb0e3ab..3e463dccac33 100644 +index e10ca8929f85..17f256875fa7 100644 --- a/drivers/net/ethernet/intel/ice/ice_main.c +++ b/drivers/net/ethernet/intel/ice/ice_main.c -@@ -4810,6 +4810,7 @@ static int __init ice_module_init(void) +@@ -4806,6 +4806,7 @@ static int __init ice_module_init(void) pr_info("%s\n", ice_driver_string); pr_info("%s\n", ice_copyright); @@ -2022,7 +2022,7 @@ index c8b09a81834d..24c8d6ea8838 100644 { MPI2_MFGPAGE_VENDORID_LSI, MPI25_MFGPAGE_DEVID_SAS3004, PCI_ANY_ID, PCI_ANY_ID }, diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c -index f80abe28f35a..02d8de118b5f 100644 +index 0e0fe5b09496..5a85e3edf898 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c @@ -7698,6 +7698,7 @@ static const struct pci_error_handlers qla2xxx_err_handler = { @@ -1,3 +1,3 @@ -SHA512 (linux-20210128git76c057c84d28.tar.xz) = b44423341c6f033e3a49458d1262a9ca97201e91191db2722d60be11e0f3ed6f06e56329b4119a81fe72108fc6a3353f3e8d011145d73d798f4f3104ed50a564 -SHA512 (kernel-abi-whitelists-5.11.0-0.rc5.20210128git76c057c84d28.137.tar.bz2) = d7c3f07d1e438a04b6a389bcf596e34cf5a1de6cfba387b43ffdc165e987e5442ec5e0efd1cc22cd2e6807847615f898595e8919535bacd9e8fd448458c0a342 -SHA512 (kernel-kabi-dw-5.11.0-0.rc5.20210128git76c057c84d28.137.tar.bz2) = a6f8f2b40e0fc77ea4a339026f1c7ac0c9380aee7f9238d71cd81a0a2b47766ee166a7cc895ba1810a2071ccf45d4aedd839c97cbeee09f1953186a4b99c9c4f +SHA512 (linux-5.11-rc6.tar.xz) = fd40c54ef8e98edde6469ad927c42e658e1650337a7ffe47e9e043fe9c45e30dea4e469342d4d90d893eb09f91f8881db793330858acb260de558a74455d5476 +SHA512 (kernel-abi-whitelists-5.11.0-0.rc6.141.tar.bz2) = 5082588f5d3dbffb7b6370fe1111181b503c157d461b346b8461fb1cbf8e9aad4ce42f43c9e0e7d159a46ce6d8f38c567821bc3c3552a8bfb45a1a089b8cdab1 +SHA512 (kernel-kabi-dw-5.11.0-0.rc6.141.tar.bz2) = 902650dbe71f6400d053973fe8d3c9b23f7fb53d336013cf95575bc425b52bc886c91ffc5d7e0fcf50cd891fef13dec6a5db94afab5448d7424d49af70f636e3 |