summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2022-11-21 16:47:52 +0100
committerThorsten Leemhuis <fedora@leemhuis.info>2022-11-21 16:47:52 +0100
commit2452526e102352063d6b899c12b4f9d44d7489f2 (patch)
tree11d5e81bfd708ade5a59f2851bb3365fa2ec037d
parent861a2748ecd6cd0ef7f0363598c1f1147e0d8139 (diff)
parentad901d02452b8afd1ed67d12a7cf048a2c907f20 (diff)
downloadkernel-2452526e102352063d6b899c12b4f9d44d7489f2.tar.gz
kernel-2452526e102352063d6b899c12b4f9d44d7489f2.tar.xz
kernel-2452526e102352063d6b899c12b4f9d44d7489f2.zip
-rw-r--r--Makefile.rhelver2
-rwxr-xr-xkernel.spec15
-rw-r--r--patch-6.1-redhat.patch2
-rw-r--r--sources6
4 files changed, 17 insertions, 8 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver
index 3b8bbb40f..aea44c38e 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 = 43
+RHEL_RELEASE = 46
#
# ZSTREAM
diff --git a/kernel.spec b/kernel.spec
index 13afaab66..085e9e64a 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.rc5.20221118git84368d882b96.43
+%define pkgrelease 0.rc6.46
%define kversion 6
-%define tarfile_release 6.1-rc5-144-g84368d882b96
+%define tarfile_release 6.1-rc6
# This is needed to do merge window version magic
%define patchlevel 1
# This allows pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc5.20221118git84368d882b96.43%{?buildid}%{?dist}
+%define specrelease 0.rc6.46%{?buildid}%{?dist}
# This defines the kabi tarball version
%define kabiversion 6.1.0
@@ -3200,6 +3200,15 @@ fi
#
#
%changelog
+* Mon Nov 21 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.1.0-0.rc6.46]
+- Linux v6.1.0-0.rc6
+
+* Sun Nov 20 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.1.0-0.rc5.77c51ba552a1.45]
+- Linux v6.1.0-0.rc5.77c51ba552a1
+
+* Sat Nov 19 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.1.0-0.rc5.fe24a97cf254.44]
+- Linux v6.1.0-0.rc5.fe24a97cf254
+
* Fri Nov 18 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.1.0-0.rc5.84368d882b96.43]
- redhat/Makefile: Fix RHJOBS grep warning (Prarit Bhargava)
- Linux v6.1.0-0.rc5.84368d882b96
diff --git a/patch-6.1-redhat.patch b/patch-6.1-redhat.patch
index f95672b01..3c0f443be 100644
--- a/patch-6.1-redhat.patch
+++ b/patch-6.1-redhat.patch
@@ -120,7 +120,7 @@ index 000000000000..effb81d04bfd
+
+endmenu
diff --git a/Makefile b/Makefile
-index 58cd4f5e1c3a..c1eddea3caed 100644
+index 6f846b1f2618..3636afba4b1e 100644
--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
diff --git a/sources b/sources
index 173b8f863..8139e73f0 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-6.1-rc5-144-g84368d882b96.tar.xz) = accee273dc3e8ce04efbaa29e2000a31099c5cfacbb85eb977359d804736044ccdfbd1cc2ba5989f79d45daa978a6e8268e264cfd3ec23c066ab2f89e1b8fc3d
-SHA512 (kernel-abi-stablelists-6.1.0.tar.bz2) = 24e123d812a40b0c814c82489d91073746d9526e38ba803916508520e93b3ebfca5b02203f83f51e5927a044bf20f25e0e6fdd7be6306c2a002f4cb98ec39585
-SHA512 (kernel-kabi-dw-6.1.0.tar.bz2) = 30ed51ae48ee303dcf55ab20b3b89f7252c98755a124169b18c6e2d90005a4ec46bbe03793fae325b8f990c058e45dd54f7785ce303f44f096ed5466a187738f
+SHA512 (linux-6.1-rc6.tar.xz) = 61e3b1ed9f0c682fdf28a63d365d956a0e830eb553930a6aa1b40b8116e184e786f3334e7ce83915ef85c0c4a9a1cfa4ae3a6d761348984bdbac8bdbd80f3a38
+SHA512 (kernel-abi-stablelists-6.1.0.tar.bz2) = 737b0885d87a7580f60bd5f77eb70ede89e71406083b6cd0d5323ea1716ac8d61f3be5fe88dbac2191c5d43cce9941321a83cfb98fd3126d876137c907d8a396
+SHA512 (kernel-kabi-dw-6.1.0.tar.bz2) = 323a3c903fe65b4dbd2c4e167ebebdfbd8ec787ef8e370494e19dfe40a3e2fd443b31788a2527d1ef49ab550d44ebcfed87be030741c9ba341470c65099c1848