diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-01-18 08:08:53 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-01-18 08:08:53 +0100 |
| commit | 786533b774f9fd841820bddf927651d49b8a7ac7 (patch) | |
| tree | 828733aadfd6cd7cea0a90d50f41c72e5f3785a5 /patch-5.11.0-redhat.patch | |
| parent | 0e66cf1520c65ef3f026ed1354051187f1600c32 (diff) | |
| parent | c88f80dbedca3af02e3b0924e3e8a435b3167346 (diff) | |
| download | kernel-5.11.0-0.rc4.129.vanilla.1.fc32.tar.gz kernel-5.11.0-0.rc4.129.vanilla.1.fc32.tar.xz kernel-5.11.0-0.rc4.129.vanilla.1.fc32.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.11.0-0.rc4.129.vanilla.1.fc34kernel-5.11.0-0.rc4.129.vanilla.1.fc33kernel-5.11.0-0.rc4.129.vanilla.1.fc32
Diffstat (limited to 'patch-5.11.0-redhat.patch')
| -rw-r--r-- | patch-5.11.0-redhat.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/patch-5.11.0-redhat.patch b/patch-5.11.0-redhat.patch index 220038e21..dc3638bee 100644 --- a/patch-5.11.0-redhat.patch +++ b/patch-5.11.0-redhat.patch @@ -94,7 +94,7 @@ index 75a9dd98e76e..3ff3291551f9 100644 Boot into System Kernel diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt -index 9e3cdb271d06..e98bca34b9d5 100644 +index a10b545c2070..119710ce904a 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -5526,6 +5526,14 @@ @@ -202,7 +202,7 @@ index 000000000000..effb81d04bfd + +endmenu diff --git a/Makefile b/Makefile -index 9e73f82e0d86..3b03f12f6f3e 100644 +index b0e4767735dc..be03cc790748 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -287,10 +287,10 @@ index a13d90206472..6a6aae01755b 100644 #define get_user(x, p) \ diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig -index 05e17351e4f3..306ae6ff5346 100644 +index f39568b28ec1..794d5413765b 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig -@@ -896,7 +896,7 @@ endchoice +@@ -894,7 +894,7 @@ endchoice config ARM64_FORCE_52BIT bool "Force 52-bit virtual addresses for userspace" @@ -299,7 +299,7 @@ index 05e17351e4f3..306ae6ff5346 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 -@@ -1149,6 +1149,7 @@ config XEN +@@ -1147,6 +1147,7 @@ config XEN config FORCE_MAX_ZONEORDER int default "14" if (ARM64_64K_PAGES && TRANSPARENT_HUGEPAGE) @@ -562,10 +562,10 @@ index e209081d644b..7484bcf59a1b 100644 return ctx.rc; } diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c -index 80b668c80073..fa30cf6100dd 100644 +index 58ff36340cd7..3e2854a6d953 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c -@@ -1605,6 +1605,15 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device) +@@ -1618,6 +1618,15 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device) if (!acpi_match_device_ids(device, i2c_multi_instantiate_ids)) return false; |