Merge branch 'upstream'

diff --combined .gitignore
index aa579b883838dc004e5ae94c2d14c350032b5626,7bd9921fc1df20fd4d1a87793cd30e7cb15cbd52..ea08c2ebb10093c7e12110798d5992ecb578ce15
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -36,6 -36,7 +36,7 @@@ support/include/stamp-h
  lib*.a
  tools/rpcgen/rpcgen
  tools/rpcdebug/rpcdebug
+ utils/blkmapd/blkmapd
  utils/exportfs/exportfs
  utils/idmapd/idmapd
  utils/lockd/lockd
@@@ -69,4 -70,3 +70,4 @@@ utils/nfsidmap/nfsidma
  cscope.*
  # generic editor backup et al
  *~
 +.pc