diff options
Diffstat (limited to 'patch-6.1-redhat.patch')
| -rw-r--r-- | patch-6.1-redhat.patch | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/patch-6.1-redhat.patch b/patch-6.1-redhat.patch index 07f118879..7ecd716d1 100644 --- a/patch-6.1-redhat.patch +++ b/patch-6.1-redhat.patch @@ -67,10 +67,10 @@ 66 files changed, 1540 insertions(+), 187 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt -index b2413342b309..6d72eef46282 100644 +index 69b1533c1f02..801101203295 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt -@@ -6417,6 +6417,15 @@ +@@ -6421,6 +6421,15 @@ unknown_nmi_panic [X86] Cause panic on unknown NMI. @@ -120,7 +120,7 @@ index 000000000000..effb81d04bfd + +endmenu diff --git a/Makefile b/Makefile -index f659d3085121..d9d258c43993 100644 +index cfbe6a7de640..80a3a35a9c36 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -134,7 +134,7 @@ index f659d3085121..d9d258c43993 100644 # We are using a recursive build, so we need to do a little thinking # to get the ordering right. # -@@ -1324,7 +1328,13 @@ define filechk_version.h +@@ -1318,7 +1322,13 @@ define filechk_version.h ((c) > 255 ? 255 : (c)))'; \ echo \#define LINUX_VERSION_MAJOR $(VERSION); \ echo \#define LINUX_VERSION_PATCHLEVEL $(PATCHLEVEL); \ @@ -150,7 +150,7 @@ index f659d3085121..d9d258c43993 100644 $(version_h): PATCHLEVEL := $(or $(PATCHLEVEL), 0) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index 22dc1d6936bc..7fc3e9c5bc4c 100644 +index a08c9d092a33..1d82f6e9ecbd 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1315,9 +1315,9 @@ config HIGHMEM @@ -166,10 +166,10 @@ index 22dc1d6936bc..7fc3e9c5bc4c 100644 The VM uses one page of physical memory for each page table. For systems with a lot of processes, this can use a lot of diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig -index fb8463c028b2..bec3a70f9e91 100644 +index f6737d2f37b2..831201c75275 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig -@@ -1196,7 +1196,7 @@ endchoice +@@ -1195,7 +1195,7 @@ endchoice config ARM64_FORCE_52BIT bool "Force 52-bit virtual addresses for userspace" @@ -178,8 +178,8 @@ index fb8463c028b2..bec3a70f9e91 100644 help For systems with 52-bit userspace VAs enabled, the kernel will attempt to maintain compatibility with older software by providing 48-bit VAs -@@ -1435,6 +1435,7 @@ config XEN - config FORCE_MAX_ZONEORDER +@@ -1434,6 +1434,7 @@ config XEN + config ARCH_FORCE_MAX_ORDER int default "14" if ARM64_64K_PAGES + default "13" if (ARCH_THUNDER && !ARM64_64K_PAGES) @@ -395,7 +395,7 @@ index 6aef1ee5e1bd..8f146b1b4972 100644 for (i = 0; i < hest_tab->error_source_count; i++) { len = hest_esrc_len(hest_hdr); diff --git a/drivers/acpi/irq.c b/drivers/acpi/irq.c -index 4db5bb587599..f8c62b72a93c 100644 +index 1cc4647f78b8..016d488cabc3 100644 --- a/drivers/acpi/irq.c +++ b/drivers/acpi/irq.c @@ -137,6 +137,7 @@ struct acpi_irq_parse_one_ctx { @@ -406,7 +406,7 @@ index 4db5bb587599..f8c62b72a93c 100644 }; /** -@@ -208,7 +209,8 @@ static acpi_status acpi_irq_parse_one_cb(struct acpi_resource *ares, +@@ -210,7 +211,8 @@ static acpi_status acpi_irq_parse_one_cb(struct acpi_resource *ares, return AE_CTRL_TERMINATE; case ACPI_RESOURCE_TYPE_EXTENDED_IRQ: eirq = &ares->data.extended_irq; @@ -416,7 +416,7 @@ index 4db5bb587599..f8c62b72a93c 100644 return AE_OK; if (ctx->index >= eirq->interrupt_count) { ctx->index -= eirq->interrupt_count; -@@ -244,8 +246,19 @@ static acpi_status acpi_irq_parse_one_cb(struct acpi_resource *ares, +@@ -246,8 +248,19 @@ static acpi_status acpi_irq_parse_one_cb(struct acpi_resource *ares, static int acpi_irq_parse_one(acpi_handle handle, unsigned int index, struct irq_fwspec *fwspec, unsigned long *flags) { @@ -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 11857af72859..67ce560e80ff 100644 +index 9624735f1575..d4faa8835096 100644 --- a/drivers/firmware/efi/efi.c +++ b/drivers/firmware/efi/efi.c @@ -32,6 +32,7 @@ @@ -1092,18 +1092,18 @@ 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 3a808146b50f..c1a3f3057921 100644 +index 4893c2429ca5..45c2e48c82d6 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c -@@ -7,6 +7,7 @@ - #define pr_fmt(fmt) "iommu: " fmt +@@ -8,6 +8,7 @@ + #include <linux/amba/bus.h> #include <linux/device.h> +#include <linux/dmi.h> - #include <linux/dma-iommu.h> #include <linux/kernel.h> #include <linux/bits.h> -@@ -2843,6 +2844,27 @@ u32 iommu_sva_get_pasid(struct iommu_sva *handle) + #include <linux/bug.h> +@@ -2817,6 +2818,27 @@ u32 iommu_sva_get_pasid(struct iommu_sva *handle) } EXPORT_SYMBOL_GPL(iommu_sva_get_pasid); @@ -2531,10 +2531,10 @@ index ca1b7109c0db..b947cfbf04c2 100644 #if defined(CONFIG_SECURITY) && defined(CONFIG_WATCH_QUEUE) diff --git a/init/Kconfig b/init/Kconfig -index 751ca3dd1d22..9df6045bdd65 100644 +index d6c4302b1c08..7af2992141cf 100644 --- a/init/Kconfig +++ b/init/Kconfig -@@ -1689,7 +1689,7 @@ config AIO +@@ -1684,7 +1684,7 @@ config AIO this option saves about 7k. config IO_URING @@ -2544,7 +2544,7 @@ index 751ca3dd1d22..9df6045bdd65 100644 default y help diff --git a/kernel/Makefile b/kernel/Makefile -index 318789c728d3..148911cf65da 100644 +index d754e0be1176..a9d29c4c6c4e 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -12,6 +12,7 @@ obj-y = fork.o exec_domain.o panic.o \ |