summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2022-10-26 11:30:04 -0500
committerJustin M. Forbes <jforbes@fedoraproject.org>2022-10-26 11:30:04 -0500
commit3ccfa03911a226d4adfbd90bdc0499aee8472e68 (patch)
tree1bbae2346b9e9bc40ded09ee74b2521cae0ba07c
parente25e6e997dffbf52d9b1075d638dbff330cab579 (diff)
downloadkernel-3ccfa03911a226d4adfbd90bdc0499aee8472e68.tar.gz
kernel-3ccfa03911a226d4adfbd90bdc0499aee8472e68.tar.xz
kernel-3ccfa03911a226d4adfbd90bdc0499aee8472e68.zip
kernel-6.1.0-0.rc2.20221026git4dc12f37a8e9.23
* Wed Oct 26 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.1.0-0.rc2.4dc12f37a8e9.23] - perf tools: Fix man page build wrt perf-arm-coresight.txt (Adrian Hunter) Resolves: Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
-rw-r--r--Makefile.rhelver2
-rw-r--r--Patchlist.changelog4
-rw-r--r--kernel-ppc64le-debug-rhel.config1
-rw-r--r--kernel-ppc64le-rhel.config1
-rw-r--r--kernel-s390x-debug-rhel.config1
-rw-r--r--kernel-s390x-rhel.config1
-rw-r--r--kernel-s390x-zfcpdump-rhel.config1
-rw-r--r--kernel-x86_64-debug-rhel.config1
-rw-r--r--kernel-x86_64-rhel.config1
-rwxr-xr-xkernel.spec17
-rw-r--r--sources6
11 files changed, 18 insertions, 18 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver
index befbf776d..091609e89 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 = 21
+RHEL_RELEASE = 23
#
# ZSTREAM
diff --git a/Patchlist.changelog b/Patchlist.changelog
index e53c10195..41dfe5c4e 100644
--- a/Patchlist.changelog
+++ b/Patchlist.changelog
@@ -1,5 +1,5 @@
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/cd37e50d142e792867e204b7dca20a64334739cd
- cd37e50d142e792867e204b7dca20a64334739cd perf tools: Fix man page build wrt perf-arm-coresight.txt
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/92c723611904e5ba4742bb1b0e83963f2c7567c6
+ 92c723611904e5ba4742bb1b0e83963f2c7567c6 perf tools: Fix man page build wrt perf-arm-coresight.txt
"https://gitlab.com/cki-project/kernel-ark/-/commit"/a5465769aab281eaccf26b6b2c1659e26de74074
a5465769aab281eaccf26b6b2c1659e26de74074 Change acpi_bus_get_acpi_device to acpi_get_acpi_dev
diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config
index ca1393f2e..4b4b68a55 100644
--- a/kernel-ppc64le-debug-rhel.config
+++ b/kernel-ppc64le-debug-rhel.config
@@ -252,7 +252,6 @@ CONFIG_ARM64_ERRATUM_2119858=y
CONFIG_ARM64_ERRATUM_2139208=y
CONFIG_ARM64_ERRATUM_2224489=y
CONFIG_ARM64_ERRATUM_2253138=y
-CONFIG_ARM64_ERRATUM_2441007=y
CONFIG_ARM64_ERRATUM_2441009=y
CONFIG_ARM64_ERRATUM_2457168=y
CONFIG_ARM64_ERRATUM_2658417=y
diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config
index 1a28ef5cb..b4af88ed1 100644
--- a/kernel-ppc64le-rhel.config
+++ b/kernel-ppc64le-rhel.config
@@ -252,7 +252,6 @@ CONFIG_ARM64_ERRATUM_2119858=y
CONFIG_ARM64_ERRATUM_2139208=y
CONFIG_ARM64_ERRATUM_2224489=y
CONFIG_ARM64_ERRATUM_2253138=y
-CONFIG_ARM64_ERRATUM_2441007=y
CONFIG_ARM64_ERRATUM_2441009=y
CONFIG_ARM64_ERRATUM_2457168=y
CONFIG_ARM64_ERRATUM_2658417=y
diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config
index c05adcec2..ad871233b 100644
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@@ -251,7 +251,6 @@ CONFIG_ARM64_ERRATUM_2119858=y
CONFIG_ARM64_ERRATUM_2139208=y
CONFIG_ARM64_ERRATUM_2224489=y
CONFIG_ARM64_ERRATUM_2253138=y
-CONFIG_ARM64_ERRATUM_2441007=y
CONFIG_ARM64_ERRATUM_2441009=y
CONFIG_ARM64_ERRATUM_2457168=y
CONFIG_ARM64_ERRATUM_2658417=y
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config
index 68828fcbe..d3a4d400a 100644
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@@ -251,7 +251,6 @@ CONFIG_ARM64_ERRATUM_2119858=y
CONFIG_ARM64_ERRATUM_2139208=y
CONFIG_ARM64_ERRATUM_2224489=y
CONFIG_ARM64_ERRATUM_2253138=y
-CONFIG_ARM64_ERRATUM_2441007=y
CONFIG_ARM64_ERRATUM_2441009=y
CONFIG_ARM64_ERRATUM_2457168=y
CONFIG_ARM64_ERRATUM_2658417=y
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config
index dd0ef74b3..790912b04 100644
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
@@ -251,7 +251,6 @@ CONFIG_ARM64_ERRATUM_2119858=y
CONFIG_ARM64_ERRATUM_2139208=y
CONFIG_ARM64_ERRATUM_2224489=y
CONFIG_ARM64_ERRATUM_2253138=y
-CONFIG_ARM64_ERRATUM_2441007=y
CONFIG_ARM64_ERRATUM_2441009=y
CONFIG_ARM64_ERRATUM_2457168=y
CONFIG_ARM64_ERRATUM_2658417=y
diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config
index 6b09efe8b..0088902fb 100644
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@@ -274,7 +274,6 @@ CONFIG_ARM64_ERRATUM_2119858=y
CONFIG_ARM64_ERRATUM_2139208=y
CONFIG_ARM64_ERRATUM_2224489=y
CONFIG_ARM64_ERRATUM_2253138=y
-CONFIG_ARM64_ERRATUM_2441007=y
CONFIG_ARM64_ERRATUM_2441009=y
CONFIG_ARM64_ERRATUM_2457168=y
CONFIG_ARM64_ERRATUM_2658417=y
diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config
index 2853059a6..1c81290eb 100644
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@@ -274,7 +274,6 @@ CONFIG_ARM64_ERRATUM_2119858=y
CONFIG_ARM64_ERRATUM_2139208=y
CONFIG_ARM64_ERRATUM_2224489=y
CONFIG_ARM64_ERRATUM_2253138=y
-CONFIG_ARM64_ERRATUM_2441007=y
CONFIG_ARM64_ERRATUM_2441009=y
CONFIG_ARM64_ERRATUM_2457168=y
CONFIG_ARM64_ERRATUM_2658417=y
diff --git a/kernel.spec b/kernel.spec
index 57d1f9e94..90a2d8b80 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -119,17 +119,17 @@ 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
# define buildid .local
%define specversion 6.1.0
%define patchversion 6.1
-%define pkgrelease 0.rc2.21
+%define pkgrelease 0.rc2.20221026git4dc12f37a8e9.23
%define kversion 6
-%define tarfile_release 6.1-rc2
+%define tarfile_release 6.1-rc2-70-g4dc12f37a8e9
# This is needed to do merge window version magic
%define patchlevel 1
# This allows pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc2.21%{?buildid}%{?dist}
+%define specrelease 0.rc2.20221026git4dc12f37a8e9.23%{?buildid}%{?dist}
# This defines the kabi tarball version
%define kabiversion 6.1.0
@@ -3190,9 +3190,16 @@ fi
#
#
%changelog
-* Mon Oct 24 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.1.0-0.rc2.21]
+* Wed Oct 26 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.1.0-0.rc2.4dc12f37a8e9.23]
- perf tools: Fix man page build wrt perf-arm-coresight.txt (Adrian Hunter)
+* Wed Oct 26 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.1.0-0.rc2.4dc12f37a8e9.22]
+- redhat/Makefile: Rename LOCALVERSION to DISTLOCALVERSION (Akihiko Odaki)
+- Linux v6.1.0-0.rc2.4dc12f37a8e9
+
+* Tue Oct 25 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.1.0-0.rc2.1a2dcbdde82e.21]
+- Linux v6.1.0-0.rc2.1a2dcbdde82e
+
* Mon Oct 24 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.1.0-0.rc2.20]
- Linux v6.1.0-0.rc2
diff --git a/sources b/sources
index b73655381..40d93658f 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-6.1-rc2.tar.xz) = 93146c3cb8033862718394c5cc2fab4feee2ac7e908663035dcecac647b84cbf52690cfb18bb02ad258778f3f4fd6df5cc78607923501750b79e8e65bab0212c
-SHA512 (kernel-abi-stablelists-6.1.0.tar.bz2) = a71ffa459d07607a0e81892bb1d65aa624c62f09be43695adf56aedb470f84db2a4f6d779fe3e6bc09849def9bae1b8b868e283c3224b28283e9a8bac4c3c69b
-SHA512 (kernel-kabi-dw-6.1.0.tar.bz2) = c83758babdb3a32ca1a1db8b5b4c616ccec3023ab5faf5d2fcd467e524e1b823296e946ca006d90edb0b6354759c850a332f4d35286426b9c15644fb0b0b7869
+SHA512 (linux-6.1-rc2-70-g4dc12f37a8e9.tar.xz) = 9a2abeef52db695685d4fe976d33c3b229f3451b425073a1b48ce4983b6f688d7891cac235ce6cc61242a1d4147b3f8920fda1cc4a452ed740d1e9b411185e23
+SHA512 (kernel-abi-stablelists-6.1.0.tar.bz2) = 5a6cdf8d23981cad1e4a91ff11114b22905f7debd502520231550ceb60d3c59458448b8749b9e503ef925965c7a3a5f47a97f922e811402f035b47babab19ec8
+SHA512 (kernel-kabi-dw-6.1.0.tar.bz2) = 015e9aeb3fb65b9268c5b70cf57452de99660bd87ab433c0e60b55d0a0e4e4cb8deb248090cb46adb11753608d2d458f5c8b3c1db7741b6f8d044d83b03cb84d