diff mbox series

[5.10,077/152] kconfig: remove kvmconfig and xenconfig shorthands

Message ID 20210118113356.479183926@linuxfoundation.org
State New
Headers show
Series None | expand

Commit Message

Greg Kroah-Hartman Jan. 18, 2021, 11:34 a.m. UTC
From: Masahiro Yamada <masahiroy@kernel.org>

[ Upstream commit 9bba03d4473df0b707224d4d2067b62d1e1e2a77 ]

Linux 5.10 is out. Remove the 'kvmconfig' and 'xenconfig' shorthands
as previously announced.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 scripts/kconfig/Makefile | 10 ----------
 1 file changed, 10 deletions(-)

Comments

Pavel Machek Jan. 19, 2021, 6:28 p.m. UTC | #1
Hi!

> From: Masahiro Yamada <masahiroy@kernel.org>
> 
> [ Upstream commit 9bba03d4473df0b707224d4d2067b62d1e1e2a77 ]
> 
> Linux 5.10 is out. Remove the 'kvmconfig' and 'xenconfig' shorthands
> as previously announced.

I don't believe this is suitable for stable.

Best regards,
								Pavel

> +++ b/scripts/kconfig/Makefile
> @@ -94,16 +94,6 @@ configfiles=$(wildcard $(srctree)/kernel/configs/$@ $(srctree)/arch/$(SRCARCH)/c
>  	$(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh -m .config $(configfiles)
>  	$(Q)$(MAKE) -f $(srctree)/Makefile olddefconfig
>  
> -PHONY += kvmconfig
> -kvmconfig: kvm_guest.config
> -	@echo >&2 "WARNING: 'make $@' will be removed after Linux 5.10"
> -	@echo >&2 "         Please use 'make $<' instead."
> -
> -PHONY += xenconfig
> -xenconfig: xen.config
> -	@echo >&2 "WARNING: 'make $@' will be removed after Linux 5.10"
> -	@echo >&2 "         Please use 'make $<' instead."
> -
>  PHONY += tinyconfig
>  tinyconfig:
>  	$(Q)$(MAKE) -f $(srctree)/Makefile allnoconfig tiny.config
Greg Kroah-Hartman Jan. 20, 2021, 10:38 a.m. UTC | #2
On Tue, Jan 19, 2021 at 07:28:37PM +0100, Pavel Machek wrote:
> Hi!

> 

> > From: Masahiro Yamada <masahiroy@kernel.org>

> > 

> > [ Upstream commit 9bba03d4473df0b707224d4d2067b62d1e1e2a77 ]

> > 

> > Linux 5.10 is out. Remove the 'kvmconfig' and 'xenconfig' shorthands

> > as previously announced.

> 

> I don't believe this is suitable for stable.


Yeah, this doesn't look right, I'll go revert it for the next release,
thanks.

greg k-h
diff mbox series

Patch

diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index e46df0a2d4f9d..2c40e68853dde 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -94,16 +94,6 @@  configfiles=$(wildcard $(srctree)/kernel/configs/$@ $(srctree)/arch/$(SRCARCH)/c
 	$(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh -m .config $(configfiles)
 	$(Q)$(MAKE) -f $(srctree)/Makefile olddefconfig
 
-PHONY += kvmconfig
-kvmconfig: kvm_guest.config
-	@echo >&2 "WARNING: 'make $@' will be removed after Linux 5.10"
-	@echo >&2 "         Please use 'make $<' instead."
-
-PHONY += xenconfig
-xenconfig: xen.config
-	@echo >&2 "WARNING: 'make $@' will be removed after Linux 5.10"
-	@echo >&2 "         Please use 'make $<' instead."
-
 PHONY += tinyconfig
 tinyconfig:
 	$(Q)$(MAKE) -f $(srctree)/Makefile allnoconfig tiny.config