FAILED: patch "[PATCH] x86/Kconfig: Correct reference to MWINCHIP3D" failed to apply to 5.4-stable tree

PATCH [email protected] 2 participants 2 messages Oct 11, 2021

Subsystems (2)

Stable branch x86

lore

Share & tools

lore

[email protected]

author maintainer

2021-10-11 07:39 UTC #0 lore raw

The patch below does not apply to the 5.4-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 225bac2dc5d192e55f2c50123ee539b1edf8a411 Mon Sep 17 00:00:00 2001
From: Lukas Bulwahn <[email protected]>
Date: Tue, 3 Aug 2021 13:35:25 +0200
Subject: [PATCH] x86/Kconfig: Correct reference to MWINCHIP3D

Commit in Fixes intended to exclude the Winchip series and referred to CONFIG_WINCHIP3D, but the config symbol is called CONFIG_MWINCHIP3D.

Hence, scripts/checkkconfigsymbols.py warns:

WINCHIP3D
Referencing files: arch/x86/Kconfig

Correct the reference to the intended config symbol.

Fixes 69b8d3fcabdc ("x86/Kconfig: Exclude i586-class CPUs lacking PAE support from the HIGHMEM64G Kconfig group")

Signed-off-by Lukas Bulwahn <[email protected]>

Signed-off-by Borislav Petkov <[email protected]>

Cc <[email protected]>

Link https://lkml.kernel.org/r/[email protected] open here

arch/x86/Kconfig +1 -1

index ab83c22d274e..8055da49f1c0 100644
@@ -1405,7 +1405,7 @@ config HIGHMEM4G
 
 config HIGHMEM64G
 	bool "64GB"
-	depends on !M486SX && !M486 && !M586 && !M586TSC && !M586MMX && !MGEODE_LX && !MGEODEGX1 && !MCYRIXIII && !MELAN && !MWINCHIPC6 && !WINCHIP3D && !MK6
+	depends on !M486SX && !M486 && !M586 && !M586TSC && !M586MMX && !MGEODE_LX && !MGEODEGX1 && !MCYRIXIII && !MELAN && !MWINCHIPC6 && !MWINCHIP3D && !MK6
 	select X86_PAE
 	help
 	  Select this if you have a 32-bit processor and more than 4

Lukas Bulwahn

2021-10-11 12:17 UTC #1 lore raw

Quoted 7 lines · On Mon, Oct 11, 2021 at 9:39 AM <[email protected]> wrote:

The patch below does not apply to the 5.4-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

I have provided a manually adjusted patch here:

https://lore.kernel.org/stable/[email protected]/

I hope you can pick this up for all stable releases for v5.4 and before.

Lukas

Quoted 42 lines

thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 225bac2dc5d192e55f2c50123ee539b1edf8a411 Mon Sep 17 00:00:00 2001
From: Lukas Bulwahn <[email protected]>
Date: Tue, 3 Aug 2021 13:35:25 +0200
Subject: [PATCH] x86/Kconfig: Correct reference to MWINCHIP3D
Commit in Fixes intended to exclude the Winchip series and referred to CONFIG_WINCHIP3D, but the config symbol is called CONFIG_MWINCHIP3D.
Hence, scripts/checkkconfigsymbols.py warns:
WINCHIP3D
Referencing files: arch/x86/Kconfig
Correct the reference to the intended config symbol.
Fixes 69b8d3fcabdc ("x86/Kconfig: Exclude i586-class CPUs lacking PAE support from the HIGHMEM64G Kconfig group")
Suggested-by Randy Dunlap <[email protected]>
Signed-off-by Lukas Bulwahn <[email protected]>
Signed-off-by Borislav Petkov <[email protected]>
Cc <[email protected]>
Link https://lkml.kernel.org/r/[email protected] open here
arch/x86/Kconfig +1 -1
index ab83c22d274e..8055da49f1c0 100644
@@ -1405,7 +1405,7 @@ config HIGHMEM4G
 
 config HIGHMEM64G
        bool "64GB"
-       depends on !M486SX && !M486 && !M586 && !M586TSC && !M586MMX && !MGEODE_LX && !MGEODEGX1 && !MCYRIXIII && !MELAN && !MWINCHIPC6 && !WINCHIP3D && !MK6
+       depends on !M486SX && !M486 && !M586 && !M586TSC && !M586MMX && !MGEODE_LX && !MGEODEGX1 && !MCYRIXIII && !MELAN && !MWINCHIPC6 && !MWINCHIP3D && !MK6
        select X86_PAE
        help
          Select this if you have a 32-bit processor and more than 4