summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile.rhelver2
-rw-r--r--Patchlist.changelog4
-rwxr-xr-xkernel.spec12
-rw-r--r--patch-6.2-redhat.patch2
-rw-r--r--sources6
5 files changed, 15 insertions, 11 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver
index 3e1b29e09..e9612fa4c 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 = 11
+RHEL_RELEASE = 12
#
# ZSTREAM
diff --git a/Patchlist.changelog b/Patchlist.changelog
index b8441932e..892c81598 100644
--- a/Patchlist.changelog
+++ b/Patchlist.changelog
@@ -1,5 +1,5 @@
-"https://gitlab.com/cki-project/kernel-ark/-/commit"/cf11ba28840339cd1d829360ea13accb0ee6a0c0
- cf11ba28840339cd1d829360ea13accb0ee6a0c0 Revert "arm64: remove special treatment for the link order of head.o"
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/cc27ad60a7f69338737d114384a5d39b0c731ef0
+ cc27ad60a7f69338737d114384a5d39b0c731ef0 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 39a06d6cc..9d0e3cf33 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -126,13 +126,13 @@ Summary: The Linux kernel
# define buildid .local
%define specversion 6.2.0
%define patchversion 6.2
-%define pkgrelease 0.rc0.20221222git9d2f6060fe4c.11
+%define pkgrelease 0.rc0.20221223git8395ae05cb5a.12
%define kversion 6
-%define tarfile_release 6.1-14364-g9d2f6060fe4c
+%define tarfile_release 6.1-14446-g8395ae05cb5a
# This is needed to do merge window version magic
%define patchlevel 2
# This allows pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc0.20221222git9d2f6060fe4c.11%{?buildid}%{?dist}
+%define specrelease 0.rc0.20221223git8395ae05cb5a.12%{?buildid}%{?dist}
# This defines the kabi tarball version
%define kabiversion 6.2.0
@@ -3179,9 +3179,13 @@ fi
#
#
%changelog
-* Thu Dec 22 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.2.0-0.rc0.9d2f6060fe4c.11]
+* Fri Dec 23 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.2.0-0.rc0.8395ae05cb5a.12]
+- 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)
+* Fri Dec 23 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.2.0-0.rc0.8395ae05cb5a.11]
+- Linux v6.2.0-0.rc0.8395ae05cb5a
+
* Thu Dec 22 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.2.0-0.rc0.9d2f6060fe4c.10]
- spec: add missing BuildRequires: python3-docutils for tools (Ondrej Mosnacek)
- Linux v6.2.0-0.rc0.9d2f6060fe4c
diff --git a/patch-6.2-redhat.patch b/patch-6.2-redhat.patch
index 464311238..bf29c9896 100644
--- a/patch-6.2-redhat.patch
+++ b/patch-6.2-redhat.patch
@@ -1229,7 +1229,7 @@ index ee4da9ab8013..d395d11eadc4 100644
if (ret < 0)
goto err_allowedips;
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
-index f72fc3bd07c3..d14838f24adb 100644
+index 95c488ea91c3..fad3f16d463f 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -250,6 +250,9 @@ static void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl)
diff --git a/sources b/sources
index be69e950e..7f46c835d 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-6.1-14364-g9d2f6060fe4c.tar.xz) = 54747da1c949822dfdaffc1f7bd212998a399b6372eaad5d47a821e6651dc38861a4d6e3e8acbee714bbb28998c11f1eaface92e17ff359eaa996a0576c1c859
-SHA512 (kernel-abi-stablelists-6.2.0.tar.bz2) = e0521160b1f2bdcefc6d38e9d8bbbcbb24de456b5055f0b424f50a3e878e0ce60ec43ddb2c70cf5ac8a1e91fb5547f978895e40eddd04dde263d309d075a81d2
-SHA512 (kernel-kabi-dw-6.2.0.tar.bz2) = 8813cae90e4e11adc64a3b59c378995577e4c093bad6533c3c86a264a344c6712ccd6238c9784b006a183180f4f48161cdc369c475bebae564f79c271d30296e
+SHA512 (linux-6.1-14446-g8395ae05cb5a.tar.xz) = def0bd4846b8497fb658ac50947fb70119f51bdf8faca4d100c4c9d9b98f3606ff74d68e19a0f896e9a4da82fbbaa4fd205052df49e2bbe8bb68bd07580a2361
+SHA512 (kernel-abi-stablelists-6.2.0.tar.bz2) = 6820d00b569536703a4ea278ab7cb4a11f4789ba51450a176f189fa8ba87d96bcfd365a5d696e580047d2ab90b2c17cd945b7dbe9d73f9cca571a2374710e3ba
+SHA512 (kernel-kabi-dw-6.2.0.tar.bz2) = bd8f7b9df57e6559c20395187cb138c4b867a8e48484838269ecce7e35c3e63c9325f9f3fe6d3e2284e0dbb7ec05e6ba9e8465ddc6dfee3504f82e7d1e7aad9b