summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2023-01-03 18:15:37 +0100
committerThorsten Leemhuis <fedora@leemhuis.info>2023-01-03 18:15:37 +0100
commitb3805419128282688ee4991039aa98df5873e095 (patch)
treeacee1500714101c52b0f7fb710be47b68aa61207
parent8e468aaf3a058ed9a2e30ca313fe0644e36959ac (diff)
parentf9d9e56ccc241a1acf706e45deec0794d6c5be6b (diff)
downloadkernel-b3805419128282688ee4991039aa98df5873e095.tar.gz
kernel-b3805419128282688ee4991039aa98df5873e095.tar.xz
kernel-b3805419128282688ee4991039aa98df5873e095.zip
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-6.2.0-0.rc2.20230103git69b41ac87e4a.19.vanilla.1.fc38
-rw-r--r--Makefile.rhelver2
-rw-r--r--Patchlist.changelog4
-rwxr-xr-xkernel.spec14
-rw-r--r--sources6
4 files changed, 15 insertions, 11 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver
index 92aed85ff..14cf4a794 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 = 18
+RHEL_RELEASE = 19
#
# ZSTREAM
diff --git a/Patchlist.changelog b/Patchlist.changelog
index a786deacf..1dd3fa2c6 100644
--- a/Patchlist.changelog
+++ b/Patchlist.changelog
@@ -1,5 +1,5 @@
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/32d9751fdfeabc800ecc776d020a5aa11c53b17b
- 32d9751fdfeabc800ecc776d020a5aa11c53b17b Revert "arm64: remove special treatment for the link order of head.o"
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/37c79b27e6709bd6a3a6bfefb6b595cb3bbb0145
+ 37c79b27e6709bd6a3a6bfefb6b595cb3bbb0145 Revert "arm64: remove special treatment for the link order of head.o"
"https://gitlab.com/cki-project/kernel-ark/-/commit"/77542637f2e84a847a7886979e0613332695c181
77542637f2e84a847a7886979e0613332695c181 Change acpi_bus_get_acpi_device to acpi_get_acpi_dev
diff --git a/kernel.spec b/kernel.spec
index b1282a1da..3fa3c0bbe 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -126,17 +126,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.2.0
%define patchversion 6.2
-%define pkgrelease 0.rc2.18
+%define pkgrelease 0.rc2.20230103git69b41ac87e4a.19
%define kversion 6
-%define tarfile_release 6.2-rc2
+%define tarfile_release 6.2-rc2-10-g69b41ac87e4a
# This is needed to do merge window version magic
%define patchlevel 2
# This allows pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc2.18%{?buildid}%{?dist}
+%define specrelease 0.rc2.20230103git69b41ac87e4a.19%{?buildid}%{?dist}
# This defines the kabi tarball version
%define kabiversion 6.2.0
@@ -3188,10 +3188,14 @@ fi
#
#
%changelog
-* Mon Jan 02 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.2.0-0.rc2.18]
+* Tue Jan 03 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.2.0-0.rc2.69b41ac87e4a.19]
- Revert "redhat: fix elf got hardening for vm tools" (Don Zickus)
- Revert "arm64: remove special treatment for the link order of head.o" (Justin M. Forbes)
+* Tue Jan 03 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.2.0-0.rc2.69b41ac87e4a.18]
+- redhat/docs: Add FAQ entry for booting between Fedora & ELN/RHEL kernels (Prarit Bhargava)
+- Linux v6.2.0-0.rc2.69b41ac87e4a
+
* Mon Jan 02 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.2.0-0.rc2.17]
- Linux v6.2.0-0.rc2
diff --git a/sources b/sources
index 8060c2ecc..5c5e176eb 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-6.2-rc2.tar.xz) = 37b597cd05b0c83fdca124630d61984509a32b0900db9225495c4ebf1f5920dbd2d6dbefded3f669137e31ffbe03d670d1b5dbaeb2f93ddd714ed72a8d34b783
-SHA512 (kernel-abi-stablelists-6.2.0.tar.bz2) = b0c710566ecddf3baa33a5f75ca866beee9000b42866f78b699b64f502a4d251d98def445350759de78f88610110619bb653aae1300dcae5a7c03f358dc985d2
-SHA512 (kernel-kabi-dw-6.2.0.tar.bz2) = 7aa2f21a1aa77938d8655f9802d8d368330767b9a63684663a4d86b4d6f909a3321fb73015abea9cecd79ae74e6cc9fa557b45303d609b2ae0b0e4777c5f85db
+SHA512 (linux-6.2-rc2-10-g69b41ac87e4a.tar.xz) = 24c017ef7b5d8994382a2b7ab2a69fe3f6912748a954f95bda2d153568f9ba03edf366313c9009edbd626e29a84721778b5ea35cd9bff107e2b0ae14d57d274e
+SHA512 (kernel-abi-stablelists-6.2.0.tar.bz2) = ed2cdf3955db009d95f7a83f9b985d59b03b8d92e95cd36f8825fe7a9369c1d787adb566b6a63323170081e2757fdc274c23e2a18230632f8a4c49611f468198
+SHA512 (kernel-kabi-dw-6.2.0.tar.bz2) = 0767fa13cadfabfefb0c7443196ba19c7fd66b1609b7da7f20cb16bc8c567cd4984cf50e08cde16faa0a1d6dbbe3c3a22619edc07471cdf1f26c4d843b332a00