summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWANG Cong <xiyou.wangcong@gmail.com>2010-03-05 13:42:34 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-03-06 11:26:28 -0800
commit3b2a8c8f3c65c08bd737b30d3ceee732ed84813a (patch)
tree8b6f68ecb1d0719d6540834ab75544336cc33b35
parent03315b59165ee2049a4b903a1b0b8bf673d701fa (diff)
downloadlinux-3b2a8c8f3c65c08bd737b30d3ceee732ed84813a.tar.bz2
um: tell git to ignore generated files
Tell git to ignore the generated files under um, except: include/shared/kern_constants.h include/shared/user_constants.h which will be moved to include/generated. Signed-off-by: WANG Cong <xiyou.wangcong@gmail.com> Cc: Al Viro <viro@zeniv.linux.org.uk> Cc: Jeff Dike <jdike@addtoit.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--.gitignore1
-rw-r--r--arch/um/.gitignore3
2 files changed, 4 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index de6344e15706..efab0ebec859 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,6 +36,7 @@ modules.builtin
#
tags
TAGS
+linux
vmlinux
vmlinuz
System.map
diff --git a/arch/um/.gitignore b/arch/um/.gitignore
new file mode 100644
index 000000000000..a73d3a1cc746
--- /dev/null
+++ b/arch/um/.gitignore
@@ -0,0 +1,3 @@
+kernel/config.c
+kernel/config.tmp
+kernel/vmlinux.lds