summaryrefslogtreecommitdiffstats
path: root/patch-6.1-redhat.patch
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 /patch-6.1-redhat.patch
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>
Diffstat (limited to 'patch-6.1-redhat.patch')
-rw-r--r--patch-6.1-redhat.patch6
1 files changed, 3 insertions, 3 deletions
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 @@