Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

[mirror_ubuntu-bionic-kernel.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 9eb4b77114994877b247c1d165f3920f680cc7e6..8d14531846b95bfa3564b58ccfb7913a034323b8 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -7,10 +7,12 @@
 #
 .*
 *.o
+*.o.*
 *.a
 *.s
 *.ko
 *.so
+*.so.dbg
 *.mod.c
 *.i
 *.lst
@@ -22,8 +24,10 @@
 tags
 TAGS
 vmlinux*
+!vmlinux.lds.S
 System.map
 Module.symvers
+!.gitignore
 
 #
 # Generated include files
@@ -42,3 +46,9 @@ patches-*
 # quilt's files
 patches
 series
+
+# cscope files
+cscope.*
+
+*.orig
+*.rej