summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2022-11-28 09:11:51 -0600
committerJustin M. Forbes <jforbes@fedoraproject.org>2022-11-28 09:11:51 -0600
commit170bdb7b83ba24ac22d75cf38606bdc98d088cc4 (patch)
tree9d412047b22a01710627dc14294c0c243a2846f3
parentad901d02452b8afd1ed67d12a7cf048a2c907f20 (diff)
downloadkernel-170bdb7b83ba24ac22d75cf38606bdc98d088cc4.tar.gz
kernel-170bdb7b83ba24ac22d75cf38606bdc98d088cc4.tar.xz
kernel-170bdb7b83ba24ac22d75cf38606bdc98d088cc4.zip
kernel-6.1.0-0.rc7.51
* Mon Nov 21 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.1.0-0.rc6.46] - Linux v6.1.0-0.rc6 Resolves: Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
-rw-r--r--Makefile.rhelver2
-rw-r--r--kernel-aarch64-debug-rhel.config6
-rw-r--r--kernel-aarch64-rhel.config6
-rw-r--r--kernel-s390x-debug-rhel.config2
-rw-r--r--kernel-s390x-rhel.config2
-rw-r--r--kernel-s390x-zfcpdump-rhel.config2
-rwxr-xr-xkernel.spec6
-rw-r--r--patch-6.1-redhat.patch6
-rw-r--r--sources6
9 files changed, 23 insertions, 15 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver
index aea44c38e..72df93ba9 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 = 46
+RHEL_RELEASE = 51
#
# ZSTREAM
diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config
index 5a03424c9..ed90aa699 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -765,6 +765,7 @@ CONFIG_CB710_CORE=m
CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
# CONFIG_CCS811 is not set
+# CONFIG_CDNS_I3C_MASTER is not set
CONFIG_CDROM_PKTCDVD_BUFFERS=8
CONFIG_CDROM_PKTCDVD=m
# CONFIG_CDROM_PKTCDVD_WCACHE is not set
@@ -1611,6 +1612,7 @@ CONFIG_DW_DMAC=m
CONFIG_DW_DMAC_PCI=m
# CONFIG_DW_EDMA is not set
# CONFIG_DW_EDMA_PCIE is not set
+# CONFIG_DW_I3C_MASTER is not set
CONFIG_DWMAC_DWC_QOS_ETH=m
# CONFIG_DWMAC_GENERIC is not set
# CONFIG_DWMAC_INTEL_PLAT is not set
@@ -2304,7 +2306,7 @@ CONFIG_I2C_XGENE_SLIMPRO=m
# CONFIG_I2C_XILINX is not set
CONFIG_I2C_XLP9XX=m
CONFIG_I2C=y
-# CONFIG_I3C is not set
+CONFIG_I3C=m
# CONFIG_I40E_DCB is not set
CONFIG_I40E=m
CONFIG_I40EVF=m
@@ -3330,6 +3332,7 @@ CONFIG_MIGRATION=y
CONFIG_MII=m
# CONFIG_MINIX_FS is not set
# CONFIG_MINIX_SUBPARTITION is not set
+# CONFIG_MIPI_I3C_HCI is not set
# CONFIG_MISC_ALCOR_PCI is not set
CONFIG_MISC_FILESYSTEMS=y
# CONFIG_MISC_RTSX_PCI is not set
@@ -6179,6 +6182,7 @@ CONFIG_SUNRPC_XPRT_RDMA=m
# CONFIG_SURFACE_PLATFORMS is not set
# CONFIG_SURFACE_PRO3_BUTTON is not set
CONFIG_SUSPEND=y
+CONFIG_SVC_I3C_MASTER=m
CONFIG_SWAP=y
# CONFIG_SW_SYNC is not set
# CONFIG_SX9310 is not set
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config
index 3c8a7af8b..8b3d6306b 100644
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@@ -765,6 +765,7 @@ CONFIG_CB710_CORE=m
CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
# CONFIG_CCS811 is not set
+# CONFIG_CDNS_I3C_MASTER is not set
CONFIG_CDROM_PKTCDVD_BUFFERS=8
CONFIG_CDROM_PKTCDVD=m
# CONFIG_CDROM_PKTCDVD_WCACHE is not set
@@ -1603,6 +1604,7 @@ CONFIG_DW_DMAC=m
CONFIG_DW_DMAC_PCI=m
# CONFIG_DW_EDMA is not set
# CONFIG_DW_EDMA_PCIE is not set
+# CONFIG_DW_I3C_MASTER is not set
CONFIG_DWMAC_DWC_QOS_ETH=m
# CONFIG_DWMAC_GENERIC is not set
# CONFIG_DWMAC_INTEL_PLAT is not set
@@ -2288,7 +2290,7 @@ CONFIG_I2C_XGENE_SLIMPRO=m
# CONFIG_I2C_XILINX is not set
CONFIG_I2C_XLP9XX=m
CONFIG_I2C=y
-# CONFIG_I3C is not set
+CONFIG_I3C=m
# CONFIG_I40E_DCB is not set
CONFIG_I40E=m
CONFIG_I40EVF=m
@@ -3309,6 +3311,7 @@ CONFIG_MIGRATION=y
CONFIG_MII=m
# CONFIG_MINIX_FS is not set
# CONFIG_MINIX_SUBPARTITION is not set
+# CONFIG_MIPI_I3C_HCI is not set
# CONFIG_MISC_ALCOR_PCI is not set
CONFIG_MISC_FILESYSTEMS=y
# CONFIG_MISC_RTSX_PCI is not set
@@ -6154,6 +6157,7 @@ CONFIG_SUNRPC_XPRT_RDMA=m
# CONFIG_SURFACE_PLATFORMS is not set
# CONFIG_SURFACE_PRO3_BUTTON is not set
CONFIG_SUSPEND=y
+CONFIG_SVC_I3C_MASTER=m
CONFIG_SWAP=y
# CONFIG_SW_SYNC is not set
# CONFIG_SX9310 is not set
diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config
index 713b8f1c9..9f69c7e8c 100644
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@@ -6016,7 +6016,7 @@ CONFIG_TEST_HMM=m
# CONFIG_TEST_KMOD is not set
CONFIG_TEST_KSTRTOX=y
CONFIG_TEST_LIST_SORT=m
-# CONFIG_TEST_LIVEPATCH is not set
+CONFIG_TEST_LIVEPATCH=m
# CONFIG_TEST_LKM is not set
# CONFIG_TEST_LOCKUP is not set
# CONFIG_TEST_MAPLE_TREE is not set
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config
index add4d207a..26ffce6ed 100644
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@@ -5993,7 +5993,7 @@ CONFIG_TEST_HMM=m
# CONFIG_TEST_KMOD is not set
CONFIG_TEST_KSTRTOX=y
# CONFIG_TEST_LIST_SORT is not set
-# CONFIG_TEST_LIVEPATCH is not set
+CONFIG_TEST_LIVEPATCH=m
# CONFIG_TEST_LKM is not set
# CONFIG_TEST_LOCKUP is not set
# CONFIG_TEST_MAPLE_TREE is not set
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config
index 9889328c1..24320a4fb 100644
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
@@ -6018,7 +6018,7 @@ CONFIG_TEST_HMM=m
# CONFIG_TEST_KMOD is not set
CONFIG_TEST_KSTRTOX=y
# CONFIG_TEST_LIST_SORT is not set
-# CONFIG_TEST_LIVEPATCH is not set
+CONFIG_TEST_LIVEPATCH=m
# CONFIG_TEST_LKM is not set
# CONFIG_TEST_LOCKUP is not set
# CONFIG_TEST_MAPLE_TREE is not set
diff --git a/kernel.spec b/kernel.spec
index 8e3576cd0..4d5879488 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -123,13 +123,13 @@ Summary: The Linux kernel
# define buildid .local
%define specversion 6.1.0
%define patchversion 6.1
-%define pkgrelease 0.rc6.46
+%define pkgrelease 0.rc7.51
%define kversion 6
-%define tarfile_release 6.1-rc6
+%define tarfile_release 6.1-rc7
# This is needed to do merge window version magic
%define patchlevel 1
# This allows pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc6.46%{?buildid}%{?dist}
+%define specrelease 0.rc7.51%{?buildid}%{?dist}
# This defines the kabi tarball version
%define kabiversion 6.1.0
diff --git a/patch-6.1-redhat.patch b/patch-6.1-redhat.patch
index 3c0f443be..6c3706390 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 a465d5242774..191876dd4731 100644
+index 42af9ca0127e..f477c32fc478 100644
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -6421,6 +6421,15 @@
@@ -120,7 +120,7 @@ index 000000000000..effb81d04bfd
+
+endmenu
diff --git a/Makefile b/Makefile
-index 6f846b1f2618..3636afba4b1e 100644
+index 78525ebea876..767d35dc1f5d 100644
--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@@ -2531,7 +2531,7 @@ index ca1b7109c0db..b947cfbf04c2 100644
#if defined(CONFIG_SECURITY) && defined(CONFIG_WATCH_QUEUE)
diff --git a/init/Kconfig b/init/Kconfig
-index abf65098f1b6..533c8e3a633b 100644
+index 94125d3b6893..7a6bf4659565 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1685,7 +1685,7 @@ config AIO
diff --git a/sources b/sources
index 8139e73f0..a0e75715a 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-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
+SHA512 (linux-6.1-rc7.tar.xz) = 281e9720a4f22ea562e0cc6698f205b1169318c300a5afef6aba5788969aa03afc10829f4c96a637ede989f66a8373d2a7f8b160e4efc8af14ab171c79441806
+SHA512 (kernel-abi-stablelists-6.1.0.tar.bz2) = cf2e85cc289d70a819f9f5a65a908dd0e18b4bacfc08f7d35694ebceeda9889402e5132e8bdb3f5485c61b1600d0d30ef3f6504ae098357cc5c6f0cbe6f657cd
+SHA512 (kernel-kabi-dw-6.1.0.tar.bz2) = 7385ef9fae7baaaf55906e857fa856a994a5bacd0e4fd19aeddabaf040106d186e4148452bdf981daad4b3e1320eb436be7e58e75b196c4b0f86261150695ef9