summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2022-10-13 10:16:31 -0500
committerJustin M. Forbes <jforbes@fedoraproject.org>2022-10-13 10:16:31 -0500
commit700cee81d0577b9bf840b1292d228a95950182bd (patch)
tree4a5820e228b7825b63b6a0070895a3043755daa6
parent17aaf82b07cf9c827b0df4955c0a9352a65f1fab (diff)
downloadkernel-700cee81d0577b9bf840b1292d228a95950182bd.tar.gz
kernel-700cee81d0577b9bf840b1292d228a95950182bd.tar.xz
kernel-700cee81d0577b9bf840b1292d228a95950182bd.zip
kernel-6.1.0-0.rc0.20221013gita185a0995518.11
* Thu Oct 13 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.1.0-0.rc0.a185a0995518.11] - Add kasan_test to mod-internal.list (Justin M. Forbes) Resolves: Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
Diffstat
-rw-r--r--Makefile.rhelver2
-rw-r--r--kernel-aarch64-debug-fedora.config2
-rw-r--r--kernel-aarch64-fedora.config2
-rw-r--r--kernel-armv7hl-debug-fedora.config2
-rw-r--r--kernel-armv7hl-fedora.config2
-rw-r--r--kernel-armv7hl-lpae-debug-fedora.config2
-rw-r--r--kernel-armv7hl-lpae-fedora.config2
-rw-r--r--kernel-ppc64le-debug-fedora.config2
-rw-r--r--kernel-ppc64le-fedora.config2
-rw-r--r--kernel-s390x-debug-fedora.config2
-rw-r--r--kernel-s390x-fedora.config2
-rw-r--r--kernel-x86_64-debug-fedora.config2
-rw-r--r--kernel-x86_64-fedora.config2
-rwxr-xr-xkernel.spec11
-rw-r--r--patch-6.1-redhat.patch6
-rw-r--r--sources6
16 files changed, 38 insertions, 11 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver
index a68e6b9df..3e1b29e09 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 = 10
+RHEL_RELEASE = 11
#
# ZSTREAM
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index cb6bc1546..09d99b53f 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -3045,6 +3045,7 @@ CONFIG_IMX_GPCV2=y
# CONFIG_IMX_IPUV3_CORE is not set
CONFIG_IMX_IRQSTEER=y
CONFIG_IMX_MBOX=m
+CONFIG_IMX_MU_MSI=m
CONFIG_IMX_REMOTEPROC=m
CONFIG_IMX_SC_THERMAL=m
CONFIG_IMX_SCU_PD=y
@@ -9041,6 +9042,7 @@ CONFIG_XEN_MEMORY_HOTPLUG_LIMIT=512
CONFIG_XEN_PRIVCMD=m
# CONFIG_XEN_PVCALLS_FRONTEND is not set
CONFIG_XEN_PVHVM_GUEST=y
+CONFIG_XEN_PV_MSR_SAFE=y
CONFIG_XEN_UNPOPULATED_ALLOC=y
# CONFIG_XEN_VIRTIO_FORCE_GRANT is not set
CONFIG_XEN_VIRTIO=y
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index 683649e82..6a62bdd7f 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -3029,6 +3029,7 @@ CONFIG_IMX_GPCV2=y
# CONFIG_IMX_IPUV3_CORE is not set
CONFIG_IMX_IRQSTEER=y
CONFIG_IMX_MBOX=m
+CONFIG_IMX_MU_MSI=m
CONFIG_IMX_REMOTEPROC=m
CONFIG_IMX_SC_THERMAL=m
CONFIG_IMX_SCU_PD=y
@@ -9018,6 +9019,7 @@ CONFIG_XEN_MEMORY_HOTPLUG_LIMIT=512
CONFIG_XEN_PRIVCMD=m
# CONFIG_XEN_PVCALLS_FRONTEND is not set
CONFIG_XEN_PVHVM_GUEST=y
+CONFIG_XEN_PV_MSR_SAFE=y
CONFIG_XEN_UNPOPULATED_ALLOC=y
# CONFIG_XEN_VIRTIO_FORCE_GRANT is not set
CONFIG_XEN_VIRTIO=y
diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config
index 8f7281948..e73a88810 100644
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@@ -3020,6 +3020,7 @@ CONFIG_IMX_GPCV2=y
CONFIG_IMX_IPUV3_CORE=m
CONFIG_IMX_IRQSTEER=y
CONFIG_IMX_MBOX=m
+CONFIG_IMX_MU_MSI=m
CONFIG_IMX_REMOTEPROC=m
# CONFIG_IMX_SCU is not set
CONFIG_IMX_SC_WDT=m
@@ -9155,6 +9156,7 @@ CONFIG_XEN_MEMORY_HOTPLUG_LIMIT=512
CONFIG_XEN_PRIVCMD=m
# CONFIG_XEN_PVCALLS_FRONTEND is not set
CONFIG_XEN_PVHVM_GUEST=y
+CONFIG_XEN_PV_MSR_SAFE=y
CONFIG_XEN_UNPOPULATED_ALLOC=y
# CONFIG_XEN_VIRTIO_FORCE_GRANT is not set
CONFIG_XEN_VIRTIO=y
diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config
index 222c3c5f4..3e4f627d3 100644
--- a/kernel-armv7hl-fedora.config
+++ b/kernel-armv7hl-fedora.config
@@ -3005,6 +3005,7 @@ CONFIG_IMX_GPCV2=y
CONFIG_IMX_IPUV3_CORE=m
CONFIG_IMX_IRQSTEER=y
CONFIG_IMX_MBOX=m
+CONFIG_IMX_MU_MSI=m
CONFIG_IMX_REMOTEPROC=m
# CONFIG_IMX_SCU is not set
CONFIG_IMX_SC_WDT=m
@@ -9134,6 +9135,7 @@ CONFIG_XEN_MEMORY_HOTPLUG_LIMIT=512
CONFIG_XEN_PRIVCMD=m
# CONFIG_XEN_PVCALLS_FRONTEND is not set
CONFIG_XEN_PVHVM_GUEST=y
+CONFIG_XEN_PV_MSR_SAFE=y
CONFIG_XEN_UNPOPULATED_ALLOC=y
# CONFIG_XEN_VIRTIO_FORCE_GRANT is not set
CONFIG_XEN_VIRTIO=y
diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config
index 76616d6e4..7da6b1885 100644
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@@ -2965,6 +2965,7 @@ CONFIG_IMX_GPCV2=y
# CONFIG_IMX_IPUV3_CORE is not set
CONFIG_IMX_IRQSTEER=y
CONFIG_IMX_MBOX=m
+CONFIG_IMX_MU_MSI=m
CONFIG_IMX_REMOTEPROC=m
# CONFIG_IMX_SCU is not set
CONFIG_IMX_SC_WDT=m
@@ -8901,6 +8902,7 @@ CONFIG_XEN_MEMORY_HOTPLUG_LIMIT=512
CONFIG_XEN_PRIVCMD=m
# CONFIG_XEN_PVCALLS_FRONTEND is not set
CONFIG_XEN_PVHVM_GUEST=y
+CONFIG_XEN_PV_MSR_SAFE=y
CONFIG_XEN_UNPOPULATED_ALLOC=y
# CONFIG_XEN_VIRTIO_FORCE_GRANT is not set
CONFIG_XEN_VIRTIO=y
diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config
index 955f1db8e..97b8063a3 100644
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@@ -2950,6 +2950,7 @@ CONFIG_IMX_GPCV2=y
# CONFIG_IMX_IPUV3_CORE is not set
CONFIG_IMX_IRQSTEER=y
CONFIG_IMX_MBOX=m
+CONFIG_IMX_MU_MSI=m
CONFIG_IMX_REMOTEPROC=m
# CONFIG_IMX_SCU is not set
CONFIG_IMX_SC_WDT=m
@@ -8880,6 +8881,7 @@ CONFIG_XEN_MEMORY_HOTPLUG_LIMIT=512
CONFIG_XEN_PRIVCMD=m
# CONFIG_XEN_PVCALLS_FRONTEND is not set
CONFIG_XEN_PVHVM_GUEST=y
+CONFIG_XEN_PV_MSR_SAFE=y
CONFIG_XEN_UNPOPULATED_ALLOC=y
# CONFIG_XEN_VIRTIO_FORCE_GRANT is not set
CONFIG_XEN_VIRTIO=y
diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config
index 9a9dc9341..43e80e7b8 100644
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@@ -2457,6 +2457,7 @@ CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT=y
CONFIG_IMA_WRITE_POLICY=y
CONFIG_IMA=y
# CONFIG_IMG_ASCII_LCD is not set
+CONFIG_IMX_MU_MSI=m
# CONFIG_INA2XX_ADC is not set
CONFIG_INET6_AH=m
CONFIG_INET6_ESPINTCP=y
@@ -7647,6 +7648,7 @@ CONFIG_XEN_MEMORY_HOTPLUG_LIMIT=512
CONFIG_XEN_PRIVCMD=m
# CONFIG_XEN_PVCALLS_FRONTEND is not set
CONFIG_XEN_PVHVM_GUEST=y
+CONFIG_XEN_PV_MSR_SAFE=y
CONFIG_XEN_UNPOPULATED_ALLOC=y
# CONFIG_XEN_VIRTIO_FORCE_GRANT is not set
CONFIG_XEN_VIRTIO=y
diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config
index 3c31df6db..8e7d237cd 100644
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
@@ -2440,6 +2440,7 @@ CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT=y
CONFIG_IMA_WRITE_POLICY=y
CONFIG_IMA=y
# CONFIG_IMG_ASCII_LCD is not set
+CONFIG_IMX_MU_MSI=m
# CONFIG_INA2XX_ADC is not set
CONFIG_INET6_AH=m
CONFIG_INET6_ESPINTCP=y
@@ -7624,6 +7625,7 @@ CONFIG_XEN_MEMORY_HOTPLUG_LIMIT=512
CONFIG_XEN_PRIVCMD=m
# CONFIG_XEN_PVCALLS_FRONTEND is not set
CONFIG_XEN_PVHVM_GUEST=y
+CONFIG_XEN_PV_MSR_SAFE=y
CONFIG_XEN_UNPOPULATED_ALLOC=y
# CONFIG_XEN_VIRTIO_FORCE_GRANT is not set
CONFIG_XEN_VIRTIO=y
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config
index 09c171061..3c324b468 100644
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@@ -2434,6 +2434,7 @@ CONFIG_IMA_READ_POLICY=y
CONFIG_IMA_WRITE_POLICY=y
CONFIG_IMA=y
# CONFIG_IMG_ASCII_LCD is not set
+CONFIG_IMX_MU_MSI=m
# CONFIG_INA2XX_ADC is not set
CONFIG_INET6_AH=m
CONFIG_INET6_ESPINTCP=y
@@ -7602,6 +7603,7 @@ CONFIG_XEN_MEMORY_HOTPLUG_LIMIT=512
CONFIG_XEN_PRIVCMD=m
# CONFIG_XEN_PVCALLS_FRONTEND is not set
CONFIG_XEN_PVHVM_GUEST=y
+CONFIG_XEN_PV_MSR_SAFE=y
CONFIG_XEN_UNPOPULATED_ALLOC=y
# CONFIG_XEN_VIRTIO_FORCE_GRANT is not set
CONFIG_XEN_VIRTIO=y
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config
index 7ad3f2967..e7ccac788 100644
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@@ -2417,6 +2417,7 @@ CONFIG_IMA_READ_POLICY=y
CONFIG_IMA_WRITE_POLICY=y
CONFIG_IMA=y
# CONFIG_IMG_ASCII_LCD is not set
+CONFIG_IMX_MU_MSI=m
# CONFIG_INA2XX_ADC is not set
CONFIG_INET6_AH=m
CONFIG_INET6_ESPINTCP=y
@@ -7579,6 +7580,7 @@ CONFIG_XEN_MEMORY_HOTPLUG_LIMIT=512
CONFIG_XEN_PRIVCMD=m
# CONFIG_XEN_PVCALLS_FRONTEND is not set
CONFIG_XEN_PVHVM_GUEST=y
+CONFIG_XEN_PV_MSR_SAFE=y
CONFIG_XEN_UNPOPULATED_ALLOC=y
# CONFIG_XEN_VIRTIO_FORCE_GRANT is not set
CONFIG_XEN_VIRTIO=y
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index ec780caa2..838b1cb85 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -2655,6 +2655,7 @@ CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT=y
CONFIG_IMA_WRITE_POLICY=y
CONFIG_IMA=y
# CONFIG_IMG_ASCII_LCD is not set
+CONFIG_IMX_MU_MSI=m
# CONFIG_INA2XX_ADC is not set
CONFIG_INET6_AH=m
CONFIG_INET6_ESPINTCP=y
@@ -8159,6 +8160,7 @@ CONFIG_XEN_PRIVCMD=m
CONFIG_XEN_PVHVM_GUEST=y
CONFIG_XEN_PVHVM=y
CONFIG_XEN_PVH=y
+CONFIG_XEN_PV_MSR_SAFE=y
CONFIG_XEN_PV=y
CONFIG_XEN_SAVE_RESTORE=y
CONFIG_XEN_SCRUB_PAGES_DEFAULT=y
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index f0fee266d..24280aca9 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -2638,6 +2638,7 @@ CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT=y
CONFIG_IMA_WRITE_POLICY=y
CONFIG_IMA=y
# CONFIG_IMG_ASCII_LCD is not set
+CONFIG_IMX_MU_MSI=m
# CONFIG_INA2XX_ADC is not set
CONFIG_INET6_AH=m
CONFIG_INET6_ESPINTCP=y
@@ -8137,6 +8138,7 @@ CONFIG_XEN_PRIVCMD=m
CONFIG_XEN_PVHVM_GUEST=y
CONFIG_XEN_PVHVM=y
CONFIG_XEN_PVH=y
+CONFIG_XEN_PV_MSR_SAFE=y
CONFIG_XEN_PV=y
CONFIG_XEN_SAVE_RESTORE=y
CONFIG_XEN_SCRUB_PAGES_DEFAULT=y
diff --git a/kernel.spec b/kernel.spec
index d044c24da..b038270bd 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -124,13 +124,13 @@ Summary: The Linux kernel
# define buildid .local
%define specversion 6.1.0
%define patchversion 6.1
-%define pkgrelease 0.rc0.20221012git49da07006239.10
+%define pkgrelease 0.rc0.20221013gita185a0995518.11
%define kversion 6
-%define tarfile_release 6.0-11414-g49da07006239
+%define tarfile_release 6.0-11658-ga185a0995518
# This is needed to do merge window version magic
%define patchlevel 1
# This allows pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc0.20221012git49da07006239.10%{?buildid}%{?dist}
+%define specrelease 0.rc0.20221013gita185a0995518.11%{?buildid}%{?dist}
# This defines the kabi tarball version
%define kabiversion 6.1.0
@@ -3185,9 +3185,12 @@ fi
#
#
%changelog
-* Wed Oct 12 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.1.0-0.rc0.49da07006239.10]
+* Thu Oct 13 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.1.0-0.rc0.a185a0995518.11]
- Add kasan_test to mod-internal.list (Justin M. Forbes)
+* Thu Oct 13 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.1.0-0.rc0.a185a0995518.10]
+- Linux v6.1.0-0.rc0.a185a0995518
+
* Wed Oct 12 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.1.0-0.rc0.49da07006239.9]
- Rename rename FORCE_MAX_ZONEORDER to ARCH_FORCE_MAX_ORDER in pending (Justin M. Forbes)
- Linux v6.1.0-0.rc0.49da07006239
diff --git a/patch-6.1-redhat.patch b/patch-6.1-redhat.patch
index b1dc799ee..41dc29584 100644
--- a/patch-6.1-redhat.patch
+++ b/patch-6.1-redhat.patch
@@ -67,7 +67,7 @@
66 files changed, 1540 insertions(+), 187 deletions(-)
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
-index 69b1533c1f02..801101203295 100644
+index a465d5242774..191876dd4731 100644
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -6421,6 +6421,15 @@
@@ -2531,10 +2531,10 @@ index ca1b7109c0db..b947cfbf04c2 100644
#if defined(CONFIG_SECURITY) && defined(CONFIG_WATCH_QUEUE)
diff --git a/init/Kconfig b/init/Kconfig
-index d6c4302b1c08..7af2992141cf 100644
+index 694f7c160c9c..9bcc8ce2e79a 100644
--- a/init/Kconfig
+++ b/init/Kconfig
-@@ -1684,7 +1684,7 @@ config AIO
+@@ -1685,7 +1685,7 @@ config AIO
this option saves about 7k.
config IO_URING
diff --git a/sources b/sources
index 9ab73afea..dbedd9917 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-6.0-11414-g49da07006239.tar.xz) = 0f5991b3866a89f5748bef78666a950dc657f4b5ac4df43c66639b98a322b367e9aa02bfd16f49834ec625d86269f9d6c71252cc7eb312a97901147251ec74a1
-SHA512 (kernel-abi-stablelists-6.1.0.tar.bz2) = 888d313983d37fc632c8400c3baded5ca0a99ceb5552836108e70fc38652887f2ad0f46d75cb29dc489e44c708fae704c4bca8133eb755bb73afecede4b20c35
-SHA512 (kernel-kabi-dw-6.1.0.tar.bz2) = 1216b13a22eb8226e7949c7be1304240e4dbdb1dc11f2ac6d040412c7cd967c6f8f6c54b8f3d3f772a9ccf997753824285821f9cf2da9da12a6887ec2ae32a67
+SHA512 (linux-6.0-11658-ga185a0995518.tar.xz) = e197e1259b7f866733b2ca10e81ff4b5e6f4657ef39befb37db0ed31ccfcf2fc783fce31d548c5b3240202fc5120af8916ca3d12b0dd6ffba55a66d89333acf0
+SHA512 (kernel-abi-stablelists-6.1.0.tar.bz2) = d7c585e04e7144a8cb64b6a3b1ec65af205c7755decb34866a8a7d9cb719d5f9bc0d96efab3e59f7e0060b4552a867c7847154a65230e25282af572b6bd10b78
+SHA512 (kernel-kabi-dw-6.1.0.tar.bz2) = 3f400fd776efdd53e342db7adc0fabd2b747bf4c4d471796999974496670efabb87f9d91442745264369c169c17dabfa9a3c31da9de1611c27b0da1e5a6f6443
generated by cgit (git 2.34.1) at 2024-04-25 17:32:56 +0000