Merge git://git.infradead.org/mtd-2.6

[linux-2.6.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 8d15830b883d8f715b06aa5f028e5013d637acb3..b93fb7eff94286c7a15d475fa581dac32a89b0db 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -3,27 +3,43 @@
 # subdirectories here. Add them in the ".gitignore" file
 # in that subdirectory instead.
 #
+# NOTE! Please use 'git ls-files -i --exclude-standard'
+# command after changing this file, to see if there are
+# any tracked files which get ignored after the change.
+#
 # Normal rules
 #
 .*
 *.o
+*.o.*
 *.a
 *.s
 *.ko
 *.so
+*.so.dbg
 *.mod.c
 *.i
 *.lst
 *.symtypes
+*.order
+*.elf
+*.bin
+*.gz
+*.lzma
+*.patch
+*.gcno
 
 #
 # Top-level generic files
 #
 tags
 TAGS
-vmlinux*
+vmlinux
 System.map
+Module.markers
 Module.symvers
+!.gitignore
+!.mailmap
 
 #
 # Generated include files
@@ -35,6 +51,8 @@ include/linux/autoconf.h
 include/linux/compile.h
 include/linux/version.h
 include/linux/utsrelease.h
+include/linux/bounds.h
+include/generated
 
 # stgit generated dirs
 patches-*
@@ -45,6 +63,14 @@ series
 
 # cscope files
 cscope.*
+ncscope.*
+
+# gnu global files
+GPATH
+GRTAGS
+GSYMS
+GTAGS
 
 *.orig
-*.rej
+*~
+\#*#