summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2022-11-07 08:46:49 -0600
committerJustin M. Forbes <jforbes@fedoraproject.org>2022-11-07 08:46:49 -0600
commit875a9e495b6f518ab1352d5c3f0461b122e6188f (patch)
tree121b7e0715c9048f412379e0ad0c136d7c7ec42e
parentba216fb35f4880c67341f167132e41f755091ceb (diff)
downloadkernel-875a9e495b6f518ab1352d5c3f0461b122e6188f.tar.gz
kernel-875a9e495b6f518ab1352d5c3f0461b122e6188f.tar.xz
kernel-875a9e495b6f518ab1352d5c3f0461b122e6188f.zip
kernel-6.1.0-0.rc4.34
* Mon Nov 07 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.1.0-0.rc4.34] - redhat/configs: move CONFIG_ACPI_VIDEO to common/generic (Mark Langsdorf) - enable imx8xm I2C configs properly (Al Stone) - Linux v6.1.0-0.rc4 Resolves: Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
-rw-r--r--Makefile.rhelver2
-rw-r--r--kernel-aarch64-debug-fedora.config4
-rw-r--r--kernel-aarch64-debug-rhel.config6
-rw-r--r--kernel-aarch64-fedora.config4
-rw-r--r--kernel-aarch64-rhel.config6
-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.config4
-rw-r--r--kernel-ppc64le-debug-rhel.config2
-rw-r--r--kernel-ppc64le-fedora.config4
-rw-r--r--kernel-ppc64le-rhel.config2
-rw-r--r--kernel-s390x-debug-fedora.config4
-rw-r--r--kernel-s390x-debug-rhel.config2
-rw-r--r--kernel-s390x-fedora.config4
-rw-r--r--kernel-s390x-rhel.config2
-rw-r--r--kernel-s390x-zfcpdump-rhel.config2
-rw-r--r--kernel-x86_64-debug-fedora.config4
-rw-r--r--kernel-x86_64-debug-rhel.config2
-rw-r--r--kernel-x86_64-fedora.config4
-rw-r--r--kernel-x86_64-rhel.config2
-rwxr-xr-xkernel.spec26
-rw-r--r--patch-6.1-redhat.patch6
-rw-r--r--sources6
25 files changed, 63 insertions, 43 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver
index e075f183c..ccca41829 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 = 29
+RHEL_RELEASE = 34
#
# ZSTREAM
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index 11edc9819..5cd5a16dc 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -316,7 +316,7 @@ CONFIG_ARCH_MVEBU=y
CONFIG_ARCH_MXC=y
# CONFIG_ARCH_NPCM is not set
CONFIG_ARCH_NR_GPIO=2048
-# CONFIG_ARCH_NXP is not set
+CONFIG_ARCH_NXP=y
# CONFIG_ARCH_OMAP1 is not set
# CONFIG_ARCH_PXA is not set
CONFIG_ARCH_QCOM=y
@@ -6245,7 +6245,7 @@ CONFIG_RTC_DRV_RV3028=m
CONFIG_RTC_DRV_RV3029C2=m
CONFIG_RTC_DRV_RV3029_HWMON=y
CONFIG_RTC_DRV_RV3032=m
-# CONFIG_RTC_DRV_RV8803 is not set
+CONFIG_RTC_DRV_RV8803=m
CONFIG_RTC_DRV_RX4581=m
# CONFIG_RTC_DRV_RX6110 is not set
CONFIG_RTC_DRV_RX8010=m
diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config
index 27c6cff00..b0be812ed 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -2252,6 +2252,8 @@ CONFIG_I2C_HID_OF=m
# CONFIG_I2C_HISI is not set
# CONFIG_I2C_HIX5HD2 is not set
# CONFIG_I2C_I801 is not set
+CONFIG_I2C_IMX_LPI2C=m
+CONFIG_I2C_IMX=m
# CONFIG_I2C_ISCH is not set
CONFIG_I2C_MLXBF=m
CONFIG_I2C_MLXCPLD=m
@@ -2294,7 +2296,7 @@ CONFIG_I2C_VERSATILE=m
# CONFIG_I2C_VIA is not set
# CONFIG_I2C_VIAPRO is not set
# CONFIG_I2C_VIPERBOARD is not set
-# CONFIG_I2C_VIRTIO is not set
+CONFIG_I2C_VIRTIO=m
CONFIG_I2C_XGENE_SLIMPRO=m
# CONFIG_I2C_XILINX is not set
CONFIG_I2C_XLP9XX=m
@@ -4843,7 +4845,7 @@ CONFIG_RTC_DRV_RS5C372=m
CONFIG_RTC_DRV_RV3029C2=m
# CONFIG_RTC_DRV_RV3029_HWMON is not set
# CONFIG_RTC_DRV_RV3032 is not set
-# CONFIG_RTC_DRV_RV8803 is not set
+CONFIG_RTC_DRV_RV8803=m
CONFIG_RTC_DRV_RX4581=m
# CONFIG_RTC_DRV_RX6110 is not set
CONFIG_RTC_DRV_RX8010=m
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index 0880d32c6..4a39cf173 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -316,7 +316,7 @@ CONFIG_ARCH_MVEBU=y
CONFIG_ARCH_MXC=y
# CONFIG_ARCH_NPCM is not set
CONFIG_ARCH_NR_GPIO=2048
-# CONFIG_ARCH_NXP is not set
+CONFIG_ARCH_NXP=y
# CONFIG_ARCH_OMAP1 is not set
# CONFIG_ARCH_PXA is not set
CONFIG_ARCH_QCOM=y
@@ -6224,7 +6224,7 @@ CONFIG_RTC_DRV_RV3028=m
CONFIG_RTC_DRV_RV3029C2=m
CONFIG_RTC_DRV_RV3029_HWMON=y
CONFIG_RTC_DRV_RV3032=m
-# CONFIG_RTC_DRV_RV8803 is not set
+CONFIG_RTC_DRV_RV8803=m
CONFIG_RTC_DRV_RX4581=m
# CONFIG_RTC_DRV_RX6110 is not set
CONFIG_RTC_DRV_RX8010=m
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config
index c439761a2..2007b2c19 100644
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@@ -2236,6 +2236,8 @@ CONFIG_I2C_HID_OF=m
# CONFIG_I2C_HISI is not set
# CONFIG_I2C_HIX5HD2 is not set
# CONFIG_I2C_I801 is not set
+CONFIG_I2C_IMX_LPI2C=m
+CONFIG_I2C_IMX=m
# CONFIG_I2C_ISCH is not set
CONFIG_I2C_MLXBF=m
CONFIG_I2C_MLXCPLD=m
@@ -2278,7 +2280,7 @@ CONFIG_I2C_VERSATILE=m
# CONFIG_I2C_VIA is not set
# CONFIG_I2C_VIAPRO is not set
# CONFIG_I2C_VIPERBOARD is not set
-# CONFIG_I2C_VIRTIO is not set
+CONFIG_I2C_VIRTIO=m
CONFIG_I2C_XGENE_SLIMPRO=m
# CONFIG_I2C_XILINX is not set
CONFIG_I2C_XLP9XX=m
@@ -4820,7 +4822,7 @@ CONFIG_RTC_DRV_RS5C372=m
CONFIG_RTC_DRV_RV3029C2=m
# CONFIG_RTC_DRV_RV3029_HWMON is not set
# CONFIG_RTC_DRV_RV3032 is not set
-# CONFIG_RTC_DRV_RV8803 is not set
+CONFIG_RTC_DRV_RV8803=m
CONFIG_RTC_DRV_RX4581=m
# CONFIG_RTC_DRV_RX6110 is not set
CONFIG_RTC_DRV_RX8010=m
diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config
index 08e3eb6dd..054980b35 100644
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@@ -318,7 +318,7 @@ CONFIG_ARCH_MULTI_V7=y
CONFIG_ARCH_MVEBU=y
CONFIG_ARCH_MXC=y
# CONFIG_ARCH_NPCM is not set
-# CONFIG_ARCH_NXP is not set
+CONFIG_ARCH_NXP=y
# CONFIG_ARCH_OMAP1 is not set
CONFIG_ARCH_OMAP2PLUS_TYPICAL=y
CONFIG_ARCH_OMAP3=y
diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config
index a3e6ce0b9..407afc419 100644
--- a/kernel-armv7hl-fedora.config
+++ b/kernel-armv7hl-fedora.config
@@ -318,7 +318,7 @@ CONFIG_ARCH_MULTI_V7=y
CONFIG_ARCH_MVEBU=y
CONFIG_ARCH_MXC=y
# CONFIG_ARCH_NPCM is not set
-# CONFIG_ARCH_NXP is not set
+CONFIG_ARCH_NXP=y
# CONFIG_ARCH_OMAP1 is not set
CONFIG_ARCH_OMAP2PLUS_TYPICAL=y
CONFIG_ARCH_OMAP3=y
diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config
index 0ebe63422..13fad68ab 100644
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@@ -310,7 +310,7 @@ CONFIG_ARCH_MULTI_V7=y
CONFIG_ARCH_MVEBU=y
# CONFIG_ARCH_MXC is not set
# CONFIG_ARCH_NPCM is not set
-# CONFIG_ARCH_NXP is not set
+CONFIG_ARCH_NXP=y
# CONFIG_ARCH_OMAP1 is not set
# CONFIG_ARCH_OMAP2PLUS_TYPICAL is not set
# CONFIG_ARCH_OMAP3 is not set
diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config
index 369aa953f..dc471dd66 100644
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@@ -310,7 +310,7 @@ CONFIG_ARCH_MULTI_V7=y
CONFIG_ARCH_MVEBU=y
# CONFIG_ARCH_MXC is not set
# CONFIG_ARCH_NPCM is not set
-# CONFIG_ARCH_NXP is not set
+CONFIG_ARCH_NXP=y
# CONFIG_ARCH_OMAP1 is not set
# CONFIG_ARCH_OMAP2PLUS_TYPICAL is not set
# CONFIG_ARCH_OMAP3 is not set
diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config
index d8b17bc82..031661eca 100644
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@@ -71,7 +71,7 @@ CONFIG_ACPI_SPCR_TABLE=y
CONFIG_ACPI_TABLE_UPGRADE=y
CONFIG_ACPI_TAD=m
CONFIG_ACPI_THERMAL=y
-# CONFIG_ACPI_VIDEO is not set
+CONFIG_ACPI_VIDEO=m
# CONFIG_ACQUIRE_WDT is not set
# CONFIG_AD2S1200 is not set
# CONFIG_AD2S1210 is not set
@@ -256,7 +256,7 @@ CONFIG_ARCH_FORCE_MAX_ORDER=9
# CONFIG_ARCH_IXP4XX is not set
# CONFIG_ARCH_KEEMBAY is not set
CONFIG_ARCH_MULTIPLATFORM=y
-# CONFIG_ARCH_NXP is not set
+CONFIG_ARCH_NXP=y
# CONFIG_ARCH_OMAP1 is not set
# CONFIG_ARCH_PXA is not set
CONFIG_ARCH_RANDOM=y
diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config
index 7ebf98f1c..a87ad714b 100644
--- a/kernel-ppc64le-debug-rhel.config
+++ b/kernel-ppc64le-debug-rhel.config
@@ -53,7 +53,7 @@ CONFIG_ACPI_PROCESSOR=y
CONFIG_ACPI_SPCR_TABLE=y
CONFIG_ACPI_TABLE_UPGRADE=y
CONFIG_ACPI_THERMAL=y
-# CONFIG_ACPI_VIDEO is not set
+CONFIG_ACPI_VIDEO=m
# CONFIG_ACQUIRE_WDT is not set
# CONFIG_AD2S1200 is not set
# CONFIG_AD2S1210 is not set
diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config
index 07ebbf038..4830f53fe 100644
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
@@ -71,7 +71,7 @@ CONFIG_ACPI_SPCR_TABLE=y
CONFIG_ACPI_TABLE_UPGRADE=y
CONFIG_ACPI_TAD=m
CONFIG_ACPI_THERMAL=y
-# CONFIG_ACPI_VIDEO is not set
+CONFIG_ACPI_VIDEO=m
# CONFIG_ACQUIRE_WDT is not set
# CONFIG_AD2S1200 is not set
# CONFIG_AD2S1210 is not set
@@ -256,7 +256,7 @@ CONFIG_ARCH_FORCE_MAX_ORDER=9
# CONFIG_ARCH_IXP4XX is not set
# CONFIG_ARCH_KEEMBAY is not set
CONFIG_ARCH_MULTIPLATFORM=y
-# CONFIG_ARCH_NXP is not set
+CONFIG_ARCH_NXP=y
# CONFIG_ARCH_OMAP1 is not set
# CONFIG_ARCH_PXA is not set
CONFIG_ARCH_RANDOM=y
diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config
index 0ff6f23df..751f224ae 100644
--- a/kernel-ppc64le-rhel.config
+++ b/kernel-ppc64le-rhel.config
@@ -53,7 +53,7 @@ CONFIG_ACPI_PROCESSOR=y
CONFIG_ACPI_SPCR_TABLE=y
CONFIG_ACPI_TABLE_UPGRADE=y
CONFIG_ACPI_THERMAL=y
-# CONFIG_ACPI_VIDEO is not set
+CONFIG_ACPI_VIDEO=m
# CONFIG_ACQUIRE_WDT is not set
# CONFIG_AD2S1200 is not set
# CONFIG_AD2S1210 is not set
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config
index c4026731c..dc2a0a36f 100644
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@@ -72,7 +72,7 @@ CONFIG_ACPI_SPCR_TABLE=y
CONFIG_ACPI_TABLE_UPGRADE=y
CONFIG_ACPI_TAD=m
CONFIG_ACPI_THERMAL=y
-# CONFIG_ACPI_VIDEO is not set
+CONFIG_ACPI_VIDEO=m
# CONFIG_ACQUIRE_WDT is not set
# CONFIG_AD2S1200 is not set
# CONFIG_AD2S1210 is not set
@@ -259,7 +259,7 @@ CONFIG_AR5523=m
# CONFIG_ARCH_IXP4XX is not set
# CONFIG_ARCH_KEEMBAY is not set
CONFIG_ARCH_MULTIPLATFORM=y
-# CONFIG_ARCH_NXP is not set
+CONFIG_ARCH_NXP=y
# CONFIG_ARCH_OMAP1 is not set
# CONFIG_ARCH_PXA is not set
CONFIG_ARCH_RANDOM=y
diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config
index a0d6bbaab..b735ffe85 100644
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@@ -52,7 +52,7 @@ CONFIG_ACPI_PROCESSOR=y
CONFIG_ACPI_SPCR_TABLE=y
CONFIG_ACPI_TABLE_UPGRADE=y
CONFIG_ACPI_THERMAL=y
-# CONFIG_ACPI_VIDEO is not set
+CONFIG_ACPI_VIDEO=m
# CONFIG_ACQUIRE_WDT is not set
# CONFIG_AD2S1200 is not set
# CONFIG_AD2S1210 is not set
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config
index 498eabf11..3f89fbabd 100644
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@@ -72,7 +72,7 @@ CONFIG_ACPI_SPCR_TABLE=y
CONFIG_ACPI_TABLE_UPGRADE=y
CONFIG_ACPI_TAD=m
CONFIG_ACPI_THERMAL=y
-# CONFIG_ACPI_VIDEO is not set
+CONFIG_ACPI_VIDEO=m
# CONFIG_ACQUIRE_WDT is not set
# CONFIG_AD2S1200 is not set
# CONFIG_AD2S1210 is not set
@@ -259,7 +259,7 @@ CONFIG_AR5523=m
# CONFIG_ARCH_IXP4XX is not set
# CONFIG_ARCH_KEEMBAY is not set
CONFIG_ARCH_MULTIPLATFORM=y
-# CONFIG_ARCH_NXP is not set
+CONFIG_ARCH_NXP=y
# CONFIG_ARCH_OMAP1 is not set
# CONFIG_ARCH_PXA is not set
CONFIG_ARCH_RANDOM=y
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config
index 5fc4ebc75..7937aa234 100644
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@@ -52,7 +52,7 @@ CONFIG_ACPI_PROCESSOR=y
CONFIG_ACPI_SPCR_TABLE=y
CONFIG_ACPI_TABLE_UPGRADE=y
CONFIG_ACPI_THERMAL=y
-# CONFIG_ACPI_VIDEO is not set
+CONFIG_ACPI_VIDEO=m
# CONFIG_ACQUIRE_WDT is not set
# CONFIG_AD2S1200 is not set
# CONFIG_AD2S1210 is not set
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config
index e0114d16b..3a266016a 100644
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
@@ -52,7 +52,7 @@ CONFIG_ACPI_PROCESSOR=y
CONFIG_ACPI_SPCR_TABLE=y
CONFIG_ACPI_TABLE_UPGRADE=y
CONFIG_ACPI_THERMAL=y
-# CONFIG_ACPI_VIDEO is not set
+CONFIG_ACPI_VIDEO=m
# CONFIG_ACQUIRE_WDT is not set
# CONFIG_AD2S1200 is not set
# CONFIG_AD2S1210 is not set
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index 8461aa9b3..aa0ba794e 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -293,7 +293,7 @@ CONFIG_AR5523=m
# CONFIG_ARCH_KEEMBAY is not set
# CONFIG_ARCH_MEMORY_PROBE is not set
CONFIG_ARCH_MULTIPLATFORM=y
-# CONFIG_ARCH_NXP is not set
+CONFIG_ARCH_NXP=y
# CONFIG_ARCH_OMAP1 is not set
# CONFIG_ARCH_PXA is not set
CONFIG_ARCH_RANDOM=y
@@ -5524,7 +5524,7 @@ CONFIG_RTC_DRV_RV3028=m
CONFIG_RTC_DRV_RV3029C2=m
CONFIG_RTC_DRV_RV3029_HWMON=y
CONFIG_RTC_DRV_RV3032=m
-# CONFIG_RTC_DRV_RV8803 is not set
+CONFIG_RTC_DRV_RV8803=m
CONFIG_RTC_DRV_RX4581=m
# CONFIG_RTC_DRV_RX6110 is not set
CONFIG_RTC_DRV_RX8010=m
diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config
index 92870a0f1..8a82fb574 100644
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@@ -4786,7 +4786,7 @@ CONFIG_RTC_DRV_RS5C372=m
CONFIG_RTC_DRV_RV3029C2=m
# CONFIG_RTC_DRV_RV3029_HWMON is not set
# CONFIG_RTC_DRV_RV3032 is not set
-# CONFIG_RTC_DRV_RV8803 is not set
+CONFIG_RTC_DRV_RV8803=m
CONFIG_RTC_DRV_RX4581=m
# CONFIG_RTC_DRV_RX6110 is not set
# CONFIG_RTC_DRV_RX8010 is not set
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index 5a25fbfe7..83bc52c00 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -293,7 +293,7 @@ CONFIG_AR5523=m
# CONFIG_ARCH_KEEMBAY is not set
# CONFIG_ARCH_MEMORY_PROBE is not set
CONFIG_ARCH_MULTIPLATFORM=y
-# CONFIG_ARCH_NXP is not set
+CONFIG_ARCH_NXP=y
# CONFIG_ARCH_OMAP1 is not set
# CONFIG_ARCH_PXA is not set
CONFIG_ARCH_RANDOM=y
@@ -5504,7 +5504,7 @@ CONFIG_RTC_DRV_RV3028=m
CONFIG_RTC_DRV_RV3029C2=m
CONFIG_RTC_DRV_RV3029_HWMON=y
CONFIG_RTC_DRV_RV3032=m
-# CONFIG_RTC_DRV_RV8803 is not set
+CONFIG_RTC_DRV_RV8803=m
CONFIG_RTC_DRV_RX4581=m
# CONFIG_RTC_DRV_RX6110 is not set
CONFIG_RTC_DRV_RX8010=m
diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config
index a4923e2d7..128915d32 100644
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@@ -4764,7 +4764,7 @@ CONFIG_RTC_DRV_RS5C372=m
CONFIG_RTC_DRV_RV3029C2=m
# CONFIG_RTC_DRV_RV3029_HWMON is not set
# CONFIG_RTC_DRV_RV3032 is not set
-# CONFIG_RTC_DRV_RV8803 is not set
+CONFIG_RTC_DRV_RV8803=m
CONFIG_RTC_DRV_RX4581=m
# CONFIG_RTC_DRV_RX6110 is not set
# CONFIG_RTC_DRV_RX8010 is not set
diff --git a/kernel.spec b/kernel.spec
index 32fc526ad..493c3ec0b 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -119,17 +119,17 @@ Summary: The Linux kernel
# Set debugbuildsenabled to 0 to not build a separate debug kernel, but
# to build the base kernel using the debug configuration. (Specifying
# the --with-release option overrides this setting.)
-%define debugbuildsenabled 0
+%define debugbuildsenabled 1
# define buildid .local
%define specversion 6.1.0
%define patchversion 6.1
-%define pkgrelease 0.rc3.20221102git8f71a2b3f435.29
+%define pkgrelease 0.rc4.34
%define kversion 6
-%define tarfile_release 6.1-rc3-45-g8f71a2b3f435
+%define tarfile_release 6.1-rc4
# This is needed to do merge window version magic
%define patchlevel 1
# This allows pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc3.20221102git8f71a2b3f435.29%{?buildid}%{?dist}
+%define specrelease 0.rc4.34%{?buildid}%{?dist}
# This defines the kabi tarball version
%define kabiversion 6.1.0
@@ -3190,8 +3190,24 @@ fi
#
#
%changelog
-* Wed Nov 02 2022 Justin M. Forbes <jforbes@fedoraproject.org> [6.1.0-0.rc3.20221102git8f71a2b3f435.29]
+* Mon Nov 07 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.1.0-0.rc4.34]
+- redhat/configs: move CONFIG_ACPI_VIDEO to common/generic (Mark Langsdorf)
+- enable imx8xm I2C configs properly (Al Stone)
+- Linux v6.1.0-0.rc4
+
+* Sun Nov 06 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.1.0-0.rc3.2f5065a0bc9d.33]
+- Linux v6.1.0-0.rc3.2f5065a0bc9d
+
+* Sat Nov 05 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.1.0-0.rc3.b208b9fbbcba.32]
+- Linux v6.1.0-0.rc3.b208b9fbbcba
+
+* Fri Nov 04 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.1.0-0.rc3.ee6050c8af96.31]
+- Linux v6.1.0-0.rc3.ee6050c8af96
+
+* Thu Nov 03 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.1.0-0.rc3.8e5423e991e8.30]
- configs/fedora: Enable a few more drivers needed by the HP X2 Chromebook (Javier Martinez Canillas)
+- enable the rtc-rv8803 driver on RHEL and Fedora (David Arcari)
+- Linux v6.1.0-0.rc3.8e5423e991e8
* Wed Nov 02 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.1.0-0.rc3.8f71a2b3f435.29]
- redhat/Makefile: Remove BUILD_SCRATCH_TARGET (Prarit Bhargava)
diff --git a/patch-6.1-redhat.patch b/patch-6.1-redhat.patch
index d0ccbad83..9501046b0 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 28026d1ebb9d..4d20d9a9e840 100644
+index ac2ec990422d..6f23c2014800 100644
--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@@ -560,7 +560,7 @@ index 8d151e332584..bd29fe4ddbf3 100644
obj-$(CONFIG_EFI_RCI2_TABLE) += rci2-table.o
obj-$(CONFIG_EFI_EMBEDDED_FIRMWARE) += embedded-firmware.o
diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
-index 3ecdc43a3f2b..c856ef768c2a 100644
+index a46df5d1d094..b35a70c70757 100644
--- a/drivers/firmware/efi/efi.c
+++ b/drivers/firmware/efi/efi.c
@@ -32,6 +32,7 @@
@@ -1779,7 +1779,7 @@ index eae288c8d40a..8b8bf447cedc 100644
error_proc:
diff --git a/include/linux/efi.h b/include/linux/efi.h
-index 80f3c1c7827d..64cefca233ee 100644
+index 929d559ad41d..3fa273ff1c22 100644
--- a/include/linux/efi.h
+++ b/include/linux/efi.h
@@ -43,6 +43,8 @@
diff --git a/sources b/sources
index 8310f1d00..caa5db542 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-6.1-rc3-45-g8f71a2b3f435.tar.xz) = 8e40ff12f34b459f736039d60e5240531d708030072d6e955ef9a3d7bd3fd7e2f92b7ff1b230de15403fa7539f97f2deaf64ae22cf818e66495bf154215cd70e
-SHA512 (kernel-abi-stablelists-6.1.0.tar.bz2) = ea335c5d18f52c3152643a6a1e5a3897707b7d4b5aeb1b4df0daa337b73b7461d343cb91b7b11d123e07981dc3d3b7708b77a285c05448d08f4b83b085db7d49
-SHA512 (kernel-kabi-dw-6.1.0.tar.bz2) = f3a5ab67d57dd81199952ce200317e4d3b2a2e2481ce19b72c80921f76cc82f30ebcccb3caf67717a431cd5fc053068192d65df6846eddf1a6d25566907b50fd
+SHA512 (linux-6.1-rc4.tar.xz) = ab66d795809fe519cee1f292491259d1daaa6bcd6d224b5a9c35c09517256f474b95768caeb309df78f51f5d1952fd67d96f95a3ff32266966ffa389141383ad
+SHA512 (kernel-abi-stablelists-6.1.0.tar.bz2) = eac26e4628e3090f038541b30ef06785047abffd04551b82cc1143b4b5342dd632f69c17f89eb15497dca5bd14755c06806db7c9f71037b034959df01ac4a2df
+SHA512 (kernel-kabi-dw-6.1.0.tar.bz2) = 03e1cd77ab033f3c48d64604d5431221e7ad5df8687f9c7603520d3b679d28f3357dcd91f40f36d6044320efc8d21dec9d16fba30d7059c159d9d5224d34b4f0