kernel-5.9.0-0.rc7.20201002git60e720931556.23
* Fri Oct 02 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc7.20201002git60e720931556.23] - Merge ark-patches Resolves: rhbz# Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
This commit is contained in:
parent
8bf7e7fde6
commit
98bf14a6aa
@ -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
|
|
||||||
|
|
@ -12,7 +12,7 @@ RHEL_MINOR = 99
|
|||||||
#
|
#
|
||||||
# Use this spot to avoid future merge conflicts.
|
# Use this spot to avoid future merge conflicts.
|
||||||
# Do not trim this comment.
|
# Do not trim this comment.
|
||||||
RHEL_RELEASE = 22
|
RHEL_RELEASE = 24
|
||||||
|
|
||||||
#
|
#
|
||||||
# Early y+1 numbering
|
# Early y+1 numbering
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
144ad28edaae462b1189129b54a5db77edf96cc2 Filter out LTO build options from the perl ccopts
|
e932c7b57534b257f9c3556f4d4c29d3d4bedb9c Filter out LTO build options from the perl ccopts
|
||||||
51a53c1410eff7896c82979e89f8c50f12e65b07 Temporarily remove cdomain from sphinx documentation
|
c70919ea8453d6b761ed2452fab72c18188fa818 Temporarily remove cdomain from sphinx documentation
|
||||||
4cc03e14217a557cbbd29b6457ebd178a3ef1006 Work around for gcc bug https://gcc.gnu.org/bugzilla/show_bug.cgi?id=96377
|
362f059ba88a0f0c64d012ef052664a9b6782c81 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
|
17b0f7f1d49df30661b517d668715ff5ee1bab09 Fixes "acpi: prefer booting with ACPI over DTS" to be RHEL only
|
||||||
e7c009cd91ababdbb5f726ef592c7800f0682d3a arch/x86: Remove vendor specific CPU ID checks
|
e7c009cd91ababdbb5f726ef592c7800f0682d3a arch/x86: Remove vendor specific CPU ID checks
|
||||||
7120b2a26fc4c7954fd0395973dc6739c110e091 redhat: Replace hardware.redhat.com link in Unsupported message
|
7120b2a26fc4c7954fd0395973dc6739c110e091 redhat: Replace hardware.redhat.com link in Unsupported message
|
||||||
|
@ -1478,7 +1478,7 @@ CONFIG_ENABLE_MUST_CHECK=y
|
|||||||
CONFIG_ENA_ETHERNET=m
|
CONFIG_ENA_ETHERNET=m
|
||||||
CONFIG_ENCLOSURE_SERVICES=m
|
CONFIG_ENCLOSURE_SERVICES=m
|
||||||
CONFIG_ENCRYPTED_KEYS=m
|
CONFIG_ENCRYPTED_KEYS=m
|
||||||
# CONFIG_ENERGY_MODEL is not set
|
CONFIG_ENERGY_MODEL=y
|
||||||
CONFIG_ENIC=m
|
CONFIG_ENIC=m
|
||||||
CONFIG_EPIC100=m
|
CONFIG_EPIC100=m
|
||||||
CONFIG_EPOLL=y
|
CONFIG_EPOLL=y
|
||||||
@ -5491,7 +5491,7 @@ CONFIG_THERMAL_GOV_STEP_WISE=y
|
|||||||
CONFIG_THERMAL_GOV_USER_SPACE=y
|
CONFIG_THERMAL_GOV_USER_SPACE=y
|
||||||
CONFIG_THERMAL_HWMON=y
|
CONFIG_THERMAL_HWMON=y
|
||||||
# CONFIG_THERMAL_MMIO is not set
|
# CONFIG_THERMAL_MMIO is not set
|
||||||
# CONFIG_THERMAL_NETLINK is not set
|
CONFIG_THERMAL_NETLINK=y
|
||||||
# CONFIG_THERMAL_OF is not set
|
# CONFIG_THERMAL_OF is not set
|
||||||
# CONFIG_THERMAL_STATISTICS is not set
|
# CONFIG_THERMAL_STATISTICS is not set
|
||||||
# CONFIG_THERMAL_WRITABLE_TRIPS is not set
|
# CONFIG_THERMAL_WRITABLE_TRIPS is not set
|
||||||
|
@ -1470,7 +1470,7 @@ CONFIG_ENABLE_MUST_CHECK=y
|
|||||||
CONFIG_ENA_ETHERNET=m
|
CONFIG_ENA_ETHERNET=m
|
||||||
CONFIG_ENCLOSURE_SERVICES=m
|
CONFIG_ENCLOSURE_SERVICES=m
|
||||||
CONFIG_ENCRYPTED_KEYS=m
|
CONFIG_ENCRYPTED_KEYS=m
|
||||||
# CONFIG_ENERGY_MODEL is not set
|
CONFIG_ENERGY_MODEL=y
|
||||||
CONFIG_ENIC=m
|
CONFIG_ENIC=m
|
||||||
CONFIG_EPIC100=m
|
CONFIG_EPIC100=m
|
||||||
CONFIG_EPOLL=y
|
CONFIG_EPOLL=y
|
||||||
@ -5471,7 +5471,7 @@ CONFIG_THERMAL_GOV_STEP_WISE=y
|
|||||||
CONFIG_THERMAL_GOV_USER_SPACE=y
|
CONFIG_THERMAL_GOV_USER_SPACE=y
|
||||||
CONFIG_THERMAL_HWMON=y
|
CONFIG_THERMAL_HWMON=y
|
||||||
# CONFIG_THERMAL_MMIO is not set
|
# CONFIG_THERMAL_MMIO is not set
|
||||||
# CONFIG_THERMAL_NETLINK is not set
|
CONFIG_THERMAL_NETLINK=y
|
||||||
# CONFIG_THERMAL_OF is not set
|
# CONFIG_THERMAL_OF is not set
|
||||||
# CONFIG_THERMAL_STATISTICS is not set
|
# CONFIG_THERMAL_STATISTICS is not set
|
||||||
# CONFIG_THERMAL_WRITABLE_TRIPS is not set
|
# CONFIG_THERMAL_WRITABLE_TRIPS is not set
|
||||||
|
@ -1346,7 +1346,7 @@ CONFIG_ENABLE_MUST_CHECK=y
|
|||||||
# CONFIG_ENA_ETHERNET is not set
|
# CONFIG_ENA_ETHERNET is not set
|
||||||
CONFIG_ENCLOSURE_SERVICES=m
|
CONFIG_ENCLOSURE_SERVICES=m
|
||||||
CONFIG_ENCRYPTED_KEYS=y
|
CONFIG_ENCRYPTED_KEYS=y
|
||||||
# CONFIG_ENERGY_MODEL is not set
|
CONFIG_ENERGY_MODEL=y
|
||||||
CONFIG_ENIC=m
|
CONFIG_ENIC=m
|
||||||
CONFIG_EPIC100=m
|
CONFIG_EPIC100=m
|
||||||
CONFIG_EPOLL=y
|
CONFIG_EPOLL=y
|
||||||
@ -5336,7 +5336,7 @@ CONFIG_THERMAL_GOV_STEP_WISE=y
|
|||||||
# CONFIG_THERMAL_GOV_USER_SPACE is not set
|
# CONFIG_THERMAL_GOV_USER_SPACE is not set
|
||||||
CONFIG_THERMAL_HWMON=y
|
CONFIG_THERMAL_HWMON=y
|
||||||
# CONFIG_THERMAL_MMIO 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_OF=y
|
||||||
# CONFIG_THERMAL_STATISTICS is not set
|
# CONFIG_THERMAL_STATISTICS is not set
|
||||||
# CONFIG_THERMAL_WRITABLE_TRIPS is not set
|
# CONFIG_THERMAL_WRITABLE_TRIPS is not set
|
||||||
|
@ -1338,7 +1338,7 @@ CONFIG_ENABLE_MUST_CHECK=y
|
|||||||
# CONFIG_ENA_ETHERNET is not set
|
# CONFIG_ENA_ETHERNET is not set
|
||||||
CONFIG_ENCLOSURE_SERVICES=m
|
CONFIG_ENCLOSURE_SERVICES=m
|
||||||
CONFIG_ENCRYPTED_KEYS=y
|
CONFIG_ENCRYPTED_KEYS=y
|
||||||
# CONFIG_ENERGY_MODEL is not set
|
CONFIG_ENERGY_MODEL=y
|
||||||
CONFIG_ENIC=m
|
CONFIG_ENIC=m
|
||||||
CONFIG_EPIC100=m
|
CONFIG_EPIC100=m
|
||||||
CONFIG_EPOLL=y
|
CONFIG_EPOLL=y
|
||||||
@ -5318,7 +5318,7 @@ CONFIG_THERMAL_GOV_STEP_WISE=y
|
|||||||
# CONFIG_THERMAL_GOV_USER_SPACE is not set
|
# CONFIG_THERMAL_GOV_USER_SPACE is not set
|
||||||
CONFIG_THERMAL_HWMON=y
|
CONFIG_THERMAL_HWMON=y
|
||||||
# CONFIG_THERMAL_MMIO 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_OF=y
|
||||||
# CONFIG_THERMAL_STATISTICS is not set
|
# CONFIG_THERMAL_STATISTICS is not set
|
||||||
# CONFIG_THERMAL_WRITABLE_TRIPS is not set
|
# CONFIG_THERMAL_WRITABLE_TRIPS is not set
|
||||||
|
@ -1351,7 +1351,7 @@ CONFIG_ENABLE_MUST_CHECK=y
|
|||||||
# CONFIG_ENA_ETHERNET is not set
|
# CONFIG_ENA_ETHERNET is not set
|
||||||
CONFIG_ENCLOSURE_SERVICES=m
|
CONFIG_ENCLOSURE_SERVICES=m
|
||||||
CONFIG_ENCRYPTED_KEYS=m
|
CONFIG_ENCRYPTED_KEYS=m
|
||||||
# CONFIG_ENERGY_MODEL is not set
|
CONFIG_ENERGY_MODEL=y
|
||||||
CONFIG_ENIC=m
|
CONFIG_ENIC=m
|
||||||
CONFIG_EPIC100=m
|
CONFIG_EPIC100=m
|
||||||
CONFIG_EPOLL=y
|
CONFIG_EPOLL=y
|
||||||
@ -5274,7 +5274,7 @@ CONFIG_THERMAL_GOV_STEP_WISE=y
|
|||||||
CONFIG_THERMAL_HWMON=y
|
CONFIG_THERMAL_HWMON=y
|
||||||
# CONFIG_THERMAL is not set
|
# CONFIG_THERMAL is not set
|
||||||
# CONFIG_THERMAL_MMIO 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_OF=y
|
||||||
# CONFIG_THERMAL_STATISTICS is not set
|
# CONFIG_THERMAL_STATISTICS is not set
|
||||||
# CONFIG_THERMAL_WRITABLE_TRIPS is not set
|
# CONFIG_THERMAL_WRITABLE_TRIPS is not set
|
||||||
|
@ -1343,7 +1343,7 @@ CONFIG_ENABLE_MUST_CHECK=y
|
|||||||
# CONFIG_ENA_ETHERNET is not set
|
# CONFIG_ENA_ETHERNET is not set
|
||||||
CONFIG_ENCLOSURE_SERVICES=m
|
CONFIG_ENCLOSURE_SERVICES=m
|
||||||
CONFIG_ENCRYPTED_KEYS=m
|
CONFIG_ENCRYPTED_KEYS=m
|
||||||
# CONFIG_ENERGY_MODEL is not set
|
CONFIG_ENERGY_MODEL=y
|
||||||
CONFIG_ENIC=m
|
CONFIG_ENIC=m
|
||||||
CONFIG_EPIC100=m
|
CONFIG_EPIC100=m
|
||||||
CONFIG_EPOLL=y
|
CONFIG_EPOLL=y
|
||||||
@ -5256,7 +5256,7 @@ CONFIG_THERMAL_GOV_STEP_WISE=y
|
|||||||
CONFIG_THERMAL_HWMON=y
|
CONFIG_THERMAL_HWMON=y
|
||||||
# CONFIG_THERMAL is not set
|
# CONFIG_THERMAL is not set
|
||||||
# CONFIG_THERMAL_MMIO 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_OF=y
|
||||||
# CONFIG_THERMAL_STATISTICS is not set
|
# CONFIG_THERMAL_STATISTICS is not set
|
||||||
# CONFIG_THERMAL_WRITABLE_TRIPS is not set
|
# CONFIG_THERMAL_WRITABLE_TRIPS is not set
|
||||||
|
@ -1354,7 +1354,7 @@ CONFIG_ENABLE_MUST_CHECK=y
|
|||||||
# CONFIG_ENA_ETHERNET is not set
|
# CONFIG_ENA_ETHERNET is not set
|
||||||
CONFIG_ENCLOSURE_SERVICES=y
|
CONFIG_ENCLOSURE_SERVICES=y
|
||||||
CONFIG_ENCRYPTED_KEYS=m
|
CONFIG_ENCRYPTED_KEYS=m
|
||||||
# CONFIG_ENERGY_MODEL is not set
|
CONFIG_ENERGY_MODEL=y
|
||||||
CONFIG_ENIC=m
|
CONFIG_ENIC=m
|
||||||
CONFIG_EPIC100=m
|
CONFIG_EPIC100=m
|
||||||
CONFIG_EPOLL=y
|
CONFIG_EPOLL=y
|
||||||
@ -5290,7 +5290,7 @@ CONFIG_THERMAL_GOV_STEP_WISE=y
|
|||||||
CONFIG_THERMAL_HWMON=y
|
CONFIG_THERMAL_HWMON=y
|
||||||
# CONFIG_THERMAL is not set
|
# CONFIG_THERMAL is not set
|
||||||
# CONFIG_THERMAL_MMIO 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_OF=y
|
||||||
# CONFIG_THERMAL_STATISTICS is not set
|
# CONFIG_THERMAL_STATISTICS is not set
|
||||||
# CONFIG_THERMAL_WRITABLE_TRIPS is not set
|
# CONFIG_THERMAL_WRITABLE_TRIPS is not set
|
||||||
|
@ -1455,7 +1455,7 @@ CONFIG_ENABLE_MUST_CHECK=y
|
|||||||
CONFIG_ENA_ETHERNET=m
|
CONFIG_ENA_ETHERNET=m
|
||||||
CONFIG_ENCLOSURE_SERVICES=m
|
CONFIG_ENCLOSURE_SERVICES=m
|
||||||
CONFIG_ENCRYPTED_KEYS=y
|
CONFIG_ENCRYPTED_KEYS=y
|
||||||
# CONFIG_ENERGY_MODEL is not set
|
CONFIG_ENERGY_MODEL=y
|
||||||
CONFIG_ENIC=m
|
CONFIG_ENIC=m
|
||||||
CONFIG_EPIC100=m
|
CONFIG_EPIC100=m
|
||||||
CONFIG_EPOLL=y
|
CONFIG_EPOLL=y
|
||||||
@ -3991,7 +3991,7 @@ CONFIG_PINCTRL_ICELAKE=m
|
|||||||
# CONFIG_PINCTRL_IPQ4019 is not set
|
# CONFIG_PINCTRL_IPQ4019 is not set
|
||||||
# CONFIG_PINCTRL_IPQ6018 is not set
|
# CONFIG_PINCTRL_IPQ6018 is not set
|
||||||
# CONFIG_PINCTRL_IPQ8074 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_LEWISBURG=m
|
||||||
# CONFIG_PINCTRL_LYNXPOINT is not set
|
# CONFIG_PINCTRL_LYNXPOINT is not set
|
||||||
# CONFIG_PINCTRL_MCP23S08 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_GOV_USER_SPACE=y
|
||||||
CONFIG_THERMAL_HWMON=y
|
CONFIG_THERMAL_HWMON=y
|
||||||
# CONFIG_THERMAL_MMIO 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_OF=y
|
||||||
# CONFIG_THERMAL_STATISTICS is not set
|
# CONFIG_THERMAL_STATISTICS is not set
|
||||||
CONFIG_THERMAL_WRITABLE_TRIPS=y
|
CONFIG_THERMAL_WRITABLE_TRIPS=y
|
||||||
|
@ -1447,7 +1447,7 @@ CONFIG_ENABLE_MUST_CHECK=y
|
|||||||
CONFIG_ENA_ETHERNET=m
|
CONFIG_ENA_ETHERNET=m
|
||||||
CONFIG_ENCLOSURE_SERVICES=m
|
CONFIG_ENCLOSURE_SERVICES=m
|
||||||
CONFIG_ENCRYPTED_KEYS=y
|
CONFIG_ENCRYPTED_KEYS=y
|
||||||
# CONFIG_ENERGY_MODEL is not set
|
CONFIG_ENERGY_MODEL=y
|
||||||
CONFIG_ENIC=m
|
CONFIG_ENIC=m
|
||||||
CONFIG_EPIC100=m
|
CONFIG_EPIC100=m
|
||||||
CONFIG_EPOLL=y
|
CONFIG_EPOLL=y
|
||||||
@ -3974,7 +3974,7 @@ CONFIG_PINCTRL_ICELAKE=m
|
|||||||
# CONFIG_PINCTRL_IPQ4019 is not set
|
# CONFIG_PINCTRL_IPQ4019 is not set
|
||||||
# CONFIG_PINCTRL_IPQ6018 is not set
|
# CONFIG_PINCTRL_IPQ6018 is not set
|
||||||
# CONFIG_PINCTRL_IPQ8074 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_LEWISBURG=m
|
||||||
# CONFIG_PINCTRL_LYNXPOINT is not set
|
# CONFIG_PINCTRL_LYNXPOINT is not set
|
||||||
# CONFIG_PINCTRL_MCP23S08 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_GOV_USER_SPACE=y
|
||||||
CONFIG_THERMAL_HWMON=y
|
CONFIG_THERMAL_HWMON=y
|
||||||
# CONFIG_THERMAL_MMIO 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_OF=y
|
||||||
# CONFIG_THERMAL_STATISTICS is not set
|
# CONFIG_THERMAL_STATISTICS is not set
|
||||||
CONFIG_THERMAL_WRITABLE_TRIPS=y
|
CONFIG_THERMAL_WRITABLE_TRIPS=y
|
||||||
|
31
kernel.spec
31
kernel.spec
@ -30,7 +30,7 @@ Summary: The Linux kernel
|
|||||||
# For a stable, released kernel, released_kernel should be 1.
|
# For a stable, released kernel, released_kernel should be 1.
|
||||||
%global released_kernel 0
|
%global released_kernel 0
|
||||||
|
|
||||||
%global distro_build 0.rc7.20200930gitfb0155a09b02.22
|
%global distro_build 0.rc7.20201002git60e720931556.24
|
||||||
|
|
||||||
%if 0%{?fedora}
|
%if 0%{?fedora}
|
||||||
%define secure_boot_arch x86_64
|
%define secure_boot_arch x86_64
|
||||||
@ -69,13 +69,13 @@ Summary: The Linux kernel
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%define rpmversion 5.9.0
|
%define rpmversion 5.9.0
|
||||||
%define pkgrelease 0.rc7.20200930gitfb0155a09b02.22
|
%define pkgrelease 0.rc7.20201002git60e720931556.24
|
||||||
|
|
||||||
# This is needed to do merge window version magic
|
# This is needed to do merge window version magic
|
||||||
%define patchlevel 9
|
%define patchlevel 9
|
||||||
|
|
||||||
# allow pkg_release to have configurable %%{?dist} tag
|
# allow pkg_release to have configurable %%{?dist} tag
|
||||||
%define specrelease 0.rc7.20200930gitfb0155a09b02.22%{?buildid}%{?dist}
|
%define specrelease 0.rc7.20201002git60e720931556.24%{?buildid}%{?dist}
|
||||||
|
|
||||||
%define pkg_release %{specrelease}
|
%define pkg_release %{specrelease}
|
||||||
|
|
||||||
@ -566,7 +566,7 @@ BuildRequires: asciidoc
|
|||||||
# exact git commit you can run
|
# exact git commit you can run
|
||||||
#
|
#
|
||||||
# xzcat -qq ${TARBALL} | git get-tar-commit-id
|
# xzcat -qq ${TARBALL} | git get-tar-commit-id
|
||||||
Source0: linux-20200930gitfb0155a09b02.tar.xz
|
Source0: linux-20201002git60e720931556.tar.xz
|
||||||
|
|
||||||
Source1: Makefile.rhelver
|
Source1: Makefile.rhelver
|
||||||
|
|
||||||
@ -790,7 +790,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
|
Patch73: 0001-Work-around-for-gcc-bug-https-gcc.gnu.org-bugzilla-s.patch
|
||||||
Patch74: 0001-Temporarily-remove-cdomain-from-sphinx-documentation.patch
|
Patch74: 0001-Temporarily-remove-cdomain-from-sphinx-documentation.patch
|
||||||
Patch75: 0001-Filter-out-LTO-build-options-from-the-perl-ccopts.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
|
%endif
|
||||||
|
|
||||||
@ -1286,8 +1285,8 @@ ApplyOptionalPatch()
|
|||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
%setup -q -n kernel-20200930gitfb0155a09b02 -c
|
%setup -q -n kernel-20201002git60e720931556 -c
|
||||||
mv linux-20200930gitfb0155a09b02 linux-%{KVERREL}
|
mv linux-20201002git60e720931556 linux-%{KVERREL}
|
||||||
|
|
||||||
cd linux-%{KVERREL}
|
cd linux-%{KVERREL}
|
||||||
cp -a %{SOURCE1} .
|
cp -a %{SOURCE1} .
|
||||||
@ -1368,7 +1367,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-Work-around-for-gcc-bug-https-gcc.gnu.org-bugzilla-s.patch
|
||||||
ApplyOptionalPatch 0001-Temporarily-remove-cdomain-from-sphinx-documentation.patch
|
ApplyOptionalPatch 0001-Temporarily-remove-cdomain-from-sphinx-documentation.patch
|
||||||
ApplyOptionalPatch 0001-Filter-out-LTO-build-options-from-the-perl-ccopts.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
|
%endif
|
||||||
|
|
||||||
@ -2798,6 +2796,23 @@ fi
|
|||||||
#
|
#
|
||||||
#
|
#
|
||||||
%changelog
|
%changelog
|
||||||
|
* 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]
|
* Wed Sep 30 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc7.20200930gitfb0155a09b02.21]
|
||||||
- Merge ark-patches
|
- Merge ark-patches
|
||||||
|
|
||||||
|
6
sources
6
sources
@ -1,3 +1,3 @@
|
|||||||
SHA512 (linux-20200930gitfb0155a09b02.tar.xz) = 68c92ab5a2476e6fdc0263e264c5804e43a84dbc659a94e674d7306cd7ef03dd2d7cde8c194415320e80eba80953e0de93fc7275023f9540be5dd6c3ba5cbc99
|
SHA512 (linux-20201002git60e720931556.tar.xz) = e101d9429075dbce8de4cb026f14f5e35c9a0d4b9cbbfedc934563ce2460dca076071637d8b7be219fd146ba2bcc8bd2f68af66e859d0940b523763548c42ef5
|
||||||
SHA512 (kernel-abi-whitelists-5.9.0-0.rc7.20200930gitfb0155a09b02.22.tar.bz2) = 8a5989f5488ecabb016fef35950ea48cc2f23a9e76bc2442a81f294c4827b9b8b944bbd98f8509ef3be2944ccb24fe94a2bb7a3b62642f905c9cd85006e90af0
|
SHA512 (kernel-abi-whitelists-5.9.0-0.rc7.20201002git60e720931556.24.tar.bz2) = 0ea4971910b5bc34161ad4f31402fdc347178c6a78bdd7fffeded6f94983de8a3ddda5cfe211a8077611412bb2e45728f3a36223499baed99a8ddf2d7d0eedf9
|
||||||
SHA512 (kernel-kabi-dw-5.9.0-0.rc7.20200930gitfb0155a09b02.22.tar.bz2) = 13b209c5a0bb08fbff3a87679a9da502f185b600b792a626a1364ccabcb30acf5929ebb4c0314bfb81c0472f1fb741103a8da62319c7d2475927352db322b37e
|
SHA512 (kernel-kabi-dw-5.9.0-0.rc7.20201002git60e720931556.24.tar.bz2) = e0564095e71562490a806c8633d2b7ce9dd6e3a932f99c929c23997ebf46d0051a23cff67b473bf9e82886b13b0122686b4ac8159246d580e05a46116cf39a2f
|
||||||
|
Loading…
Reference in New Issue
Block a user