diff options
Diffstat (limited to 'patch-6.1-redhat.patch')
| -rw-r--r-- | patch-6.1-redhat.patch | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/patch-6.1-redhat.patch b/patch-6.1-redhat.patch index 1a6e3898c..a66b36e68 100644 --- a/patch-6.1-redhat.patch +++ b/patch-6.1-redhat.patch @@ -122,7 +122,7 @@ index 000000000000..effb81d04bfd + +endmenu diff --git a/Makefile b/Makefile -index f41ec8c8426b..4781baaf709c 100644 +index d148a55bfd0f..35f9d1dfa080 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -440,10 +440,10 @@ index 1cc4647f78b8..016d488cabc3 100644 return ctx.rc; } diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c -index 558664d169fc..8510440fa17e 100644 +index 024cc373a197..99369d9cac17 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c -@@ -1741,6 +1741,15 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device) +@@ -1742,6 +1742,15 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device) if (!acpi_match_device_ids(device, ignore_serial_bus_ids)) return false; @@ -562,7 +562,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 9624735f1575..d4faa8835096 100644 +index 3ecdc43a3f2b..c856ef768c2a 100644 --- a/drivers/firmware/efi/efi.c +++ b/drivers/firmware/efi/efi.c @@ -32,6 +32,7 @@ @@ -573,7 +573,7 @@ index 9624735f1575..d4faa8835096 100644 #include <asm/early_ioremap.h> -@@ -879,40 +880,101 @@ int efi_mem_type(unsigned long phys_addr) +@@ -881,40 +882,101 @@ int efi_mem_type(unsigned long phys_addr) } #endif @@ -1094,7 +1094,7 @@ index 258d5fe3d395..f7298e3dc8f3 100644 if (data->f01_container->dev.driver) { /* Driver already bound, so enable ATTN now. */ diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c -index 4893c2429ca5..45c2e48c82d6 100644 +index 65a3b3d886dc..911b64ce9889 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -8,6 +8,7 @@ @@ -1105,7 +1105,7 @@ index 4893c2429ca5..45c2e48c82d6 100644 #include <linux/kernel.h> #include <linux/bits.h> #include <linux/bug.h> -@@ -2817,6 +2818,27 @@ u32 iommu_sva_get_pasid(struct iommu_sva *handle) +@@ -2818,6 +2819,27 @@ u32 iommu_sva_get_pasid(struct iommu_sva *handle) } EXPORT_SYMBOL_GPL(iommu_sva_get_pasid); @@ -1228,7 +1228,7 @@ index ee4da9ab8013..d395d11eadc4 100644 if (ret < 0) goto err_allowedips; diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c -index 059737c1a2c1..3de14ca20059 100644 +index dc4220600585..758d2239af64 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -250,6 +250,9 @@ static void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl) @@ -1781,7 +1781,7 @@ index eae288c8d40a..8b8bf447cedc 100644 error_proc: diff --git a/include/linux/efi.h b/include/linux/efi.h -index da3974bf05d3..cd7fad7eef44 100644 +index 80f3c1c7827d..64cefca233ee 100644 --- a/include/linux/efi.h +++ b/include/linux/efi.h @@ -43,6 +43,8 @@ @@ -1834,7 +1834,7 @@ index da3974bf05d3..cd7fad7eef44 100644 /* * Variable Attributes -@@ -1137,13 +1152,6 @@ static inline bool efi_runtime_disabled(void) { return true; } +@@ -1134,13 +1149,6 @@ static inline bool efi_runtime_disabled(void) { return true; } extern void efi_call_virt_check_flags(unsigned long flags, const char *call); extern unsigned long efi_call_virt_save_flags(void); @@ -2533,7 +2533,7 @@ index ca1b7109c0db..b947cfbf04c2 100644 #if defined(CONFIG_SECURITY) && defined(CONFIG_WATCH_QUEUE) diff --git a/init/Kconfig b/init/Kconfig -index 694f7c160c9c..9bcc8ce2e79a 100644 +index abf65098f1b6..533c8e3a633b 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -1685,7 +1685,7 @@ config AIO |