diff options
Diffstat (limited to 'patch-6.0-redhat.patch')
| -rw-r--r-- | patch-6.0-redhat.patch | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/patch-6.0-redhat.patch b/patch-6.0-redhat.patch index 0d919dd50..98bdefa2e 100644 --- a/patch-6.0-redhat.patch +++ b/patch-6.0-redhat.patch @@ -68,10 +68,10 @@ 67 files changed, 1547 insertions(+), 188 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt -index d7f30902fda0..e6f4a4029d20 100644 +index 426fa892d311..11b6f16bc969 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt -@@ -6404,6 +6404,15 @@ +@@ -6406,6 +6406,15 @@ unknown_nmi_panic [X86] Cause panic on unknown NMI. @@ -121,7 +121,7 @@ index 000000000000..effb81d04bfd + +endmenu diff --git a/Makefile b/Makefile -index c7705f749601..605a6bbe1714 100644 +index 952d354069a4..91c24008b37f 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -167,10 +167,10 @@ index 87badeae3181..2ec7919034d8 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 571cc234d0b3..2e07c933e97e 100644 +index 9fb9fff08c94..6f6392f33711 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig -@@ -1165,7 +1165,7 @@ endchoice +@@ -1182,7 +1182,7 @@ endchoice config ARM64_FORCE_52BIT bool "Force 52-bit virtual addresses for userspace" @@ -179,7 +179,7 @@ index 571cc234d0b3..2e07c933e97e 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 -@@ -1404,6 +1404,7 @@ config XEN +@@ -1421,6 +1421,7 @@ config XEN config FORCE_MAX_ZONEORDER int default "14" if ARM64_64K_PAGES @@ -251,10 +251,10 @@ index ed4fbbbdd1b0..fbc9fcf681c2 100644 /* boot_command_line has been already set up in early.c */ *cmdline_p = boot_command_line; diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c -index 64a73f415f03..2955e1c6f757 100644 +index 3e508f239098..65bcc1c96362 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c -@@ -1532,6 +1532,7 @@ static void __init early_identify_cpu(struct cpuinfo_x86 *c) +@@ -1544,6 +1544,7 @@ static void __init early_identify_cpu(struct cpuinfo_x86 *c) cpu_detect(c); get_cpu_vendor(c); get_cpu_cap(c); @@ -1652,7 +1652,7 @@ index 0b1616e93cf4..85fc52038a82 100644 PCI_ANY_ID, PCI_ANY_ID, }, {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LANCER_G7_FC, diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c -index a3e117a4b8e7..e0035211cae6 100644 +index f6c37a97544e..a1488544300e 100644 --- a/drivers/scsi/megaraid/megaraid_sas_base.c +++ b/drivers/scsi/megaraid/megaraid_sas_base.c @@ -149,6 +149,7 @@ megasas_set_ld_removed_by_fw(struct megasas_instance *instance); |