From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 20 Jan 2021 10:52:59 +0000 (+0100)
Subject: 5.10-stable patches
X-Git-Tag: v4.4.253~34
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5d488ebcca133a4c261b935a73ac19a7e8cf3052;p=thirdparty%2Fkernel%2Fstable-queue.git

5.10-stable patches

added patches:
	revert-kconfig-remove-kvmconfig-and-xenconfig-shorthands.patch
---

diff --git a/queue-5.10/revert-kconfig-remove-kvmconfig-and-xenconfig-shorthands.patch b/queue-5.10/revert-kconfig-remove-kvmconfig-and-xenconfig-shorthands.patch
new file mode 100644
index 00000000000..325bdcb9bf0
--- /dev/null
+++ b/queue-5.10/revert-kconfig-remove-kvmconfig-and-xenconfig-shorthands.patch
@@ -0,0 +1,43 @@
+From 4b14ebf1157c27c2501087dca41b568f33922725 Mon Sep 17 00:00:00 2001
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Date: Wed, 20 Jan 2021 11:48:09 +0100
+Subject: Revert "kconfig: remove 'kvmconfig' and 'xenconfig' shorthands"
+
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+This reverts commit 17a08680ab6a6c057949cb48c352933e09ea377a which is
+commit 9bba03d4473df0b707224d4d2067b62d1e1e2a77 upstream.
+
+As Pavel says at Link: https://lore.kernel.org/r/20210119182837.GA18123@duo.ucw.cz
+	I don't believe this is suitable for stable.
+
+And he's right.  It is "after" 5.10.0, but we want to keep these targets
+for all of the 5.10.y series.
+
+Reported-by: Pavel Machek <pavel@ucw.cz>
+Cc: Masahiro Yamada <masahiroy@kernel.org>
+Cc: Sasha Levin <sashal@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ scripts/kconfig/Makefile |   10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+--- a/scripts/kconfig/Makefile
++++ b/scripts/kconfig/Makefile
+@@ -94,6 +94,16 @@ configfiles=$(wildcard $(srctree)/kernel
+ 	$(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
diff --git a/queue-5.10/series b/queue-5.10/series
new file mode 100644
index 00000000000..3a029d03eee
--- /dev/null
+++ b/queue-5.10/series
@@ -0,0 +1 @@
+revert-kconfig-remove-kvmconfig-and-xenconfig-shorthands.patch