From f13174334843d810c78c0f9ecca520558d63f9c9 Mon Sep 17 00:00:00 2001 From: "Herton R. Krzesinski" Date: Mon, 1 Feb 2021 14:58:17 -0500 Subject: [PATCH] kernel-5.11.0-0.rc6.141.el9 * Mon Feb 01 2021 Herton R. Krzesinski [5.11.0-0.rc6.141] - v5.11-rc6 rebase - Remove bpf-helpers.7 from bpftool package (Jiri Olsa) - [redhat] Makefile: consolidate rpmbuild cmds into one target (Ben Crocker) - New configs in lib/Kconfig.debug (Fedora Kernel Team) Signed-off-by: Herton R. Krzesinski --- Makefile.rhelver | 2 +- kernel-aarch64-debug-fedora.config | 3 ++- kernel-aarch64-debug-rhel.config | 3 ++- kernel-aarch64-fedora.config | 3 ++- kernel-aarch64-rhel.config | 3 ++- kernel-armv7hl-debug-fedora.config | 3 ++- kernel-armv7hl-fedora.config | 3 ++- kernel-armv7hl-lpae-debug-fedora.config | 3 ++- kernel-armv7hl-lpae-fedora.config | 3 ++- kernel-i686-debug-fedora.config | 3 ++- kernel-i686-fedora.config | 3 ++- kernel-ppc64le-debug-fedora.config | 3 ++- kernel-ppc64le-debug-rhel.config | 3 ++- kernel-ppc64le-fedora.config | 3 ++- kernel-ppc64le-rhel.config | 3 ++- kernel-s390x-debug-fedora.config | 3 ++- kernel-s390x-debug-rhel.config | 3 ++- kernel-s390x-fedora.config | 3 ++- kernel-s390x-rhel.config | 3 ++- kernel-s390x-zfcpdump-rhel.config | 3 ++- kernel-x86_64-debug-fedora.config | 3 ++- kernel-x86_64-debug-rhel.config | 3 ++- kernel-x86_64-fedora.config | 3 ++- kernel-x86_64-rhel.config | 3 ++- kernel.spec | 27 +++++++++++++++---------- sources | 6 +++--- 26 files changed, 66 insertions(+), 38 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 00fe72e9b..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 = 138 +RHEL_RELEASE = 141 # # Early y+1 numbering diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 08c796fee..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 @@ -6823,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 8c84f6e2b..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 @@ -5412,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 c5e5b7554..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 @@ -6798,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 c1956ad50..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 @@ -5389,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 4f583bfa2..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 @@ -7035,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 c6b7c4919..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 @@ -7013,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 bc39766b6..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 @@ -6804,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 2ecd9d176..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 @@ -6782,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 c986291d8..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 @@ -5778,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 4004e8abe..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 @@ -5259,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 46812a82f..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 @@ -5755,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 de01facb4..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 @@ -5240,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 d40963672..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 @@ -5717,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 8185b8de5..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 @@ -5201,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 f337cd9ea..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 @@ -5694,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 44fe818e5..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 @@ -5182,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 0acd3b6a7..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 @@ -5211,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 2e3ae8c12..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 @@ -5457,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 0210573e9..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 @@ -5435,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 cbbfc4ed1..47712a046 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.138 +%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.138 +%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.138%{?buildid}%{?dist} +%define specrelease 0.rc6.141%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -601,7 +601,7 @@ BuildRequires: asciidoc # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.11.0-0.rc5.138.tar.xz +Source0: linux-5.11.0-0.rc6.141.tar.xz Source1: Makefile.rhelver @@ -1246,8 +1246,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.11.0-0.rc5.138 -c -mv linux-5.11.0-0.rc5.138 linux-%{KVERREL} +%setup -q -n kernel-5.11.0-0.rc6.141 -c +mv linux-5.11.0-0.rc6.141 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,14 +2736,18 @@ fi # # %changelog -* Fri Jan 29 2021 Herton R. Krzesinski [5.11.0-0.rc5.138] -- v5.11-rc5-239-gbec4c2968fce rebase - -* Fri Jan 29 2021 Fedora Kernel Team [5.11.0-0.rc5.20210129gitbec4c2968fce.138] +* Mon Feb 01 2021 Fedora Kernel Team [5.11.0-0.rc6.141] +- v5.11-rc6 rebase - 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 [5.11.0-0.rc5.20210131git0e9bcda5d286.139] +- Remove bpf-helpers.7 from bpftool package (Jiri Olsa) + +* Sat Jan 30 2021 Fedora Kernel Team [5.11.0-0.rc5.20210130git0e9bcda5d286.138] +- New configs in lib/Kconfig.debug (Fedora Kernel Team) + * Fri Jan 29 2021 Fedora Kernel Team [5.11.0-0.rc5.20210129gitbec4c2968fce.137] - Turn off CONFIG_VIRTIO_CONSOLE for s390x zfcpdump ("Justin M. Forbes") diff --git a/sources b/sources index 6ac32822e..e22e208da 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-5.11.0-0.rc5.138.tar.xz) = c7787675b1e7e5bc10ae07bef9039112c5a0348340b33d646448a60d73a8e51af73cb7af6134b0569c202b9adf470caa610d9b03d9854f392305ae936247d1ae -SHA512 (kernel-abi-whitelists-5.11.0-0.rc5.138.tar.bz2) = e89a9527c8b1717cd416bcfdaf5af135e610e5c63b991ff4f2af2e42d54518273159e6812afc68c210d0c9a99e0872548fb95b4d0bbf468d414ef253920692de -SHA512 (kernel-kabi-dw-5.11.0-0.rc5.138.tar.bz2) = 2e448c41945e3769e6e5f9d566908c09192caa9427b55eca8b62e8ba20d80de8c0cce09aec501d755e808a6d0313180e8cfb52c5a633f6496fdd980e658e3e42 +SHA512 (linux-5.11.0-0.rc6.141.tar.xz) = 31ceb511b050b00534fdef008e4bc833a3bab6b3427c5110c10d242fa1f7cbbb31eeddf90603da8e5034f58ecbc53cc61276260b5b956b06cfb310d42ad2fb3d +SHA512 (kernel-abi-whitelists-5.11.0-0.rc6.141.tar.bz2) = d638cd506edbdaa66003c3be8b389932fccccd75709d4ac5d94d1ecf533481b8d0bbb9a5fcfdd0223671ffa8f8f57b6818976bbd1920a11fa774ccee3750193b +SHA512 (kernel-kabi-dw-5.11.0-0.rc6.141.tar.bz2) = 266dbd0334db42f1a2ea5a42640402a5626e0813dc3f6f0b60826d48a088556fca6502b7dff7a217191b36bc09170617e84812bb3e9d06a96b006194309959aa