summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2021-09-16 06:21:49 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2021-09-16 06:21:49 +0200
commitf6340ff9f75bda4bcf1234f7219444b04617f783 (patch)
treef80da4542db0af8aa47c931eed5d897da69b863e
parent9cd7866304b2d5b845de31768b54f7effb5996a7 (diff)
parent0ae80aee4e3460b177d613292b3d8af13414d8c2 (diff)
downloadkernel-f6340ff9f75bda4bcf1234f7219444b04617f783.zip
kernel-f6340ff9f75bda4bcf1234f7219444b04617f783.tar.gz
kernel-f6340ff9f75bda4bcf1234f7219444b04617f783.tar.xz
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.15.0-0.rc1.20210915git3ca706c189db.13.vanilla.1.fc34
-rw-r--r--Makefile.rhelver2
-rw-r--r--kernel-x86_64-debug-fedora.config4
-rw-r--r--kernel-x86_64-debug-rhel.config4
-rw-r--r--kernel-x86_64-fedora.config4
-rw-r--r--kernel-x86_64-rhel.config4
-rwxr-xr-xkernel.spec25
-rw-r--r--patch-5.15-redhat.patch6
-rw-r--r--sources6
8 files changed, 33 insertions, 22 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver
index b04cb77..18afd01 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 = 12
+RHEL_RELEASE = 13
#
# Early y+1 numbering
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index 65b32fd..393cb4d 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -970,7 +970,7 @@ CONFIG_CONTEXT_SWITCH_TRACER=y
CONFIG_CORDIC=m
CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
CONFIG_CORTINA_PHY=m
-# CONFIG_COUNTER is not set
+CONFIG_COUNTER=m
# CONFIG_CPA_DEBUG is not set
# CONFIG_CPU5_WDT is not set
# CONFIG_CPU_BIG_ENDIAN is not set
@@ -2761,6 +2761,7 @@ CONFIG_INTEL_PMT_CRASHLOG=m
CONFIG_INTEL_PMT_TELEMETRY=m
CONFIG_INTEL_POWERCLAMP=m
CONFIG_INTEL_PUNIT_IPC=m
+CONFIG_INTEL_QEP=m
CONFIG_INTEL_RAPL=m
CONFIG_INTEL_RST=m
# CONFIG_INTEL_SAR_INT1092 is not set
@@ -2797,6 +2798,7 @@ CONFIG_INTEL_XWAY_PHY=m
# CONFIG_INTERCONNECT_QCOM_SC7280 is not set
# CONFIG_INTERCONNECT_QCOM_SC8180X is not set
CONFIG_INTERCONNECT=y
+# CONFIG_INTERRUPT_CNT is not set
# CONFIG_INTERVAL_TREE_TEST is not set
CONFIG_INV_ICM42600_I2C=m
CONFIG_INV_ICM42600_SPI=m
diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config
index eeac718..b50b3d6 100644
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@@ -781,7 +781,7 @@ CONFIG_CONTEXT_SWITCH_TRACER=y
CONFIG_CORDIC=m
CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
CONFIG_CORTINA_PHY=m
-# CONFIG_COUNTER is not set
+CONFIG_COUNTER=m
# CONFIG_CPA_DEBUG is not set
# CONFIG_CPU5_WDT is not set
# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
@@ -2432,6 +2432,7 @@ CONFIG_INTEL_PMT_CRASHLOG=m
CONFIG_INTEL_PMT_TELEMETRY=m
CONFIG_INTEL_POWERCLAMP=m
# CONFIG_INTEL_PUNIT_IPC is not set
+CONFIG_INTEL_QEP=m
CONFIG_INTEL_RAPL=m
CONFIG_INTEL_RDT=y
CONFIG_INTEL_RST=m
@@ -2462,6 +2463,7 @@ CONFIG_INTEL_VBTN=m
CONFIG_INTEL_WMI_THUNDERBOLT=m
CONFIG_INTEL_XWAY_PHY=m
# CONFIG_INTERCONNECT is not set
+# CONFIG_INTERRUPT_CNT is not set
# CONFIG_INTERVAL_TREE_TEST is not set
# CONFIG_INV_ICM42600_I2C is not set
# CONFIG_INV_ICM42600_SPI is not set
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index a43e3b5..733354a 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -969,7 +969,7 @@ CONFIG_CONTEXT_SWITCH_TRACER=y
CONFIG_CORDIC=m
CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
CONFIG_CORTINA_PHY=m
-# CONFIG_COUNTER is not set
+CONFIG_COUNTER=m
# CONFIG_CPA_DEBUG is not set
# CONFIG_CPU5_WDT is not set
# CONFIG_CPU_BIG_ENDIAN is not set
@@ -2744,6 +2744,7 @@ CONFIG_INTEL_PMT_CRASHLOG=m
CONFIG_INTEL_PMT_TELEMETRY=m
CONFIG_INTEL_POWERCLAMP=m
CONFIG_INTEL_PUNIT_IPC=m
+CONFIG_INTEL_QEP=m
CONFIG_INTEL_RAPL=m
CONFIG_INTEL_RST=m
# CONFIG_INTEL_SAR_INT1092 is not set
@@ -2780,6 +2781,7 @@ CONFIG_INTEL_XWAY_PHY=m
# CONFIG_INTERCONNECT_QCOM_SC7280 is not set
# CONFIG_INTERCONNECT_QCOM_SC8180X is not set
CONFIG_INTERCONNECT=y
+# CONFIG_INTERRUPT_CNT is not set
# CONFIG_INTERVAL_TREE_TEST is not set
CONFIG_INV_ICM42600_I2C=m
CONFIG_INV_ICM42600_SPI=m
diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config
index 505d323..215fbb9 100644
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@@ -781,7 +781,7 @@ CONFIG_CONTEXT_SWITCH_TRACER=y
CONFIG_CORDIC=m
CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
CONFIG_CORTINA_PHY=m
-# CONFIG_COUNTER is not set
+CONFIG_COUNTER=m
# CONFIG_CPA_DEBUG is not set
# CONFIG_CPU5_WDT is not set
# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
@@ -2416,6 +2416,7 @@ CONFIG_INTEL_PMT_CRASHLOG=m
CONFIG_INTEL_PMT_TELEMETRY=m
CONFIG_INTEL_POWERCLAMP=m
# CONFIG_INTEL_PUNIT_IPC is not set
+CONFIG_INTEL_QEP=m
CONFIG_INTEL_RAPL=m
CONFIG_INTEL_RDT=y
CONFIG_INTEL_RST=m
@@ -2446,6 +2447,7 @@ CONFIG_INTEL_VBTN=m
CONFIG_INTEL_WMI_THUNDERBOLT=m
CONFIG_INTEL_XWAY_PHY=m
# CONFIG_INTERCONNECT is not set
+# CONFIG_INTERRUPT_CNT is not set
# CONFIG_INTERVAL_TREE_TEST is not set
# CONFIG_INV_ICM42600_I2C is not set
# CONFIG_INV_ICM42600_SPI is not set
diff --git a/kernel.spec b/kernel.spec
index 9a0fd49..2f08f30 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -78,9 +78,9 @@ Summary: The Linux kernel
# Set debugbuildsenabled to 0 to not build a separate debug kernel, but
# to build the base kernel using the debug configuration. (Specifying
# the --with-release option overrides this setting.)
-%define debugbuildsenabled 1
+%define debugbuildsenabled 0
-%global distro_build 0.rc1.12
+%global distro_build 0.rc1.20210915git3ca706c189db.13
%if 0%{?fedora}
%define secure_boot_arch x86_64
@@ -127,13 +127,13 @@ Summary: The Linux kernel
%define rpmversion 5.15.0
%define patchversion 5.15
-%define pkgrelease 0.rc1.12
+%define pkgrelease 0.rc1.20210915git3ca706c189db.13
# This is needed to do merge window version magic
%define patchlevel 15
# allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc1.12%{?buildid}%{?dist}
+%define specrelease 0.rc1.20210915git3ca706c189db.13%{?buildid}%{?dist}
%define pkg_release %{specrelease}
@@ -549,7 +549,7 @@ Release: %{pkg_release}
# DO NOT CHANGE THE 'ExclusiveArch' LINE TO TEMPORARILY EXCLUDE AN ARCHITECTURE BUILD.
# SET %%nobuildarches (ABOVE) INSTEAD
%if 0%{?fedora}
-ExclusiveArch: x86_64 s390x %{arm} aarch64 ppc64le
+ExclusiveArch: noarch x86_64 s390x %{arm} aarch64 ppc64le
%else
ExclusiveArch: noarch i386 i686 x86_64 s390x %{arm} aarch64 ppc64le
%endif
@@ -674,7 +674,7 @@ BuildRequires: lld
# exact git commit you can run
#
# xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.15-rc1.tar.xz
+Source0: linux-5.15-rc1-19-g3ca706c189db.tar.xz
Source1: Makefile.rhelver
@@ -1360,8 +1360,8 @@ ApplyOptionalPatch()
fi
}
-%setup -q -n kernel-5.15-rc1 -c
-mv linux-5.15-rc1 linux-%{KVERREL}
+%setup -q -n kernel-5.15-rc1-19-g3ca706c189db -c
+mv linux-5.15-rc1-19-g3ca706c189db linux-%{KVERREL}
cd linux-%{KVERREL}
# cp -a %{SOURCE1} .
@@ -2176,7 +2176,7 @@ InitBuildVars
%global perf_build_extra_opts CORESIGHT=1
%endif
%global perf_make \
- %{__make} %{?make_opts} 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 LIBTRACEEVENT_DYNAMIC=1 %{?perf_build_extra_opts} prefix=%{_prefix} PYTHON=%{__python3}
+ %{__make} %{?make_opts} 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 LIBBPF_DYNAMIC=1 LIBTRACEEVENT_DYNAMIC=1 %{?perf_build_extra_opts} prefix=%{_prefix} PYTHON=%{__python3}
%if %{with_perf}
# perf
# make sure check-headers.sh is executable
@@ -2964,8 +2964,11 @@ fi
#
#
%changelog
-* Mon Sep 13 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.15-0.rc1.12]
-- Temporarily stop building perf with LIBBPF_DYNAMIC=1 (Justin M. Forbes)
+* Wed Sep 15 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.15-0.rc1.20210915git3ca706c189db.13]
+- Build kernel-doc for Fedora (Justin M. Forbes)
+
+* Wed Sep 15 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.15-0.rc1.20210915git3ca706c189db.13]
+- x86_64: Enable Elkhart Lake Quadrature Encoder Peripheral support (Prarit Bhargava)
* Fri Sep 10 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.15-0.rc0.20210910gitbf9f243f23e6.8]
- Update CONFIG_WERROR to disabled as it can cause issue with out of tree modules. (Justin M. Forbes)
diff --git a/patch-5.15-redhat.patch b/patch-5.15-redhat.patch
index 5467073..06b9139 100644
--- a/patch-5.15-redhat.patch
+++ b/patch-5.15-redhat.patch
@@ -141,7 +141,7 @@ index 000000000000..effb81d04bfd
+
+endmenu
diff --git a/Makefile b/Makefile
-index 7cfe4ff36f44..eab999eeb925 100644
+index 34a0afc3a8eb..621ea3c850a9 100644
--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@@ -155,7 +155,7 @@ index 7cfe4ff36f44..eab999eeb925 100644
# We are using a recursive build, so we need to do a little thinking
# to get the ordering right.
#
-@@ -1269,7 +1273,13 @@ define filechk_version.h
+@@ -1263,7 +1267,13 @@ define filechk_version.h
((c) > 255 ? 255 : (c)))'; \
echo \#define LINUX_VERSION_MAJOR $(VERSION); \
echo \#define LINUX_VERSION_PATCHLEVEL $(PATCHLEVEL); \
@@ -187,7 +187,7 @@ index fc196421b2ce..0a6b267128ae 100644
The VM uses one page of physical memory for each page table.
For systems with a lot of processes, this can use a lot of
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
-index 077f2ec4eeb2..d33c848032c3 100644
+index 5c7ae4c3954b..7c81c15fc327 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -911,7 +911,7 @@ endchoice
diff --git a/sources b/sources
index cda5112..984663a 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.15-rc1.tar.xz) = 4098b06456fcd150d6d3c8879908a43f8befd8b8a692f8e67ca5256e03705e5e6b56933d1f3f741fcf33a469263a884bab87002e18d19b251a91abfd0e5f3e73
-SHA512 (kernel-abi-stablelists-5.15.0-0.rc1.12.tar.bz2) = 712f5edae2295c38f2177cdc77bad896d3bb137aa3f496b9ebc398fe69b3bcd775a7d054dce7600f6556a155b521e4efaad0af868ee14ebb6a3de92a16cc8947
-SHA512 (kernel-kabi-dw-5.15.0-0.rc1.12.tar.bz2) = 3d1b0fb2cdf3f5dc242d2d0e03a1b448594007d98273696127b7be41dbf41144729dcaa42dce6bd5bed3ff26c3bb79fe497aabe9173905317182b1cf697b6644
+SHA512 (linux-5.15-rc1-19-g3ca706c189db.tar.xz) = b44c2ab8159c43e54980c0a45b1058836dd4488fcb93fc8c7b073bbf119ca1c5ca5a07e2ddf6cf112776702e8c0455ed23cf23895027820b94bd1924478d5dcf
+SHA512 (kernel-abi-stablelists-5.15.0-0.rc1.20210915git3ca706c189db.13.tar.bz2) = 061634f2dcdbd8b12fc6ade761cb9e1e56bbf7ab3b229dabec2aa02a756fa52bb4fb0f93c2f3c615631eb8af3dedd228274a7bf7a10a3f5c9e7e9a65858f2447
+SHA512 (kernel-kabi-dw-5.15.0-0.rc1.20210915git3ca706c189db.13.tar.bz2) = 44c39cffc00feec7a6454ecd47e4c5edd25705382e28470810c41f46f496e20a28975037eb61437d1cb320c648b4201360e3fafb2b1dfd74b150802f2077c907