diff --git a/.gitignore b/.gitignore
index 060a71d41ad..8d15830b883 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,3 +45,6 @@ series
 
 # cscope files
 cscope.*
+
+*.orig
+*.rej
diff --git a/usr/.gitignore b/usr/.gitignore
index be186a82e8d..69b2e89fa16 100644
--- a/usr/.gitignore
+++ b/usr/.gitignore
@@ -5,3 +5,4 @@ gen_init_cpio
 initramfs_data.cpio
 initramfs_data.cpio.gz
 initramfs_list
+include