diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-10-05 16:41:11 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-10-05 16:41:11 +0200 |
| commit | def8cf129efcd41942f6684e26e737bbfca5d62e (patch) | |
| tree | b51ef92aaca6e7f48037d71d69b38fc896ebd344 | |
| parent | 478ad513ed09190433b1c01bb4a7f6cb64b3b149 (diff) | |
| parent | 5f7d08ee5f8b230f5dfb20783ec265ef40387520 (diff) | |
| download | kernel-def8cf129efcd41942f6684e26e737bbfca5d62e.tar.gz kernel-def8cf129efcd41942f6684e26e737bbfca5d62e.tar.xz kernel-def8cf129efcd41942f6684e26e737bbfca5d62e.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.9.0-0.rc8.28.vanilla.1.fc34kernel-5.9.0-0.rc8.28.vanilla.1.fc33kernel-5.9.0-0.rc8.28.vanilla.1.fc32kernel-5.9.0-0.rc8.28.vanilla.1.fc31
28 files changed, 136 insertions, 153 deletions
diff --git a/0001-tools-libbpf-Avoid-counting-local-symbols-in-ABI-che.patch b/0001-tools-libbpf-Avoid-counting-local-symbols-in-ABI-che.patch deleted file mode 100644 index 49dadd91a..000000000 --- a/0001-tools-libbpf-Avoid-counting-local-symbols-in-ABI-che.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 746f534a4809e07f427f7d13d10f3a6a9641e5c3 Mon Sep 17 00:00:00 2001 -From: Tony Ambardar <tony.ambardar@gmail.com> -Date: Sat, 5 Sep 2020 14:48:31 -0700 -Subject: [PATCH] tools/libbpf: Avoid counting local symbols in ABI check - -Ignore the below, we are actually reverting this patch for now - -Encountered the following failure building libbpf from kernel 5.8.5 sources -with GCC 8.4.0 and binutils 2.34: (long paths shortened) - -Investigation shows _fini and _init are actually local symbols counted -amongst global ones: - - $ readelf --dyn-syms --wide libbpf.so|head -10 - - Symbol table '.dynsym' contains 343 entries: - Num: Value Size Type Bind Vis Ndx Name - 0: 00000000 0 NOTYPE LOCAL DEFAULT UND - 1: 00004098 0 SECTION LOCAL DEFAULT 11 - 2: 00004098 8 FUNC LOCAL DEFAULT 11 _init@@LIBBPF_0.0.1 - 3: 00023040 8 FUNC LOCAL DEFAULT 14 _fini@@LIBBPF_0.0.1 - 4: 00000000 0 OBJECT GLOBAL DEFAULT ABS LIBBPF_0.0.4 - 5: 00000000 0 OBJECT GLOBAL DEFAULT ABS LIBBPF_0.0.1 - 6: 0000ffa4 8 FUNC GLOBAL DEFAULT 12 bpf_object__find_map_by_offset@@LIBBPF_0.0.1 - -A previous commit filtered global symbols in sharedobjs/libbpf-in.o. Do the -same with the libbpf.so DSO for consistent comparison. - -Fixes: 306b267cb3c4 ("libbpf: Verify versioned symbols") -Signed-off-by: Tony Ambardar <Tony.Ambardar@gmail.com> -Signed-off-by: Alexei Starovoitov <ast@kernel.org> -Acked-by: Andrii Nakryiko <andriin@fb.com> -Link: https://lore.kernel.org/bpf/20200905214831.1565465-1-Tony.Ambardar@gmail.com ---- - tools/lib/bpf/Makefile | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/tools/lib/bpf/Makefile b/tools/lib/bpf/Makefile -index b78484e7a608..9ae8f4ef0aac 100644 ---- a/tools/lib/bpf/Makefile -+++ b/tools/lib/bpf/Makefile -@@ -152,7 +152,6 @@ GLOBAL_SYM_COUNT = $(shell readelf -s --wide $(BPF_IN_SHARED) | \ - awk '/GLOBAL/ && /DEFAULT/ && !/UND/ {print $$NF}' | \ - sort -u | wc -l) - VERSIONED_SYM_COUNT = $(shell readelf --dyn-syms --wide $(OUTPUT)libbpf.so | \ -- awk '/GLOBAL/ && /DEFAULT/ && !/UND/ {print $$NF}' | \ - grep -Eo '[^ ]+@LIBBPF_' | cut -d@ -f1 | sort -u | wc -l) - - CMD_TARGETS = $(LIB_TARGET) $(PC_FILE) -@@ -219,7 +220,6 @@ check_abi: $(OUTPUT)libbpf.so - awk '/GLOBAL/ && /DEFAULT/ && !/UND/ {print $$NF}'| \ - sort -u > $(OUTPUT)libbpf_global_syms.tmp; \ - readelf --dyn-syms --wide $(OUTPUT)libbpf.so | \ -- awk '/GLOBAL/ && /DEFAULT/ && !/UND/ {print $$NF}'| \ - grep -Eo '[^ ]+@LIBBPF_' | cut -d@ -f1 | \ - sort -u > $(OUTPUT)libbpf_versioned_syms.tmp; \ - diff -u $(OUTPUT)libbpf_global_syms.tmp \ --- -2.28.0 - diff --git a/Makefile.rhelver b/Makefile.rhelver index b2504df4a..6dfa72552 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 = 22 +RHEL_RELEASE = 28 # # Early y+1 numbering diff --git a/Patchlist.changelog b/Patchlist.changelog index 76d3b2f2f..4363f7125 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,6 +1,6 @@ -144ad28edaae462b1189129b54a5db77edf96cc2 Filter out LTO build options from the perl ccopts -51a53c1410eff7896c82979e89f8c50f12e65b07 Temporarily remove cdomain from sphinx documentation -4cc03e14217a557cbbd29b6457ebd178a3ef1006 Work around for gcc bug https://gcc.gnu.org/bugzilla/show_bug.cgi?id=96377 +a71a336858692932d6c97e3c4d611ab4a2b8f80d Filter out LTO build options from the perl ccopts +a531ea58bbad61c0c1bd7f749b383bd14360cc56 Temporarily remove cdomain from sphinx documentation +3efb2dd58766839acf864fd8a6a2f9180e006c02 Work around for gcc bug https://gcc.gnu.org/bugzilla/show_bug.cgi?id=96377 17b0f7f1d49df30661b517d668715ff5ee1bab09 Fixes "acpi: prefer booting with ACPI over DTS" to be RHEL only e7c009cd91ababdbb5f726ef592c7800f0682d3a arch/x86: Remove vendor specific CPU ID checks 7120b2a26fc4c7954fd0395973dc6739c110e091 redhat: Replace hardware.redhat.com link in Unsupported message diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 01575e706..22c03ba24 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -6664,11 +6664,11 @@ CONFIG_SPMI=y # CONFIG_SPS30 is not set # CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set # CONFIG_SQUASHFS_DECOMP_MULTI is not set -# CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU is not set -CONFIG_SQUASHFS_DECOMP_SINGLE=y +CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y +# CONFIG_SQUASHFS_DECOMP_SINGLE is not set # CONFIG_SQUASHFS_EMBEDDED is not set -CONFIG_SQUASHFS_FILE_CACHE=y -# CONFIG_SQUASHFS_FILE_DIRECT is not set +# CONFIG_SQUASHFS_FILE_CACHE is not set +CONFIG_SQUASHFS_FILE_DIRECT=y CONFIG_SQUASHFS_LZ4=y CONFIG_SQUASHFS_LZO=y CONFIG_SQUASHFS=m diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 3ca4e59c6..8e3ef8e07 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -1478,7 +1478,7 @@ CONFIG_ENABLE_MUST_CHECK=y CONFIG_ENA_ETHERNET=m CONFIG_ENCLOSURE_SERVICES=m CONFIG_ENCRYPTED_KEYS=m -# CONFIG_ENERGY_MODEL is not set +CONFIG_ENERGY_MODEL=y CONFIG_ENIC=m CONFIG_EPIC100=m CONFIG_EPOLL=y @@ -5491,7 +5491,7 @@ CONFIG_THERMAL_GOV_STEP_WISE=y CONFIG_THERMAL_GOV_USER_SPACE=y CONFIG_THERMAL_HWMON=y # CONFIG_THERMAL_MMIO is not set -# CONFIG_THERMAL_NETLINK is not set +CONFIG_THERMAL_NETLINK=y # CONFIG_THERMAL_OF is not set # CONFIG_THERMAL_STATISTICS is not set # CONFIG_THERMAL_WRITABLE_TRIPS is not set diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index ad4f3c928..d271b06e1 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -6643,11 +6643,11 @@ CONFIG_SPMI=y # CONFIG_SPS30 is not set # CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set # CONFIG_SQUASHFS_DECOMP_MULTI is not set -# CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU is not set -CONFIG_SQUASHFS_DECOMP_SINGLE=y +CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y +# CONFIG_SQUASHFS_DECOMP_SINGLE is not set # CONFIG_SQUASHFS_EMBEDDED is not set -CONFIG_SQUASHFS_FILE_CACHE=y -# CONFIG_SQUASHFS_FILE_DIRECT is not set +# CONFIG_SQUASHFS_FILE_CACHE is not set +CONFIG_SQUASHFS_FILE_DIRECT=y CONFIG_SQUASHFS_LZ4=y CONFIG_SQUASHFS_LZO=y CONFIG_SQUASHFS=m diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index fc732ece4..bfe28237c 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -1470,7 +1470,7 @@ CONFIG_ENABLE_MUST_CHECK=y CONFIG_ENA_ETHERNET=m CONFIG_ENCLOSURE_SERVICES=m CONFIG_ENCRYPTED_KEYS=m -# CONFIG_ENERGY_MODEL is not set +CONFIG_ENERGY_MODEL=y CONFIG_ENIC=m CONFIG_EPIC100=m CONFIG_EPOLL=y @@ -5471,7 +5471,7 @@ CONFIG_THERMAL_GOV_STEP_WISE=y CONFIG_THERMAL_GOV_USER_SPACE=y CONFIG_THERMAL_HWMON=y # CONFIG_THERMAL_MMIO is not set -# CONFIG_THERMAL_NETLINK is not set +CONFIG_THERMAL_NETLINK=y # CONFIG_THERMAL_OF is not set # CONFIG_THERMAL_STATISTICS is not set # CONFIG_THERMAL_WRITABLE_TRIPS is not set diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index e8d6914be..08339a406 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -6874,11 +6874,11 @@ CONFIG_SPMI_PMIC_CLKDIV=m # CONFIG_SPS30 is not set # CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set # CONFIG_SQUASHFS_DECOMP_MULTI is not set -# CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU is not set -CONFIG_SQUASHFS_DECOMP_SINGLE=y +CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y +# CONFIG_SQUASHFS_DECOMP_SINGLE is not set # CONFIG_SQUASHFS_EMBEDDED is not set -CONFIG_SQUASHFS_FILE_CACHE=y -# CONFIG_SQUASHFS_FILE_DIRECT is not set +# CONFIG_SQUASHFS_FILE_CACHE is not set +CONFIG_SQUASHFS_FILE_DIRECT=y CONFIG_SQUASHFS_LZ4=y CONFIG_SQUASHFS_LZO=y CONFIG_SQUASHFS=m diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index ced912196..8b988cc29 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -6854,11 +6854,11 @@ CONFIG_SPMI_PMIC_CLKDIV=m # CONFIG_SPS30 is not set # CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set # CONFIG_SQUASHFS_DECOMP_MULTI is not set -# CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU is not set -CONFIG_SQUASHFS_DECOMP_SINGLE=y +CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y +# CONFIG_SQUASHFS_DECOMP_SINGLE is not set # CONFIG_SQUASHFS_EMBEDDED is not set -CONFIG_SQUASHFS_FILE_CACHE=y -# CONFIG_SQUASHFS_FILE_DIRECT is not set +# CONFIG_SQUASHFS_FILE_CACHE is not set +CONFIG_SQUASHFS_FILE_DIRECT=y CONFIG_SQUASHFS_LZ4=y CONFIG_SQUASHFS_LZO=y CONFIG_SQUASHFS=m diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index 5edbb3f60..8ba1e9f14 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -6633,11 +6633,11 @@ CONFIG_SPMI_PMIC_CLKDIV=m # CONFIG_SPS30 is not set # CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set # CONFIG_SQUASHFS_DECOMP_MULTI is not set -# CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU is not set -CONFIG_SQUASHFS_DECOMP_SINGLE=y +CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y +# CONFIG_SQUASHFS_DECOMP_SINGLE is not set # CONFIG_SQUASHFS_EMBEDDED is not set -CONFIG_SQUASHFS_FILE_CACHE=y -# CONFIG_SQUASHFS_FILE_DIRECT is not set +# CONFIG_SQUASHFS_FILE_CACHE is not set +CONFIG_SQUASHFS_FILE_DIRECT=y CONFIG_SQUASHFS_LZ4=y CONFIG_SQUASHFS_LZO=y CONFIG_SQUASHFS=m diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index daf0176a3..64e7f05b9 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -6613,11 +6613,11 @@ CONFIG_SPMI_PMIC_CLKDIV=m # CONFIG_SPS30 is not set # CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set # CONFIG_SQUASHFS_DECOMP_MULTI is not set -# CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU is not set -CONFIG_SQUASHFS_DECOMP_SINGLE=y +CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y +# CONFIG_SQUASHFS_DECOMP_SINGLE is not set # CONFIG_SQUASHFS_EMBEDDED is not set -CONFIG_SQUASHFS_FILE_CACHE=y -# CONFIG_SQUASHFS_FILE_DIRECT is not set +# CONFIG_SQUASHFS_FILE_CACHE is not set +CONFIG_SQUASHFS_FILE_DIRECT=y CONFIG_SQUASHFS_LZ4=y CONFIG_SQUASHFS_LZO=y CONFIG_SQUASHFS=m diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config index c8c430387..fcc65c0f1 100644 --- a/kernel-i686-debug-fedora.config +++ b/kernel-i686-debug-fedora.config @@ -6022,11 +6022,11 @@ CONFIG_SPI=y # CONFIG_SPS30 is not set # CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set # CONFIG_SQUASHFS_DECOMP_MULTI is not set -# CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU is not set -CONFIG_SQUASHFS_DECOMP_SINGLE=y +CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y +# CONFIG_SQUASHFS_DECOMP_SINGLE is not set # CONFIG_SQUASHFS_EMBEDDED is not set -CONFIG_SQUASHFS_FILE_CACHE=y -# CONFIG_SQUASHFS_FILE_DIRECT is not set +# CONFIG_SQUASHFS_FILE_CACHE is not set +CONFIG_SQUASHFS_FILE_DIRECT=y CONFIG_SQUASHFS_LZ4=y CONFIG_SQUASHFS_LZO=y CONFIG_SQUASHFS=m diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config index 8c8e6a309..3c2519df3 100644 --- a/kernel-i686-fedora.config +++ b/kernel-i686-fedora.config @@ -6001,11 +6001,11 @@ CONFIG_SPI=y # CONFIG_SPS30 is not set # CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set # CONFIG_SQUASHFS_DECOMP_MULTI is not set -# CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU is not set -CONFIG_SQUASHFS_DECOMP_SINGLE=y +CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y +# CONFIG_SQUASHFS_DECOMP_SINGLE is not set # CONFIG_SQUASHFS_EMBEDDED is not set -CONFIG_SQUASHFS_FILE_CACHE=y -# CONFIG_SQUASHFS_FILE_DIRECT is not set +# CONFIG_SQUASHFS_FILE_CACHE is not set +CONFIG_SQUASHFS_FILE_DIRECT=y CONFIG_SQUASHFS_LZ4=y CONFIG_SQUASHFS_LZO=y CONFIG_SQUASHFS=m diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index 50481fa57..7e3ec2dbf 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -5614,11 +5614,11 @@ CONFIG_SPI_MUX=m # CONFIG_SPS30 is not set # CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set # CONFIG_SQUASHFS_DECOMP_MULTI is not set -# CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU is not set -CONFIG_SQUASHFS_DECOMP_SINGLE=y +CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y +# CONFIG_SQUASHFS_DECOMP_SINGLE is not set # CONFIG_SQUASHFS_EMBEDDED is not set -CONFIG_SQUASHFS_FILE_CACHE=y -# CONFIG_SQUASHFS_FILE_DIRECT is not set +# CONFIG_SQUASHFS_FILE_CACHE is not set +CONFIG_SQUASHFS_FILE_DIRECT=y CONFIG_SQUASHFS_LZ4=y CONFIG_SQUASHFS_LZO=y CONFIG_SQUASHFS=m diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index 44cbf72ca..23e0b1436 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -1346,7 +1346,7 @@ CONFIG_ENABLE_MUST_CHECK=y # CONFIG_ENA_ETHERNET is not set CONFIG_ENCLOSURE_SERVICES=m CONFIG_ENCRYPTED_KEYS=y -# CONFIG_ENERGY_MODEL is not set +CONFIG_ENERGY_MODEL=y CONFIG_ENIC=m CONFIG_EPIC100=m CONFIG_EPOLL=y @@ -5336,7 +5336,7 @@ CONFIG_THERMAL_GOV_STEP_WISE=y # CONFIG_THERMAL_GOV_USER_SPACE is not set CONFIG_THERMAL_HWMON=y # CONFIG_THERMAL_MMIO is not set -# CONFIG_THERMAL_NETLINK is not set +CONFIG_THERMAL_NETLINK=y CONFIG_THERMAL_OF=y # CONFIG_THERMAL_STATISTICS is not set # CONFIG_THERMAL_WRITABLE_TRIPS is not set diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index 5cbce435f..05e415adf 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -5592,11 +5592,11 @@ CONFIG_SPI_MUX=m # CONFIG_SPS30 is not set # CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set # CONFIG_SQUASHFS_DECOMP_MULTI is not set -# CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU is not set -CONFIG_SQUASHFS_DECOMP_SINGLE=y +CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y +# CONFIG_SQUASHFS_DECOMP_SINGLE is not set # CONFIG_SQUASHFS_EMBEDDED is not set -CONFIG_SQUASHFS_FILE_CACHE=y -# CONFIG_SQUASHFS_FILE_DIRECT is not set +# CONFIG_SQUASHFS_FILE_CACHE is not set +CONFIG_SQUASHFS_FILE_DIRECT=y CONFIG_SQUASHFS_LZ4=y CONFIG_SQUASHFS_LZO=y CONFIG_SQUASHFS=m diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index f03255a7f..8d8e74376 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -1338,7 +1338,7 @@ CONFIG_ENABLE_MUST_CHECK=y # CONFIG_ENA_ETHERNET is not set CONFIG_ENCLOSURE_SERVICES=m CONFIG_ENCRYPTED_KEYS=y -# CONFIG_ENERGY_MODEL is not set +CONFIG_ENERGY_MODEL=y CONFIG_ENIC=m CONFIG_EPIC100=m CONFIG_EPOLL=y @@ -5318,7 +5318,7 @@ CONFIG_THERMAL_GOV_STEP_WISE=y # CONFIG_THERMAL_GOV_USER_SPACE is not set CONFIG_THERMAL_HWMON=y # CONFIG_THERMAL_MMIO is not set -# CONFIG_THERMAL_NETLINK is not set +CONFIG_THERMAL_NETLINK=y CONFIG_THERMAL_OF=y # CONFIG_THERMAL_STATISTICS is not set # CONFIG_THERMAL_WRITABLE_TRIPS is not set diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 586f2881b..7734d43ee 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -5555,11 +5555,11 @@ CONFIG_SPI_MUX=m # CONFIG_SPS30 is not set # CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set # CONFIG_SQUASHFS_DECOMP_MULTI is not set -# CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU is not set -CONFIG_SQUASHFS_DECOMP_SINGLE=y +CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y +# CONFIG_SQUASHFS_DECOMP_SINGLE is not set # CONFIG_SQUASHFS_EMBEDDED is not set -CONFIG_SQUASHFS_FILE_CACHE=y -# CONFIG_SQUASHFS_FILE_DIRECT is not set +# CONFIG_SQUASHFS_FILE_CACHE is not set +CONFIG_SQUASHFS_FILE_DIRECT=y CONFIG_SQUASHFS_LZ4=y CONFIG_SQUASHFS_LZO=y CONFIG_SQUASHFS=m diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index 34c6eabd0..2efd74650 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -1351,7 +1351,7 @@ CONFIG_ENABLE_MUST_CHECK=y # CONFIG_ENA_ETHERNET is not set CONFIG_ENCLOSURE_SERVICES=m CONFIG_ENCRYPTED_KEYS=m -# CONFIG_ENERGY_MODEL is not set +CONFIG_ENERGY_MODEL=y CONFIG_ENIC=m CONFIG_EPIC100=m CONFIG_EPOLL=y @@ -5274,7 +5274,7 @@ CONFIG_THERMAL_GOV_STEP_WISE=y CONFIG_THERMAL_HWMON=y # CONFIG_THERMAL is not set # CONFIG_THERMAL_MMIO is not set -# CONFIG_THERMAL_NETLINK is not set +CONFIG_THERMAL_NETLINK=y CONFIG_THERMAL_OF=y # CONFIG_THERMAL_STATISTICS is not set # CONFIG_THERMAL_WRITABLE_TRIPS is not set diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index c0e4002b7..e6531ad5b 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -5533,11 +5533,11 @@ CONFIG_SPI_MUX=m # CONFIG_SPS30 is not set # CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set # CONFIG_SQUASHFS_DECOMP_MULTI is not set -# CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU is not set -CONFIG_SQUASHFS_DECOMP_SINGLE=y +CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y +# CONFIG_SQUASHFS_DECOMP_SINGLE is not set # CONFIG_SQUASHFS_EMBEDDED is not set -CONFIG_SQUASHFS_FILE_CACHE=y -# CONFIG_SQUASHFS_FILE_DIRECT is not set +# CONFIG_SQUASHFS_FILE_CACHE is not set +CONFIG_SQUASHFS_FILE_DIRECT=y CONFIG_SQUASHFS_LZ4=y CONFIG_SQUASHFS_LZO=y CONFIG_SQUASHFS=m diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index a27af74b6..fdc704c64 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -1343,7 +1343,7 @@ CONFIG_ENABLE_MUST_CHECK=y # CONFIG_ENA_ETHERNET is not set CONFIG_ENCLOSURE_SERVICES=m CONFIG_ENCRYPTED_KEYS=m -# CONFIG_ENERGY_MODEL is not set +CONFIG_ENERGY_MODEL=y CONFIG_ENIC=m CONFIG_EPIC100=m CONFIG_EPOLL=y @@ -5256,7 +5256,7 @@ CONFIG_THERMAL_GOV_STEP_WISE=y CONFIG_THERMAL_HWMON=y # CONFIG_THERMAL is not set # CONFIG_THERMAL_MMIO is not set -# CONFIG_THERMAL_NETLINK is not set +CONFIG_THERMAL_NETLINK=y CONFIG_THERMAL_OF=y # CONFIG_THERMAL_STATISTICS is not set # CONFIG_THERMAL_WRITABLE_TRIPS is not set diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 12d2e8c8f..c2a03a753 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -1354,7 +1354,7 @@ CONFIG_ENABLE_MUST_CHECK=y # CONFIG_ENA_ETHERNET is not set CONFIG_ENCLOSURE_SERVICES=y CONFIG_ENCRYPTED_KEYS=m -# CONFIG_ENERGY_MODEL is not set +CONFIG_ENERGY_MODEL=y CONFIG_ENIC=m CONFIG_EPIC100=m CONFIG_EPOLL=y @@ -5290,7 +5290,7 @@ CONFIG_THERMAL_GOV_STEP_WISE=y CONFIG_THERMAL_HWMON=y # CONFIG_THERMAL is not set # CONFIG_THERMAL_MMIO is not set -# CONFIG_THERMAL_NETLINK is not set +CONFIG_THERMAL_NETLINK=y CONFIG_THERMAL_OF=y # CONFIG_THERMAL_STATISTICS is not set # CONFIG_THERMAL_WRITABLE_TRIPS is not set diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index aaf42055c..c90ad6424 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -6075,11 +6075,11 @@ CONFIG_SPI=y # CONFIG_SPS30 is not set # CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set # CONFIG_SQUASHFS_DECOMP_MULTI is not set -# CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU is not set -CONFIG_SQUASHFS_DECOMP_SINGLE=y +CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y +# CONFIG_SQUASHFS_DECOMP_SINGLE is not set # CONFIG_SQUASHFS_EMBEDDED is not set -CONFIG_SQUASHFS_FILE_CACHE=y -# CONFIG_SQUASHFS_FILE_DIRECT is not set +# CONFIG_SQUASHFS_FILE_CACHE is not set +CONFIG_SQUASHFS_FILE_DIRECT=y CONFIG_SQUASHFS_LZ4=y CONFIG_SQUASHFS_LZO=y CONFIG_SQUASHFS=m diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 11f887566..4ff48486f 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -1455,7 +1455,7 @@ CONFIG_ENABLE_MUST_CHECK=y CONFIG_ENA_ETHERNET=m CONFIG_ENCLOSURE_SERVICES=m CONFIG_ENCRYPTED_KEYS=y -# CONFIG_ENERGY_MODEL is not set +CONFIG_ENERGY_MODEL=y CONFIG_ENIC=m CONFIG_EPIC100=m CONFIG_EPOLL=y @@ -3991,7 +3991,7 @@ CONFIG_PINCTRL_ICELAKE=m # CONFIG_PINCTRL_IPQ4019 is not set # CONFIG_PINCTRL_IPQ6018 is not set # CONFIG_PINCTRL_IPQ8074 is not set -# CONFIG_PINCTRL_JASPERLAKE is not set +CONFIG_PINCTRL_JASPERLAKE=m CONFIG_PINCTRL_LEWISBURG=m # CONFIG_PINCTRL_LYNXPOINT is not set # CONFIG_PINCTRL_MCP23S08 is not set @@ -5543,7 +5543,7 @@ CONFIG_THERMAL_GOV_STEP_WISE=y CONFIG_THERMAL_GOV_USER_SPACE=y CONFIG_THERMAL_HWMON=y # CONFIG_THERMAL_MMIO is not set -# CONFIG_THERMAL_NETLINK is not set +CONFIG_THERMAL_NETLINK=y CONFIG_THERMAL_OF=y # CONFIG_THERMAL_STATISTICS is not set CONFIG_THERMAL_WRITABLE_TRIPS=y diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 33e97a528..f080bcbdf 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -6054,11 +6054,11 @@ CONFIG_SPI=y # CONFIG_SPS30 is not set # CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set # CONFIG_SQUASHFS_DECOMP_MULTI is not set -# CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU is not set -CONFIG_SQUASHFS_DECOMP_SINGLE=y +CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y +# CONFIG_SQUASHFS_DECOMP_SINGLE is not set # CONFIG_SQUASHFS_EMBEDDED is not set -CONFIG_SQUASHFS_FILE_CACHE=y -# CONFIG_SQUASHFS_FILE_DIRECT is not set +# CONFIG_SQUASHFS_FILE_CACHE is not set +CONFIG_SQUASHFS_FILE_DIRECT=y CONFIG_SQUASHFS_LZ4=y CONFIG_SQUASHFS_LZO=y CONFIG_SQUASHFS=m diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 7a7b6005f..f6f7b0719 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -1447,7 +1447,7 @@ CONFIG_ENABLE_MUST_CHECK=y CONFIG_ENA_ETHERNET=m CONFIG_ENCLOSURE_SERVICES=m CONFIG_ENCRYPTED_KEYS=y -# CONFIG_ENERGY_MODEL is not set +CONFIG_ENERGY_MODEL=y CONFIG_ENIC=m CONFIG_EPIC100=m CONFIG_EPOLL=y @@ -3974,7 +3974,7 @@ CONFIG_PINCTRL_ICELAKE=m # CONFIG_PINCTRL_IPQ4019 is not set # CONFIG_PINCTRL_IPQ6018 is not set # CONFIG_PINCTRL_IPQ8074 is not set -# CONFIG_PINCTRL_JASPERLAKE is not set +CONFIG_PINCTRL_JASPERLAKE=m CONFIG_PINCTRL_LEWISBURG=m # CONFIG_PINCTRL_LYNXPOINT is not set # CONFIG_PINCTRL_MCP23S08 is not set @@ -5523,7 +5523,7 @@ CONFIG_THERMAL_GOV_STEP_WISE=y CONFIG_THERMAL_GOV_USER_SPACE=y CONFIG_THERMAL_HWMON=y # CONFIG_THERMAL_MMIO is not set -# CONFIG_THERMAL_NETLINK is not set +CONFIG_THERMAL_NETLINK=y CONFIG_THERMAL_OF=y # CONFIG_THERMAL_STATISTICS is not set CONFIG_THERMAL_WRITABLE_TRIPS=y diff --git a/kernel.spec b/kernel.spec index 7b521bde8..991a41f18 100644 --- a/kernel.spec +++ b/kernel.spec @@ -30,7 +30,7 @@ Summary: The Linux kernel # For a stable, released kernel, released_kernel should be 1. %global released_kernel 0 -%global distro_build 0.rc7.20200930gitfb0155a09b02.22 +%global distro_build 0.rc8.28 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -71,13 +71,13 @@ Summary: The Linux kernel %endif %define rpmversion 5.9.0 -%define pkgrelease 0.rc7.20200930gitfb0155a09b02.22 +%define pkgrelease 0.rc8.28 # This is needed to do merge window version magic %define patchlevel 9 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc7.20200930gitfb0155a09b02.22%{?buildid}%{?dist} +%define specrelease 0.rc8.28%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -184,10 +184,10 @@ Summary: The Linux kernel # no whitelist %define with_kernel_abi_whitelists 0 # Fedora builds these separately +%endif %define with_perf 0 %define with_tools 0 %define with_bpftool 0 -%endif %if %{with_verbose} %define make_opts V=1 @@ -568,7 +568,7 @@ BuildRequires: asciidoc # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-20200930gitfb0155a09b02.tar.xz +Source0: linux-5.9-rc8.tar.xz Source1: Makefile.rhelver @@ -792,7 +792,6 @@ Patch72: 0001-Fixes-acpi-prefer-booting-with-ACPI-over-DTS-to-be-R.patch Patch73: 0001-Work-around-for-gcc-bug-https-gcc.gnu.org-bugzilla-s.patch Patch74: 0001-Temporarily-remove-cdomain-from-sphinx-documentation.patch Patch75: 0001-Filter-out-LTO-build-options-from-the-perl-ccopts.patch -Patch76: 0001-tools-libbpf-Avoid-counting-local-symbols-in-ABI-che.patch %endif @@ -1288,8 +1287,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-20200930gitfb0155a09b02 -c -mv linux-20200930gitfb0155a09b02 linux-%{KVERREL} +%setup -q -n kernel-5.9-rc8 -c +mv linux-5.9-rc8 linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -1370,7 +1369,6 @@ ApplyOptionalPatch 0001-Fixes-acpi-prefer-booting-with-ACPI-over-DTS-to-be-R.pat ApplyOptionalPatch 0001-Work-around-for-gcc-bug-https-gcc.gnu.org-bugzilla-s.patch ApplyOptionalPatch 0001-Temporarily-remove-cdomain-from-sphinx-documentation.patch ApplyOptionalPatch 0001-Filter-out-LTO-build-options-from-the-perl-ccopts.patch -ApplyOptionalPatch 0001-tools-libbpf-Avoid-counting-local-symbols-in-ABI-che.patch %endif @@ -2075,7 +2073,6 @@ BuildKernel %make_target %kernel_image %{_use_vdso} %global perf_make \ %{__make} -s EXTRA_CFLAGS="${RPM_OPT_FLAGS}" LDFLAGS="%{__global_ldflags}" %{?cross_opts} -C tools/perf V=1 NO_PERF_READ_VDSO32=1 NO_PERF_READ_VDSOX32=1 WERROR=0 NO_LIBUNWIND=1 HAVE_CPLUS_DEMANGLE=1 NO_GTK2=1 NO_STRLCPY=1 NO_BIONIC=1 prefix=%{_prefix} PYTHON=%{__python3} %if %{with_perf} -%global _lto_cflags %{nil} # perf # make sure check-headers.sh is executable chmod +x tools/perf/check-headers.sh @@ -2790,6 +2787,52 @@ fi # # %changelog +* Mon Oct 05 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc8.27] +- Merge ark-patches + +* Mon Oct 05 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc8.26.test] +- v5.9-rc8 rebase +- Updated changelog for the release based on 22fbc037cd32 (Fedora Kernel Team) + +* Mon Oct 05 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc7.20201005git22fbc037cd32.26] +- Merge ark-patches + +* Mon Oct 05 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc7.20201005git22fbc037cd32.25.test] +- 22fbc037cd32 rebase +- Updated changelog for the release based on d3d45f8220d6 (Fedora Kernel Team) + +* Sun Oct 04 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc7.20201004gitd3d45f8220d6.25] +- Merge ark-patches + +* Sun Oct 04 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc7.20201004gitd3d45f8220d6.24.test] +- d3d45f8220d6 rebase +- Updated changelog for the release based on 472e5b056f00 (Fedora Kernel Team) + +* Sat Oct 03 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc7.20201003git472e5b056f00.24] +- Merge ark-patches + +* Sat Oct 03 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc7.20201003git472e5b056f00.23.test] +- 472e5b056f00 rebase +- Set SquashFS decompression options for all flavors to match RHEL (Bohdan Khomutskyi) +- Updated changelog for the release based on 60e720931556 (Fedora Kernel Team) + +* Fri Oct 02 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc7.20201002git60e720931556.23] +- Merge ark-patches + +* Fri Oct 02 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc7.20201002git60e720931556.22.test] +- 60e720931556 rebase +- New configs in drivers/pinctrl (Fedora Kernel Team) +- Updated changelog for the release based on 02de58b24d2e (Fedora Kernel Team) +- Update CONFIG_THERMAL_NETLINK (Justin Forbes) +- configs: Enable CONFIG_ENERGY_MODEL (Phil Auld) + +* Thu Oct 01 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc7.20201001git02de58b24d2e.22] +- Merge ark-patches + +* Thu Oct 01 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc7.20201001git02de58b24d2e.21.test] +- 02de58b24d2e rebase +- Updated changelog for the release based on fb0155a09b02 (Fedora Kernel Team) + * Wed Sep 30 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc7.20200930gitfb0155a09b02.21] - Merge ark-patches @@ -1,3 +1,3 @@ -SHA512 (linux-20200930gitfb0155a09b02.tar.xz) = 68c92ab5a2476e6fdc0263e264c5804e43a84dbc659a94e674d7306cd7ef03dd2d7cde8c194415320e80eba80953e0de93fc7275023f9540be5dd6c3ba5cbc99 -SHA512 (kernel-abi-whitelists-5.9.0-0.rc7.20200930gitfb0155a09b02.22.tar.bz2) = 8a5989f5488ecabb016fef35950ea48cc2f23a9e76bc2442a81f294c4827b9b8b944bbd98f8509ef3be2944ccb24fe94a2bb7a3b62642f905c9cd85006e90af0 -SHA512 (kernel-kabi-dw-5.9.0-0.rc7.20200930gitfb0155a09b02.22.tar.bz2) = 13b209c5a0bb08fbff3a87679a9da502f185b600b792a626a1364ccabcb30acf5929ebb4c0314bfb81c0472f1fb741103a8da62319c7d2475927352db322b37e +SHA512 (linux-5.9-rc8.tar.xz) = 5a0e619e9a4e39edd9412d85fb66446115e65c19e4c870745c70aeb29b9cae2b6f061eeb0d22f647febc8c75828cc848eed6c3d5709386f20856453ec184be01 +SHA512 (kernel-abi-whitelists-5.9.0-0.rc8.28.tar.bz2) = 85329a42c29a3e7f4475f9afada031a7b14b22297d1954e1b79d854213df0a00d5513a309a8fdceff15dbb8f416a17256b523302df61aad83cd2d1e5803d5fe2 +SHA512 (kernel-kabi-dw-5.9.0-0.rc8.28.tar.bz2) = 25fefaff419a177a936c1198aea9289b5a92167486bb5fd705cb2ecd142af5514cc27ee42208160dda171a99f83ed2c8f74e59815a806b1953b3c623289c9b67 |