diff options
author | Mark Brown | 2019-05-20 11:53:50 +0100 |
---|---|---|
committer | Mark Brown | 2019-05-20 11:53:50 +0100 |
commit | 1c7c3237c0cc4ad3c7b0df458290c8e2a652f178 (patch) | |
tree | d5d027d4dbdae390c736a82e16c57966214e2c0a /.gitignore | |
parent | bfa8130f50a63563eae10ef933fe01b50b3e87a0 (diff) | |
parent | a188339ca5a396acc588e5851ed7e19f66b0ebd9 (diff) |
Merge tag 'v5.2-rc1' into asoc-5.3
Linux 5.2-rc1
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/.gitignore b/.gitignore index a20ac26aa2f5..7587ef56b92d 100644 --- a/.gitignore +++ b/.gitignore @@ -58,6 +58,7 @@ modules.builtin /vmlinuz /System.map /Module.markers +/modules.builtin.modinfo # # RPM spec file (make rpm-pkg) @@ -80,20 +81,22 @@ modules.builtin /tar-install/ # -# git files that we don't want to ignore even if they are dot-files +# We don't want to ignore the following even if they are dot-files # +!.clang-format +!.cocciconfig +!.get_maintainer.ignore +!.gitattributes !.gitignore !.mailmap -!.cocciconfig -!.clang-format # # Generated include files # -include/config -include/generated -include/ksym -arch/*/include/generated +/include/config/ +/include/generated/ +/include/ksym/ +/arch/*/include/generated/ # stgit generated dirs patches-* @@ -129,7 +132,12 @@ signing_key.x509 x509.genkey # Kconfig presets -all.config +/all.config +/alldef.config +/allmod.config +/allno.config +/allrandom.config +/allyes.config # Kdevelop4 *.kdev4 |