From 61bee20445935ee9802d25c261849440497497d3 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Mon, 25 Aug 2008 04:51:27 -0400 Subject: x86, um: get rid of arch/um/Kconfig.arch Teach scripts/kconfig/Makefile and top-level Makefile that arch/*/Makefile is allowed to say Kconfig := . Rewrite arch/um/Kconfig and arch/um/Kconfig. so that the latter would be top-level one (and include the pieces of the former). Signed-off-by: Al Viro Signed-off-by: H. Peter Anvin --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 16e3fbb968a..f6703f1cd9c 100644 --- a/Makefile +++ b/Makefile @@ -437,7 +437,7 @@ ifeq ($(config-targets),1) # KBUILD_DEFCONFIG may point out an alternative default configuration # used for 'make defconfig' include $(srctree)/arch/$(SRCARCH)/Makefile -export KBUILD_DEFCONFIG +export KBUILD_DEFCONFIG KBUILD_KCONFIG config %config: scripts_basic outputmakefile FORCE $(Q)mkdir -p include/linux include/config -- cgit v1.2.3 From 57f8f7b60db6f1ed2c6918ab9230c4623a9dbe37 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Thu, 23 Oct 2008 20:06:52 -0700 Subject: Linux 2.6.28-rc1 --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index f6703f1cd9c..8e540515cb9 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,8 @@ VERSION = 2 PATCHLEVEL = 6 -SUBLEVEL = 27 -EXTRAVERSION = -NAME = Rotary Wombat +SUBLEVEL = 28 +EXTRAVERSION = -rc1 +NAME = Killer Bat of Doom # *DOCUMENTATION* # To see a list of typical targets execute "make help" -- cgit v1.2.3 From 0173a3265b228da319ceb9c1ec6a5682fd1b2d92 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Sun, 26 Oct 2008 12:13:29 -0700 Subject: Linux 2.6.28-rc2 .. fix all the worst problems in -rc1 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 8e540515cb9..e9c5d47f31c 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ VERSION = 2 PATCHLEVEL = 6 SUBLEVEL = 28 -EXTRAVERSION = -rc1 +EXTRAVERSION = -rc2 NAME = Killer Bat of Doom # *DOCUMENTATION* -- cgit v1.2.3