summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2023-01-14 10:29:30 -0600
committerJustin M. Forbes <jforbes@fedoraproject.org>2023-01-14 10:29:30 -0600
commitdaaaa282a3e102eee95d24a9a418197723624438 (patch)
treee0a3d6e0a2173084e777f02750601e053ea179d1
parent3a289bd0308579c54377b5c9c555a85af3722544 (diff)
downloadkernel-daaaa282a3e102eee95d24a9a418197723624438.tar.gz
kernel-daaaa282a3e102eee95d24a9a418197723624438.tar.xz
kernel-daaaa282a3e102eee95d24a9a418197723624438.zip
kernel-6.1.6-100
* Sat Jan 14 2023 Justin M. Forbes <jforbes@fedoraproject.org> [6.1.6-0] - Linux v6.1.6 Resolves: Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
-rwxr-xr-xkernel.spec9
-rw-r--r--patch-6.1-redhat.patch6
-rw-r--r--sources6
3 files changed, 12 insertions, 9 deletions
diff --git a/kernel.spec b/kernel.spec
index e89b1a92d..31c45654a 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -124,17 +124,17 @@ Summary: The Linux kernel
# the --with-release option overrides this setting.)
%define debugbuildsenabled 1
# define buildid .local
-%define specversion 6.1.5
+%define specversion 6.1.6
%define patchversion 6.1
%define pkgrelease 100
%define kversion 6
-%define tarfile_release 6.1.5
+%define tarfile_release 6.1.6
# This is needed to do merge window version magic
%define patchlevel 1
# This allows pkg_release to have configurable %%{?dist} tag
%define specrelease 100%{?buildid}%{?dist}
# This defines the kabi tarball version
-%define kabiversion 6.1.5
+%define kabiversion 6.1.6
# If this variable is set to 1, a bpf selftests build failure will cause a
# fatal kernel package build error
@@ -3178,6 +3178,9 @@ fi
#
#
%changelog
+* Sat Jan 14 2023 Justin M. Forbes <jforbes@fedoraproject.org> [6.1.6-0]
+- Linux v6.1.6
+
* Thu Jan 12 2023 Justin M. Forbes <jforbes@fedoraproject.org> [6.1.5-0]
- KVM: VMX: Execute IBPB on emulated VM-exit when guest has IBRS (Jim Mattson)
- Update module filters for nvmem_u-boot-env (Justin M. Forbes)
diff --git a/patch-6.1-redhat.patch b/patch-6.1-redhat.patch
index c6e96e774..5909c3222 100644
--- a/patch-6.1-redhat.patch
+++ b/patch-6.1-redhat.patch
@@ -40,7 +40,7 @@
39 files changed, 487 insertions(+), 182 deletions(-)
diff --git a/Makefile b/Makefile
-index ddbd2fc917c5..db90bfc4f3ef 100644
+index 19e8c6dec6e5..37b6bc722a3e 100644
--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@@ -1228,10 +1228,10 @@ index ca1b7109c0db..b947cfbf04c2 100644
#if defined(CONFIG_SECURITY) && defined(CONFIG_WATCH_QUEUE)
diff --git a/init/Kconfig b/init/Kconfig
-index 94125d3b6893..7a6bf4659565 100644
+index 0c214af99085..060e927bddeb 100644
--- a/init/Kconfig
+++ b/init/Kconfig
-@@ -1685,7 +1685,7 @@ config AIO
+@@ -1689,7 +1689,7 @@ config AIO
this option saves about 7k.
config IO_URING
diff --git a/sources b/sources
index ddb6b2df4..774a1a6de 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-6.1.5.tar.xz) = d4fb8559d96800aec0244f379ec9922f7e4adc746354664d140786584ebf34f9f18369ab04ade3435dcfb2ae61e82ece878d2721e4e4142d4c4d3b5140527db2
-SHA512 (kernel-abi-stablelists-6.1.5.tar.bz2) = 10fab3ad475055a0e3f98ccf6272d2626952952a86e56e6239743cd692ea340953afd188073d4cdfe65b064a1b638856003bd02f726f17f284b454ff15bc930e
-SHA512 (kernel-kabi-dw-6.1.5.tar.bz2) = 607a4d4b83ae5a89664c018fcfb150e588e9c0d33844f25ef5e4fa40ba4ce0b31a5eaf43ccdb67a10d463c3aca9ea746feb5c7a3a3942f855aea2f93bc6cc886
+SHA512 (linux-6.1.6.tar.xz) = d57d0a1094dddf90d2837a968339918701010bffa49d0bd4b0b9a3d1d443595e0c65ca2920028dac8374c85ca8ebbb60c89032136b2e3bb8aa8ee7f237368cb8
+SHA512 (kernel-abi-stablelists-6.1.6.tar.bz2) = 3fc66636fec065f138fcb8791d18020a1048e3df0b487a47f31c446befbcfb06a2e4b74ae31e324a989c646557620da940252e085937674554c1382abf6f141f
+SHA512 (kernel-kabi-dw-6.1.6.tar.bz2) = da0da940da6f08374a8c7a9b51a48b5d45279b0d5a04d2abc9072798f653f4ecd6e887b99b96e073741e075bb61fa2e2e6cb291a028ac464b3795e5801317c0e