Drop arm64-kconfig-add-a-choice-for-endianness.patch

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-4.19/arm64-kconfig-add-a-choice-for-endianness.patch b/queue-4.19/arm64-kconfig-add-a-choice-for-endianness.patch
deleted file mode 100644 (file)
index 0be639c..0000000
--- a/queue-4.19/arm64-kconfig-add-a-choice-for-endianness.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 6764e1ab6471b7fd6714fccc60c36c5fcdea206c Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 13 Nov 2019 10:26:52 +0100
-Subject: arm64: Kconfig: add a choice for endianness
-
-From: Anders Roxell <anders.roxell@linaro.org>
-
-[ Upstream commit d8e85e144bbe12e8d82c6b05d690a34da62cc991 ]
-
-When building allmodconfig KCONFIG_ALLCONFIG=$(pwd)/arch/arm64/configs/defconfig
-CONFIG_CPU_BIG_ENDIAN gets enabled. Which tends not to be what most
-people want. Another concern that has come up is that ACPI isn't built
-for an allmodconfig kernel today since that also depends on !CPU_BIG_ENDIAN.
-
-Rework so that we introduce a 'choice' and default the choice to
-CPU_LITTLE_ENDIAN. That means that when we build an allmodconfig kernel
-it will default to CPU_LITTLE_ENDIAN that most people tends to want.
-
-Reviewed-by: John Garry <john.garry@huawei.com>
-Acked-by: Will Deacon <will@kernel.org>
-Signed-off-by: Anders Roxell <anders.roxell@linaro.org>
-Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
-Stable-dep-of: 146a15b87335 ("arm64: Restrict CPU_BIG_ENDIAN to GNU as or LLVM IAS 15.x or newer")
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm64/Kconfig | 18 +++++++++++++++++-
- 1 file changed, 17 insertions(+), 1 deletion(-)
-
-diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
-index e16f0d45b47ac..04ff19aa948a1 100644
---- a/arch/arm64/Kconfig
-+++ b/arch/arm64/Kconfig
-@@ -748,10 +748,26 @@ config ARM64_PA_BITS
-       default 48 if ARM64_PA_BITS_48
-       default 52 if ARM64_PA_BITS_52
- 
-+choice
-+      prompt "Endianness"
-+      default CPU_LITTLE_ENDIAN
-+      help
-+        Select the endianness of data accesses performed by the CPU. Userspace
-+        applications will need to be compiled and linked for the endianness
-+        that is selected here.
-+
- config CPU_BIG_ENDIAN
-        bool "Build big-endian kernel"
-        help
--         Say Y if you plan on running a kernel in big-endian mode.
-+        Say Y if you plan on running a kernel with a big-endian userspace.
-+
-+config CPU_LITTLE_ENDIAN
-+      bool "Build little-endian kernel"
-+      help
-+        Say Y if you plan on running a kernel with a little-endian userspace.
-+        This is usually the case for distributions targeting arm64.
-+
-+endchoice
- 
- config SCHED_MC
-       bool "Multi-core scheduler support"
--- 
-2.42.0
-

diff --git a/queue-4.19/series b/queue-4.19/series
index fad45a57cebb52590020b60e090a953ec1fe8290..8a299078279405916f49dbefc4bb90870c007eec 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -55,7 +55,6 @@ pci-aspm-disable-only-aspm_state_l1-when-driver-disa.patch
 revert-pci-aspm-disable-only-aspm_state_l1-when-driv.patch
 s390-mm-fix-phys-vs-virt-confusion-in-mark_kernel_px.patch
 s390-cmma-fix-detection-of-dat-pages.patch
-arm64-kconfig-add-a-choice-for-endianness.patch
 arm64-make-cpu_big_endian-depend-on-ld.bfd-or-ld.lld.patch
 arm64-restrict-cpu_big_endian-to-gnu-as-or-llvm-ias-.patch
 mtd-cfi_cmdset_0001-support-the-absence-of-protectio.patch

