diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-05-18 19:51:51 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-05-18 19:51:51 +0200 |
commit | aae208c12f61545f388c2e6d1f22c30ec858c293 (patch) | |
tree | 7a6f6fa03b1360b9df7f2150bd337fa33a9ff8d5 /0001-arm-aarch64-Drop-the-EXPERT-setting-from-ARM64_FORCE.patch | |
parent | 81b1269020cd33317e9c61de223f735c3ef35525 (diff) | |
parent | 8bcec8d9026ed6b2c51c7947c2e28628e701dfe8 (diff) | |
download | kernel-aae208c12f61545f388c2e6d1f22c30ec858c293.tar.gz kernel-aae208c12f61545f388c2e6d1f22c30ec858c293.tar.xz kernel-aae208c12f61545f388c2e6d1f22c30ec858c293.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.7.0-0.rc6.1.vanilla.1.fc33kernel-5.7.0-0.rc6.1.vanilla.1.fc32kernel-5.7.0-0.rc6.1.vanilla.1.fc31kernel-5.7.0-0.rc6.1.vanilla.1.fc30
Diffstat (limited to '0001-arm-aarch64-Drop-the-EXPERT-setting-from-ARM64_FORCE.patch')
-rw-r--r-- | 0001-arm-aarch64-Drop-the-EXPERT-setting-from-ARM64_FORCE.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/0001-arm-aarch64-Drop-the-EXPERT-setting-from-ARM64_FORCE.patch b/0001-arm-aarch64-Drop-the-EXPERT-setting-from-ARM64_FORCE.patch index bb37b4529..286c898cb 100644 --- a/0001-arm-aarch64-Drop-the-EXPERT-setting-from-ARM64_FORCE.patch +++ b/0001-arm-aarch64-Drop-the-EXPERT-setting-from-ARM64_FORCE.patch @@ -21,10 +21,10 @@ Signed-off-by: Jeremy Cline <jcline@redhat.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig -index 40fb05d96c60..9e87f5847c92 100644 +index 5d513f461957..7f37a6d0658a 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig -@@ -857,7 +857,7 @@ endchoice +@@ -858,7 +858,7 @@ endchoice config ARM64_FORCE_52BIT bool "Force 52-bit virtual addresses for userspace" |