From 94c20cfd03f4c4682805f7e57410a5dfe17d6423 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Tue, 26 Oct 2021 09:26:37 -0500 Subject: kernel-5.15-0.rc7.53 * Tue Oct 26 2021 Fedora Kernel Team [5.15-0.rc7.53] - Enable CONFIG_FAIL_SUNRPC for debug builds (Justin M. Forbes) - fedora: Disable fbdev drivers and use simpledrm instead (Javier Martinez Canillas) Resolves: rhbz# Signed-off-by: Justin M. Forbes --- patch-5.15-redhat.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'patch-5.15-redhat.patch') diff --git a/patch-5.15-redhat.patch b/patch-5.15-redhat.patch index 66ca3fd5b..1d8f5d6e1 100644 --- a/patch-5.15-redhat.patch +++ b/patch-5.15-redhat.patch @@ -128,7 +128,7 @@ index 000000000000..effb81d04bfd + +endmenu diff --git a/Makefile b/Makefile -index 91297670da8e..a94f22de77ad 100644 +index 30c7c81d0437..359c0956bb03 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -158,10 +158,10 @@ index 91297670da8e..a94f22de77ad 100644 $(version_h): PATCHLEVEL := $(if $(PATCHLEVEL), $(PATCHLEVEL), 0) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index 59baf6c132a7..9c4714443ef5 100644 +index dcf2df6da98f..b03b682850ab 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig -@@ -1469,9 +1469,9 @@ config HIGHMEM +@@ -1470,9 +1470,9 @@ config HIGHMEM If unsure, say n. config HIGHPTE @@ -1987,7 +1987,7 @@ index d383d4a03436..9504a0090c71 100644 { MPI2_MFGPAGE_VENDORID_LSI, MPI25_MFGPAGE_DEVID_SAS3004, PCI_ANY_ID, PCI_ANY_ID }, diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c -index d2e40aaba734..de0d41fec938 100644 +index 836fedcea241..5f5e2ca8af53 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c @@ -7960,6 +7960,7 @@ static const struct pci_error_handlers qla2xxx_err_handler = { -- cgit