From fb68d4be95fef4aab82c2a97da93a898d532dd57 Mon Sep 17 00:00:00 2001 From: Gerard Snitselaar Date: Sat, 4 Feb 2012 02:55:59 -0700 Subject: kbuild: clean up samples directory Playing around with make randconfig I ended up with CONFIG_SAMPLES set. After cleaning up the build I noticed that git status was showing samples/hidraw/hid-example as an untracked file. Adding samples to clean-dirs seems to solve the problem, but I don't know if that is the correct way to solve the issue. Signed-off-by: Gerard Snitselaar Signed-off-by: Michal Marek --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 71e6ed21dd15..b3c944ef9097 100644 --- a/Makefile +++ b/Makefile @@ -1170,7 +1170,7 @@ MRPROPER_FILES += .config .config.old .version .old_version \ # clean: rm-dirs := $(CLEAN_DIRS) clean: rm-files := $(CLEAN_FILES) -clean-dirs := $(addprefix _clean_, . $(vmlinux-alldirs) Documentation) +clean-dirs := $(addprefix _clean_, . $(vmlinux-alldirs) Documentation samples) PHONY += $(clean-dirs) clean archclean $(clean-dirs): -- cgit v1.2.2 From dd775ae2549217d3ae09363e3edb305d0fa19928 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Sat, 31 Mar 2012 16:24:09 -0700 Subject: Linux 3.4-rc1 --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index fd4b3d038d75..5e637c23974e 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ VERSION = 3 -PATCHLEVEL = 3 +PATCHLEVEL = 4 SUBLEVEL = 0 -EXTRAVERSION = +EXTRAVERSION = -rc1 NAME = Saber-toothed Squirrel # *DOCUMENTATION* -- cgit v1.2.2 From 0034102808e0dbbf3a2394b82b1bb40b5778de9e Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Sat, 7 Apr 2012 18:30:41 -0700 Subject: Linux 3.4-rc2 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 5e637c23974e..0df3d003a079 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ VERSION = 3 PATCHLEVEL = 4 SUBLEVEL = 0 -EXTRAVERSION = -rc1 +EXTRAVERSION = -rc2 NAME = Saber-toothed Squirrel # *DOCUMENTATION* -- cgit v1.2.2