LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: "tip-bot2 for Lukas Bulwahn" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Randy Dunlap <rdunlap@infradead.org>,
	Lukas Bulwahn <lukas.bulwahn@gmail.com>,
	Borislav Petkov <bp@suse.de>, <stable@vger.kernel.org>,
	x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: x86/urgent] x86/Kconfig: Correct reference to MWINCHIP3D
Date: Wed, 06 Oct 2021 17:38:56 -0000	[thread overview]
Message-ID: <163354193670.25758.5025436280764758118.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20210803113531.30720-4-lukas.bulwahn@gmail.com>

The following commit has been merged into the x86/urgent branch of tip:

Commit-ID:     225bac2dc5d192e55f2c50123ee539b1edf8a411
Gitweb:        https://git.kernel.org/tip/225bac2dc5d192e55f2c50123ee539b1edf8a411
Author:        Lukas Bulwahn <lukas.bulwahn@gmail.com>
AuthorDate:    Tue, 03 Aug 2021 13:35:25 +02:00
Committer:     Borislav Petkov <bp@suse.de>
CommitterDate: Wed, 06 Oct 2021 18:46:06 +02:00

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 <rdunlap@infradead.org>
Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: <stable@vger.kernel.org>
Link: https://lkml.kernel.org/r/20210803113531.30720-4-lukas.bulwahn@gmail.com
---
 arch/x86/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index ab83c22..8055da4 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -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

  parent reply	other threads:[~2021-10-06 17:39 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-03 11:35 [PATCH 0/9] Kconfig symbol clean-up on ./arch/x86/ Lukas Bulwahn
2021-08-03 11:35 ` [PATCH 1/9] x86/entry: correct reference to intended CONFIG_64_BIT Lukas Bulwahn
2021-10-05 10:32   ` [tip: x86/urgent] x86/entry: Correct " tip-bot2 for Lukas Bulwahn
2021-10-06 17:38   ` tip-bot2 for Lukas Bulwahn
2021-08-03 11:35 ` [PATCH 2/9] x86, olpc: correct condition to intended CONFIG_OLPC_XO15_SCI Lukas Bulwahn
2021-10-05 22:52   ` [tip: x86/urgent] x86/platform/olpc: Correct ifdef symbol " tip-bot2 for Lukas Bulwahn
2021-10-06 17:38   ` tip-bot2 for Lukas Bulwahn
2021-08-03 11:35 ` [PATCH 3/9] x86/Kconfig: correct reference to MWINCHIP3D Lukas Bulwahn
2021-10-05 22:52   ` [tip: x86/urgent] x86/Kconfig: Correct " tip-bot2 for Lukas Bulwahn
2021-10-06 17:38   ` tip-bot2 for Lukas Bulwahn [this message]
2021-08-03 11:35 ` [PATCH 4/9] x86/Kconfig: remove reference to obsolete MFD_INTEL_MSIC config Lukas Bulwahn
2021-10-06 14:06   ` [tip: x86/cleanups] x86/Kconfig: Remove references to obsolete Kconfig symbols tip-bot2 for Lukas Bulwahn
2021-08-03 11:35 ` [PATCH 5/9] x86/Kconfig: remove reference to obsolete APB_TIMER config Lukas Bulwahn
2021-10-05 19:57   ` Borislav Petkov
2021-08-03 11:35 ` [PATCH 6/9] x86/irq: fix slightly wrong reference in comment Lukas Bulwahn
2021-10-06 14:06   ` [tip: x86/cleanups] x86: Fix misspelled Kconfig symbols tip-bot2 for Lukas Bulwahn
2021-08-03 11:35 ` [PATCH 7/9] x86/uaccess: adjust comment for endif of CONFIG_CC_HAS_ASM_GOTO_OUTPUT Lukas Bulwahn
2021-08-03 11:35 ` [PATCH 8/9] x86: page_32.h: adjust comment for endif of CONFIG_X86_USE_3DNOW Lukas Bulwahn
2021-08-03 11:35 ` [PATCH 9/9] x86: ia32.h: adjust comment for endif of CONFIG_IA32_EMULATION Lukas Bulwahn
2021-10-05 19:59   ` Borislav Petkov
2021-08-03 14:32 ` [PATCH 0/9] Kconfig symbol clean-up on ./arch/x86/ Dave Hansen
2021-08-03 15:12   ` Lukas Bulwahn
2021-08-03 15:40     ` Dave Hansen
2021-12-22 13:00       ` Lukas Bulwahn
2021-08-03 21:49 ` Randy Dunlap

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=163354193670.25758.5025436280764758118.tip-bot2@tip-bot2 \
    --to=tip-bot2@linutronix.de \
    --cc=bp@suse.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=lukas.bulwahn@gmail.com \
    --cc=rdunlap@infradead.org \
    --cc=stable@vger.kernel.org \
    --cc=x86@kernel.org \
    --subject='Re: [tip: x86/urgent] x86/Kconfig: Correct reference to MWINCHIP3D' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).