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-08-13 20:17:57 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2020-08-13 20:17:57 +0200
commitf05c02032c007399078784ea2ace322385f869b9 (patch)
tree7c1bd28f37be1d28a3c8ace051c55472ba8bdd63 /0001-arm-aarch64-Drop-the-EXPERT-setting-from-ARM64_FORCE.patch
parent55576abe986db86a9f4e2b105d2451800d652217 (diff)
parentf7a3bf654752fa0e92c7ab3e57e48d3415632852 (diff)
downloadkernel-f05c02032c007399078784ea2ace322385f869b9.tar.gz
kernel-f05c02032c007399078784ea2ace322385f869b9.tar.xz
kernel-f05c02032c007399078784ea2ace322385f869b9.zip
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedora
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 89eea8f8b..81b84901f 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 66dc41fd49f2..2e0700a451e5 100644
+index 6d232837cbee..60a89b5e57b3 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -861,7 +861,7 @@ endchoice