summaryrefslogtreecommitdiffstats
path: root/0001-arm-aarch64-Drop-the-EXPERT-setting-from-ARM64_FORCE.patch
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2020-09-30 18:44:02 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2020-09-30 18:44:02 +0200
commite5237f62c21f764ed70f1abcea884b15f30ca984 (patch)
tree30612d7f7dcef570d7f4f5dabbec7d246b6da140 /0001-arm-aarch64-Drop-the-EXPERT-setting-from-ARM64_FORCE.patch
parente3fcce771836f3bf4ad59b6beed900b3e9a25ea0 (diff)
parent8bf7e7fde6b9176ccaac91a0c95464f326d8a008 (diff)
downloadkernel-e5237f62c21f764ed70f1abcea884b15f30ca984.tar.gz
kernel-e5237f62c21f764ed70f1abcea884b15f30ca984.tar.xz
kernel-e5237f62c21f764ed70f1abcea884b15f30ca984.zip
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.9.0-0.rc7.20200930gitfb0155a09b02.22.vanilla.1.fc32
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.patch2
1 files changed, 1 insertions, 1 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 293de5ba1..eb02c33dc 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,7 +21,7 @@ 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 6d232837cbee..60a89b5e57b3 100644
+index e11b4ea06127..74c5325108c0 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -861,7 +861,7 @@ endchoice