Merge branch 'upstream'

diff --combined .gitignore
index ea08c2ebb10093c7e12110798d5992ecb578ce15,96f9750de089facd31cc2679fc056c3ab87fa5f4..29f8e520a98c7e838d0d0482552e841832f14518
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -49,6 -49,7 +49,7 @@@ utils/rquotad/rquota
  utils/rquotad/rquota.h
  utils/rquotad/rquota_xdr.c
  utils/showmount/showmount
+ utils/nfsdcld/nfsdcld
  utils/statd/statd
  tools/locktest/testlk
  tools/getiversion/getiversion
@@@ -70,4 -71,3 +71,4 @@@ utils/nfsidmap/nfsidma
  cscope.*
  # generic editor backup et al
  *~
 +.pc