diff options
| -rw-r--r-- | Patchlist.changelog | 3 | ||||
| -rwxr-xr-x | kernel.spec | 11 | ||||
| -rw-r--r-- | patch-6.1-redhat.patch | 26 | ||||
| -rw-r--r-- | sources | 6 |
4 files changed, 10 insertions, 36 deletions
diff --git a/Patchlist.changelog b/Patchlist.changelog index 41dfe5c4e..9544612ae 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,6 +1,3 @@ -"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.spec b/kernel.spec index 98b281a5e..bbe2b6cab 100755 --- a/kernel.spec +++ b/kernel.spec @@ -127,13 +127,13 @@ Summary: The Linux kernel # define buildid .local %define specversion 6.1.0 %define patchversion 6.1 -%define pkgrelease 0.rc2.20221026git4dc12f37a8e9.23 +%define pkgrelease 0.rc2.20221027gitb229b6ca5abb.23 %define kversion 6 -%define tarfile_release 6.1-rc2-70-g4dc12f37a8e9 +%define tarfile_release 6.1-rc2-105-gb229b6ca5abb # 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.20221026git4dc12f37a8e9.23%{?buildid}%{?dist} +%define specrelease 0.rc2.20221027gitb229b6ca5abb.23%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.1.0 @@ -3199,8 +3199,9 @@ fi # # %changelog -* 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) +* Thu Oct 27 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.1.0-0.rc2.b229b6ca5abb.23] +- redhat/docs: Update with DISTLOCALVERSION (Prarit Bhargava) +- Linux v6.1.0-0.rc2.b229b6ca5abb * 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) diff --git a/patch-6.1-redhat.patch b/patch-6.1-redhat.patch index a66b36e68..caadd41cd 100644 --- a/patch-6.1-redhat.patch +++ b/patch-6.1-redhat.patch @@ -64,9 +64,7 @@ security/lockdown/Kconfig | 13 + security/lockdown/lockdown.c | 1 + security/security.c | 6 + - tools/perf/Documentation/arm-coresight.txt | 5 + - tools/perf/Documentation/perf-arm-coresight.txt | 5 - - 68 files changed, 1545 insertions(+), 192 deletions(-) + 66 files changed, 1540 insertions(+), 187 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index a465d5242774..191876dd4731 100644 @@ -3010,25 +3008,3 @@ index 79d82cb6e469..843b0dd8f0dd 100644 #ifdef CONFIG_PERF_EVENTS int security_perf_event_open(struct perf_event_attr *attr, int type) { -diff --git a/tools/perf/Documentation/arm-coresight.txt b/tools/perf/Documentation/arm-coresight.txt -new file mode 100644 -index 000000000000..c117fc50a2a9 ---- /dev/null -+++ b/tools/perf/Documentation/arm-coresight.txt -@@ -0,0 +1,5 @@ -+Arm CoreSight Support -+===================== -+ -+For full documentation, see Documentation/trace/coresight/coresight-perf.rst -+in the kernel tree. -diff --git a/tools/perf/Documentation/perf-arm-coresight.txt b/tools/perf/Documentation/perf-arm-coresight.txt -deleted file mode 100644 -index c117fc50a2a9..000000000000 ---- a/tools/perf/Documentation/perf-arm-coresight.txt -+++ /dev/null -@@ -1,5 +0,0 @@ --Arm CoreSight Support --===================== -- --For full documentation, see Documentation/trace/coresight/coresight-perf.rst --in the kernel tree. @@ -1,3 +1,3 @@ -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 +SHA512 (linux-6.1-rc2-105-gb229b6ca5abb.tar.xz) = 72af0f291066cd920def46ae9999d04c10fd6c9d259089969a4fa7052f762c66968297997552c3c73c13c3fce731433b4324b891027ec631e21cd486cc7f36b4 +SHA512 (kernel-abi-stablelists-6.1.0.tar.bz2) = 4687cae5470263ed5cf0b7fcd9a1c42529303e6b5e8ee483b2d6eb606595abff02362a207fd4e87691f55541a849849726e984619a74e3beddbc117ebf84b513 +SHA512 (kernel-kabi-dw-6.1.0.tar.bz2) = 2badeceeca513b3b550d0f8e4abff699c7de0d153e1bd4e4bc579430b6449aaf728dfc0b4f9102b97faca95f0ced95291d76069d76c68cb933ef1ca6d432a494 |