summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2021-04-08 19:32:13 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2021-04-08 19:32:13 +1000
commit6aa61eea701ce3bf707f632fd2ced4e8410acd19 (patch)
treeaccc3e433d0663cf2c9605c1b48c3096d9a86a26 /.gitignore
parent03bdecc47d5b4448339098f499767c2985570b0c (diff)
parentadd74f8473c5ca7d8947c760ff355df991a259bb (diff)
downloadlinux-next-6aa61eea701ce3bf707f632fd2ced4e8410acd19.tar.gz
Merge remote-tracking branch 'rust/rust-next'
# Conflicts: # Makefile
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index df8d3146a43f..fb09c05ff416 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,6 +37,7 @@
*.o
*.o.*
*.patch
+*.rmeta
*.s
*.so
*.so.dbg
@@ -98,6 +99,7 @@ modules.order
!.gitattributes
!.gitignore
!.mailmap
+!.rustfmt.toml
#
# Generated include files