diff --git a/queue-5.4/arm64-kconfig-add-a-choice-for-endianness.patch b/queue-5.4/arm64-kconfig-add-a-choice-for-endianness.patch
deleted file mode 100644 (file)
index 434ab5d..0000000
--- a/queue-5.4/arm64-kconfig-add-a-choice-for-endianness.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 7804e84316eab278104f4a13bdc6a519fcef4ab3 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 13 Nov 2019 10:26:52 +0100
-Subject: arm64: Kconfig: add a choice for endianness
-
-From: Anders Roxell <anders.roxell@linaro.org>
-
-[ Upstream commit d8e85e144bbe12e8d82c6b05d690a34da62cc991 ]
-
-When building allmodconfig KCONFIG_ALLCONFIG=$(pwd)/arch/arm64/configs/defconfig
-CONFIG_CPU_BIG_ENDIAN gets enabled. Which tends not to be what most
-people want. Another concern that has come up is that ACPI isn't built
-for an allmodconfig kernel today since that also depends on !CPU_BIG_ENDIAN.
-
-Rework so that we introduce a 'choice' and default the choice to
-CPU_LITTLE_ENDIAN. That means that when we build an allmodconfig kernel
-it will default to CPU_LITTLE_ENDIAN that most people tends to want.
-
-Reviewed-by: John Garry <john.garry@huawei.com>
-Acked-by: Will Deacon <will@kernel.org>
-Signed-off-by: Anders Roxell <anders.roxell@linaro.org>
-Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
-Stable-dep-of: 146a15b87335 ("arm64: Restrict CPU_BIG_ENDIAN to GNU as or LLVM IAS 15.x or newer")
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm64/Kconfig | 18 +++++++++++++++++-
- 1 file changed, 17 insertions(+), 1 deletion(-)
-
-diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
-index 384b1bf56667c..185262e0e1da3 100644
---- a/arch/arm64/Kconfig
-+++ b/arch/arm64/Kconfig
-@@ -877,10 +877,26 @@ config ARM64_PA_BITS
-       default 48 if ARM64_PA_BITS_48
-       default 52 if ARM64_PA_BITS_52
- 
-+choice
-+      prompt "Endianness"
-+      default CPU_LITTLE_ENDIAN
-+      help
-+        Select the endianness of data accesses performed by the CPU. Userspace
-+        applications will need to be compiled and linked for the endianness
-+        that is selected here.
-+
- config CPU_BIG_ENDIAN
-        bool "Build big-endian kernel"
-        help
--         Say Y if you plan on running a kernel in big-endian mode.
-+        Say Y if you plan on running a kernel with a big-endian userspace.
-+
-+config CPU_LITTLE_ENDIAN
-+      bool "Build little-endian kernel"
-+      help
-+        Say Y if you plan on running a kernel with a little-endian userspace.
-+        This is usually the case for distributions targeting arm64.
-+
-+endchoice
- 
- config SCHED_MC
-       bool "Multi-core scheduler support"
--- 
-2.42.0
-

diff --git a/queue-5.4/series b/queue-5.4/series
index eca2ba23a0718c1f5810cb743037555e6970c267..69f85e255b6db48563d314b00a8ca875336f7dd3 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -74,7 +74,6 @@ perf-intel-pt-fix-async-branch-flags.patch
 smb3-fix-touch-h-of-symlink.patch
 s390-mm-fix-phys-vs-virt-confusion-in-mark_kernel_px.patch
 s390-cmma-fix-detection-of-dat-pages.patch
-arm64-kconfig-add-a-choice-for-endianness.patch
 arm64-make-cpu_big_endian-depend-on-ld.bfd-or-ld.lld.patch
 arm64-restrict-cpu_big_endian-to-gnu-as-or-llvm-ias-.patch
 mtd-cfi_cmdset_0001-support-the-absence-of-protectio.patch