All of lore.kernel.org
 help / color / mirror / Atom feed
diff for duplicates of <20080423213337.GG8302@fieldses.org>

diff --git a/a/1.txt b/N1/1.txt
index 87a32c2..025f342 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,108 +1,143 @@
-VGhlIGZvbGxvd2luZyBuZnNkLXJlbGF0ZWQgY2hhbmdlcyBhcmUgYXZhaWxhYmxlIGZyb20gdGhl
-IGZvci1saW51cwpicmFuY2ggb2YgdGhlIGdpdCByZXBvc2l0b3J5IGF0OgoKICBnaXQ6Ly9saW51
-eC1uZnMub3JnL35iZmllbGRzL2xpbnV4LmdpdCBmb3ItbGludXMKCk5vdGhpbmcgZWFydGgtc2hh
-dHRlcmluZzsgbW9zdGx5IG1pc2NlbGxhbmVvdXMgYnVnZml4ZXMgYW5kIGNsZWFudXAsIGZvcgps
-b2NrZCBhbmQgbmZzZC4KCkplZmYgTGF5dG9uJ3MgY29udmVyc2lvbiBvZiBsb2NrZCBhbmQgdGhl
-IE5GU3Y0IGNhbGxiYWNrIHNlcnZlciB0bwprdGhyZWFkcyBpcyBvbmUgb2YgdGhlIGxhcmdlciBw
-aWVjZXMsIENodWNrIGRpZCBhIGJ1bmNoIG9mIGtjb25maWcKY2xlYW51cCwgZXRjLgoKLS1iLgoK
-QWRyaWFuIEJ1bmsgKDEpOgogICAgICBtYWtlIG5mc2RfY3JlYXRlX3NldGF0dHIoKSBzdGF0aWMK
-CkFuZHJldyBNb3J0b24gKDEpOgogICAgICBuZXQvc3VucnBjL3N2Yy5jOiBzdXBwcmVzcyB1bmlu
-dGlhbGl6ZWQgdmFyIHdhcm5pbmcKCkF1csOpbGllbiBDaGFyYm9uICgxKToKICAgICAgSVB2NiBz
-dXBwb3J0IGZvciBORlMgc2VydmVyIGV4cG9ydCBjYWNoZXMKCkNodWNrIExldmVyICgxMik6CiAg
-ICAgIE5GU0Q6IFJlbW92ZSBORlNEX1RDUCBrZXJuZWwgYnVpbGQgb3B0aW9uCiAgICAgIE5GU0Q6
-IFVwZGF0ZSBoZWxwIHRleHQgZm9yIENPTkZJR19ORlNECiAgICAgIE5GU0Q6IE1vdmUgInNlbGVj
-dCBGU19QT1NJWF9BQ0wgaWYgTkZTRF9WNCIKICAgICAgTkZTRDogTW92ZSAic2VsZWN0IE5GU0Rf
-VjJfQUNMIGlmIE5GU0RfVjNfQUNMIgogICAgICBORlNEOiBSZW1vdmUgcmVkdW5kYW50ICJzZWxl
-Y3QiIGNsYXVzZXMgaW4gZnMvS2NvbmZpZwogICAgICBORlNEOiBVc2UgImRlcGVuZHMgb24iIGZv
-ciBQUk9DX0ZTIGRlcGVuZGVuY3kKICAgICAgU1VOUlBDOiBSZW1vdmUgUFJPQ19GUyBkZXBlbmRl
-bmN5CiAgICAgIE5GU0Q6IFJlbW92ZSBORlN2NCBkZXBlbmRlbmN5IG9uIE5GU3YzCiAgICAgIFNV
-TlJQQzogUlBDIHNlcnZlciBzdGlsbCB1c2VzIDIuNCBtZXRob2QgZm9yIGRpc2FibGluZyBUQ1Ag
-TmFnbGUKICAgICAgU1VOUlBDOiBVcGRhdGUgUlBDIHNlcnZlcidzIFRDUCByZWNvcmQgbWFya2Vy
-IGRlY29kZXIKICAgICAgU1VOUlBDOiBVc2UgdW5zaWduZWQgaW5kZXggd2hlbiBsb29waW5nIG92
-ZXIgYXJyYXlzCiAgICAgIFNVTlJQQzogVXNlIHVuc2lnbmVkIGxvb3AgYW5kIGFycmF5IGluZGV4
-IGluIHN2Y19pbml0X2J1ZmZlcigpCgpGZWxpeCBCbHlha2hlciAoMSk6CiAgICAgIG5mc2Q6IGlu
-aXRpYWxpemUgbGVhc2UgdHlwZSBpbiBuZnM0X29wZW5fZGVsZWdhdGlvbigpCgpIYXJzaHVsYSBK
-YXlhc3VyaXlhICgxKToKICAgICAgc3VucnBjOiBHU1MgaW50ZWdyaXR5IGFuZCBkZWNyeXB0aW9u
-IGZhaWx1cmVzIHNob3VsZCByZXR1cm4gR0FSQkFHRV9BUkdTCgpIYXJ2ZXkgSGFycmlzb24gKDMp
-OgogICAgICBsb2NrZDogZml4IHNwYXJzZSB3YXJuaW5nIGluIHN2Y3NoYXJlLmMKICAgICAgbmZz
-ZDogZml4IHNwYXJzZSB3YXJuaW5ncwogICAgICBuZnNkOiBmaXggc3BhcnNlIHdhcm5pbmcgaW4g
-dmZzLmMKCkouIEJydWNlIEZpZWxkcyAoMTIpOgogICAgICBuZnM6IHJlbW92ZSB1bm5lY2Vzc2Fy
-eSBORlNfTkVFRF8qIGRlZmluZXMKICAgICAgbmZzZDQ6IHJlbW92ZSB1bm5lY2Vzc2FyeSBDSEVD
-S19GSCBjaGVjayBpbiBwcmVwcm9jZXNzX3NlcWlkX29wCiAgICAgIG5mc2Q0OiBzaW1wbGlmeSBz
-dGF0ZWlkIHNlcXVlbmNpbmcgY2hlY2tzCiAgICAgIG5mc2Q0OiBraWxsIHVubmVjZXNzYXJ5IGNo
-ZWNrIGluIHByZXByb2Nlc3Nfc3RhdGVpZF9vcAogICAgICBzdmNycGM6IG1vdmUgdW51c2VkIGZp
-ZWxkIGZyb20gY2FjaGVfZGVmZXJyZWRfcmVxCiAgICAgIG5mc2Q6IGNsYXJpZnkgcmVhZGRpci9t
-b3VudHBvaW50LWNyb3NzaW5nIGNvZGUKICAgICAgbG9ja2Q6IGZpeCByYWNlIGluIG5sbV9yZWxl
-YXNlKCkKICAgICAgbG9ja2Q6IGNsZWFuIHVwIF9fbnNtX2ZpbmQoKQogICAgICBsb2NrZDogY29u
-dmVydCBuc21fbXV0ZXggdG8gYSBzcGlubG9jawogICAgICBuZnNkOiBtb3ZlIG1vc3Qgb2YgZmhf
-dmVyaWZ5IHRvIHNlcGFyYXRlIGZ1bmN0aW9uCiAgICAgIGxvY2tkOiBGaXggc3RhbGUgbmxtc3Zj
-X3VubGlua19ibG9jayBjb21tZW50CiAgICAgIG5mc2Q6IGZpeCBjb21tZW50CgpKYW1lcyBMZW50
-aW5pICgxKToKICAgICAgRG9jdW1lbnRhdGlvbjogTkZTL1JETUEgaW5zdHJ1Y3Rpb25zIGZvciAy
-LjYuMjUtcmMxCgpKZWZmIExheXRvbiAoMTApOgogICAgICBTVU5SUEM6IGV4cG9ydCBzdmNfc29j
-a191cGRhdGVfYnVmcwogICAgICBTVU5SUEM6IGhhdmUgc3ZjX3JlY3YoKSBjaGVjayBrdGhyZWFk
-X3Nob3VsZF9zdG9wKCkKICAgICAgTkxNOiBDb252ZXJ0IGxvY2tkIHRvIHVzZSBrdGhyZWFkcwog
-ICAgICBTVU5SUEM6IGFsbG93IHN2Y19yZWN2IHRvIGJyZWFrIG91dCBvZiA1MDBtcyBzbGVlcCB3
-aGVuIGFsbG9jX3BhZ2UgZmFpbHMKICAgICAgTkZTOiBjb252ZXJ0IG5mczQgY2FsbGJhY2sgdGhy
-ZWFkIHRvIGt0aHJlYWQgQVBJCiAgICAgIFNVTlJQQzogcmVtb3ZlIHN2Y19jcmVhdGVfdGhyZWFk
-KCkKICAgICAgTkZTOiBkb24ndCBsZXQgbmZzX2NhbGxiYWNrX3N2YyBleGl0IG9uIHVuZXhwZWN0
-ZWQgc3ZjX3JlY3YgZXJyb3JzICh0cnkgIzIpCiAgICAgIE5MTTogZG9uJ3QgbGV0IGxvY2tkIGV4
-aXQgb24gdW5leHBlY3RlZCBzdmNfcmVjdiBlcnJvcnMgKHRyeSAjMikKICAgICAga25mc2Q6IGdl
-dCByaWQgb2YgaW1vZGUgdmFyaWFibGUgaW4gbmZzZF9zZXRhdHRyCiAgICAgIGtuZnNkOiBjbGVh
-ciBib3RoIHNldHVpZCBhbmQgc2V0Z2lkIHdoZW5ldmVyIGEgY2hvd24gaXMgZG9uZQoKS2V2aW4g
-Q29mZm1hbiAoNCk6CiAgICAgIENvcnJlY3QgZ3JhbW1lci90eXBvcyBpbiBkcHJpbnRrcwogICAg
-ICBSZW1vdmUgZGVmaW5lIGZvciBLUkI1X0NLU1VNX0xFTkdUSCwgd2hpY2ggd2lsbCBiZWNvbWUg
-ZW5jdHlwZS1kZXBlbmRlbnQKICAgICAgZ3NzX2tyYjU6IGNvbnNpc3RlbnRseSB1c2UgdW5zaWdu
-ZWQgZm9yIHNlcW51bQogICAgICBzdW5ycGM6IG1ha2UgdG9rZW4gaGVhZGVyIHZhbHVlcyBsZXNz
-IGNvbmZ1c2luZwoKTmVpbEJyb3duICgxKToKICAgICAga25mc2Q6IFJlbW92ZSBOTE1fSE9TVF9N
-QVggYW5kIGFzc29jaWF0ZWQgbG9naWMuCgpPbGdhIEtvcm5pZXZza2FpYSAoMSk6CiAgICAgIG5m
-c2Q6IHVzZSBzdGF0aWMgbWVtb3J5IGZvciBjYWxsYmFjayBwcm9ncmFtIGFuZCBzdGF0cwoKUm9i
-ZXJ0IFAuIEouIERheSAoMSk6CiAgICAgIE5GU0Q6IFN0cmlwIF9fS0VSTkVMX18gdGVzdGluZyBm
-cm9tIHVuZXhwb3J0ZWQgaGVhZGVyIGZpbGVzLgoKU3RldmVuIFdoaXRlaG91c2UgKDEpOgogICAg
-ICBVc2UgYSB6ZXJvIHNpemVkIGFycmF5IGZvciByYXcgZmllbGQgaW4gc3RydWN0IGZpZAoKVG9t
-IFR1Y2tlciAoMSk6CiAgICAgIFNWQ1JETUE6IEFkZCBjaGVjayBmb3IgWFBUX0NMT1NFIGluIHN2
-Y19yZG1hX3NlbmQKCiBEb2N1bWVudGF0aW9uL2ZpbGVzeXN0ZW1zL25mcy1yZG1hLnR4dCAgIHwg
-IDI1MiArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysKIGZzL0tjb25maWcgICAgICAgICAg
-ICAgICAgICAgICAgICAgICAgICAgfCAgMTA5ICsrKysrKystLS0tLS0KIGZzL2xvY2tkL2hvc3Qu
-YyAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgIDczICsrKysrLS0tLS0KIGZzL2xvY2tkL3N2
-Yy5jICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgMTUwICsrKysrKysrLS0tLS0tLS0tLQog
-ZnMvbG9ja2Qvc3ZjbG9jay5jICAgICAgICAgICAgICAgICAgICAgICB8ICAgIDYgKy0KIGZzL2xv
-Y2tkL3N2Y3NoYXJlLmMgICAgICAgICAgICAgICAgICAgICAgfCAgICAzICstCiBmcy9uZnMvY2Fs
-bGJhY2suYyAgICAgICAgICAgICAgICAgICAgICAgIHwgICA5MyArKysrKystLS0tLS0KIGZzL25m
-cy9zeW1saW5rLmMgICAgICAgICAgICAgICAgICAgICAgICAgfCAgICAxIC0KIGZzL25mc2QvYXV0
-aC5jICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgICAxICsKIGZzL25mc2QvZXhwb3J0LmMg
-ICAgICAgICAgICAgICAgICAgICAgICAgfCAgICA5ICstCiBmcy9uZnNkL25mczRjYWxsYmFjay5j
-ICAgICAgICAgICAgICAgICAgIHwgICAyOCArKy0tCiBmcy9uZnNkL25mczRpZG1hcC5jICAgICAg
-ICAgICAgICAgICAgICAgIHwgICAgMiArLQogZnMvbmZzZC9uZnM0c3RhdGUuYyAgICAgICAgICAg
-ICAgICAgICAgICB8ICAgNzEgKysrKystLS0tCiBmcy9uZnNkL25mczR4ZHIuYyAgICAgICAgICAg
-ICAgICAgICAgICAgIHwgICAxMyArKy0KIGZzL25mc2QvbmZzY3RsLmMgICAgICAgICAgICAgICAg
-ICAgICAgICAgfCAgIDIyICsrLQogZnMvbmZzZC9uZnNmaC5jICAgICAgICAgICAgICAgICAgICAg
-ICAgICB8ICAyMjggKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLQogZnMvbmZzZC9uZnNzdmMu
-YyAgICAgICAgICAgICAgICAgICAgICAgICB8ICAgIDIgLQogZnMvbmZzZC92ZnMuYyAgICAgICAg
-ICAgICAgICAgICAgICAgICAgICB8ICAgMzUgKystLQogaW5jbHVkZS9saW51eC9leHBvcnRmcy5o
-ICAgICAgICAgICAgICAgICB8ICAgIDIgKy0KIGluY2x1ZGUvbGludXgvbmZzMy5oICAgICAgICAg
-ICAgICAgICAgICAgfCAgICAyICstCiBpbmNsdWRlL2xpbnV4L25mc2QvS2J1aWxkICAgICAgICAg
-ICAgICAgIHwgICAgNCArLQogaW5jbHVkZS9saW51eC9uZnNkL2NhY2hlLmggICAgICAgICAgICAg
-ICB8ICAgIDIgLQogaW5jbHVkZS9saW51eC9uZnNkL25mc2QuaCAgICAgICAgICAgICAgICB8ICAg
-MTEgKy0KIGluY2x1ZGUvbGludXgvc3VucnBjL2NhY2hlLmggICAgICAgICAgICAgfCAgICAxIC0K
-IGluY2x1ZGUvbGludXgvc3VucnBjL2dzc19rcmI1LmggICAgICAgICAgfCAgICA2ICstCiBpbmNs
-dWRlL2xpbnV4L3N1bnJwYy9zdmMuaCAgICAgICAgICAgICAgIHwgICAgMSAtCiBpbmNsdWRlL2xp
-bnV4L3N1bnJwYy9zdmNhdXRoLmggICAgICAgICAgIHwgICAgNSArLQogaW5jbHVkZS9saW51eC9z
-dW5ycGMvc3Zjc29jay5oICAgICAgICAgICB8ICAgIDQgKy0KIGluY2x1ZGUvbmV0L2lwdjYuaCAg
-ICAgICAgICAgICAgICAgICAgICAgfCAgICA5ICsKIG5ldC9zdW5ycGMvYXV0aF9nc3MvZ3NzX2dl
-bmVyaWNfdG9rZW4uYyAgfCAgICA0ICstCiBuZXQvc3VucnBjL2F1dGhfZ3NzL2dzc19rcmI1X2Ny
-eXB0by5jICAgIHwgICAgNiArLQogbmV0L3N1bnJwYy9hdXRoX2dzcy9nc3Nfa3JiNV9zZWFsLmMg
-ICAgICB8ICAgIDkgKy0KIG5ldC9zdW5ycGMvYXV0aF9nc3MvZ3NzX2tyYjVfc2VxbnVtLmMgICAg
-fCAgICA0ICstCiBuZXQvc3VucnBjL2F1dGhfZ3NzL2dzc19rcmI1X3Vuc2VhbC5jICAgIHwgICAg
-MiArLQogbmV0L3N1bnJwYy9hdXRoX2dzcy9nc3Nfa3JiNV93cmFwLmMgICAgICB8ICAgIDggKy0K
-IG5ldC9zdW5ycGMvYXV0aF9nc3MvZ3NzX3Nwa20zX3NlYWwuYyAgICAgfCAgICA0ICstCiBuZXQv
-c3VucnBjL2F1dGhfZ3NzL3N2Y2F1dGhfZ3NzLmMgICAgICAgIHwgICAgOSArLQogbmV0L3N1bnJw
-Yy9jYWNoZS5jICAgICAgICAgICAgICAgICAgICAgICB8ICAgIDEgLQogbmV0L3N1bnJwYy9zdmMu
-YyAgICAgICAgICAgICAgICAgICAgICAgICB8ICAgMjUgKy0tCiBuZXQvc3VucnBjL3N2Y194cHJ0
-LmMgICAgICAgICAgICAgICAgICAgIHwgICAzMCArKystCiBuZXQvc3VucnBjL3N2Y2F1dGhfdW5p
-eC5jICAgICAgICAgICAgICAgIHwgIDExOCArKysrKysrKysrLS0tLS0KIG5ldC9zdW5ycGMvc3Zj
-c29jay5jICAgICAgICAgICAgICAgICAgICAgfCAgIDI5ICsrLS0KIG5ldC9zdW5ycGMveHBydHJk
-bWEvc3ZjX3JkbWFfdHJhbnNwb3J0LmMgfCAgICAyICsKIDQzIGZpbGVzIGNoYW5nZWQsIDg3OSBp
-bnNlcnRpb25zKCspLCA1MTcgZGVsZXRpb25zKC0pCiBjcmVhdGUgbW9kZSAxMDA2NDQgRG9jdW1l
-bnRhdGlvbi9maWxlc3lzdGVtcy9uZnMtcmRtYS50eHQKX19fX19fX19fX19fX19fX19fX19fX19f
-X19fX19fX19fX19fX19fX19fX19fX18KTkZTdjQgbWFpbGluZyBsaXN0Ck5GU3Y0QGxpbnV4LW5m
-cy5vcmcKaHR0cDovL2xpbnV4LW5mcy5vcmcvY2dpLWJpbi9tYWlsbWFuL2xpc3RpbmZvL25mc3Y0
+The following nfsd-related changes are available from the for-linus
+branch of the git repository at:
+
+  git://linux-nfs.org/~bfields/linux.git for-linus
+
+Nothing earth-shattering; mostly miscellaneous bugfixes and cleanup, for
+lockd and nfsd.
+
+Jeff Layton's conversion of lockd and the NFSv4 callback server to
+kthreads is one of the larger pieces, Chuck did a bunch of kconfig
+cleanup, etc.
+
+--b.
+
+Adrian Bunk (1):
+      make nfsd_create_setattr() static
+
+Andrew Morton (1):
+      net/sunrpc/svc.c: suppress unintialized var warning
+
+Aurélien Charbon (1):
+      IPv6 support for NFS server export caches
+
+Chuck Lever (12):
+      NFSD: Remove NFSD_TCP kernel build option
+      NFSD: Update help text for CONFIG_NFSD
+      NFSD: Move "select FS_POSIX_ACL if NFSD_V4"
+      NFSD: Move "select NFSD_V2_ACL if NFSD_V3_ACL"
+      NFSD: Remove redundant "select" clauses in fs/Kconfig
+      NFSD: Use "depends on" for PROC_FS dependency
+      SUNRPC: Remove PROC_FS dependency
+      NFSD: Remove NFSv4 dependency on NFSv3
+      SUNRPC: RPC server still uses 2.4 method for disabling TCP Nagle
+      SUNRPC: Update RPC server's TCP record marker decoder
+      SUNRPC: Use unsigned index when looping over arrays
+      SUNRPC: Use unsigned loop and array index in svc_init_buffer()
+
+Felix Blyakher (1):
+      nfsd: initialize lease type in nfs4_open_delegation()
+
+Harshula Jayasuriya (1):
+      sunrpc: GSS integrity and decryption failures should return GARBAGE_ARGS
+
+Harvey Harrison (3):
+      lockd: fix sparse warning in svcshare.c
+      nfsd: fix sparse warnings
+      nfsd: fix sparse warning in vfs.c
+
+J. Bruce Fields (12):
+      nfs: remove unnecessary NFS_NEED_* defines
+      nfsd4: remove unnecessary CHECK_FH check in preprocess_seqid_op
+      nfsd4: simplify stateid sequencing checks
+      nfsd4: kill unnecessary check in preprocess_stateid_op
+      svcrpc: move unused field from cache_deferred_req
+      nfsd: clarify readdir/mountpoint-crossing code
+      lockd: fix race in nlm_release()
+      lockd: clean up __nsm_find()
+      lockd: convert nsm_mutex to a spinlock
+      nfsd: move most of fh_verify to separate function
+      lockd: Fix stale nlmsvc_unlink_block comment
+      nfsd: fix comment
+
+James Lentini (1):
+      Documentation: NFS/RDMA instructions for 2.6.25-rc1
+
+Jeff Layton (10):
+      SUNRPC: export svc_sock_update_bufs
+      SUNRPC: have svc_recv() check kthread_should_stop()
+      NLM: Convert lockd to use kthreads
+      SUNRPC: allow svc_recv to break out of 500ms sleep when alloc_page fails
+      NFS: convert nfs4 callback thread to kthread API
+      SUNRPC: remove svc_create_thread()
+      NFS: don't let nfs_callback_svc exit on unexpected svc_recv errors (try #2)
+      NLM: don't let lockd exit on unexpected svc_recv errors (try #2)
+      knfsd: get rid of imode variable in nfsd_setattr
+      knfsd: clear both setuid and setgid whenever a chown is done
+
+Kevin Coffman (4):
+      Correct grammer/typos in dprintks
+      Remove define for KRB5_CKSUM_LENGTH, which will become enctype-dependent
+      gss_krb5: consistently use unsigned for seqnum
+      sunrpc: make token header values less confusing
+
+NeilBrown (1):
+      knfsd: Remove NLM_HOST_MAX and associated logic.
+
+Olga Kornievskaia (1):
+      nfsd: use static memory for callback program and stats
+
+Robert P. J. Day (1):
+      NFSD: Strip __KERNEL__ testing from unexported header files.
+
+Steven Whitehouse (1):
+      Use a zero sized array for raw field in struct fid
+
+Tom Tucker (1):
+      SVCRDMA: Add check for XPT_CLOSE in svc_rdma_send
+
+ Documentation/filesystems/nfs-rdma.txt   |  252 ++++++++++++++++++++++++++++++
+ fs/Kconfig                               |  109 +++++++------
+ fs/lockd/host.c                          |   73 +++++-----
+ fs/lockd/svc.c                           |  150 ++++++++----------
+ fs/lockd/svclock.c                       |    6 +-
+ fs/lockd/svcshare.c                      |    3 +-
+ fs/nfs/callback.c                        |   93 ++++++------
+ fs/nfs/symlink.c                         |    1 -
+ fs/nfsd/auth.c                           |    1 +
+ fs/nfsd/export.c                         |    9 +-
+ fs/nfsd/nfs4callback.c                   |   28 ++--
+ fs/nfsd/nfs4idmap.c                      |    2 +-
+ fs/nfsd/nfs4state.c                      |   71 +++++----
+ fs/nfsd/nfs4xdr.c                        |   13 ++-
+ fs/nfsd/nfsctl.c                         |   22 ++-
+ fs/nfsd/nfsfh.c                          |  228 +++++++++++++++-------------
+ fs/nfsd/nfssvc.c                         |    2 -
+ fs/nfsd/vfs.c                            |   35 ++--
+ include/linux/exportfs.h                 |    2 +-
+ include/linux/nfs3.h                     |    2 +-
+ include/linux/nfsd/Kbuild                |    4 +-
+ include/linux/nfsd/cache.h               |    2 -
+ include/linux/nfsd/nfsd.h                |   11 +-
+ include/linux/sunrpc/cache.h             |    1 -
+ include/linux/sunrpc/gss_krb5.h          |    6 +-
+ include/linux/sunrpc/svc.h               |    1 -
+ include/linux/sunrpc/svcauth.h           |    5 +-
+ include/linux/sunrpc/svcsock.h           |    4 +-
+ include/net/ipv6.h                       |    9 +
+ net/sunrpc/auth_gss/gss_generic_token.c  |    4 +-
+ net/sunrpc/auth_gss/gss_krb5_crypto.c    |    6 +-
+ net/sunrpc/auth_gss/gss_krb5_seal.c      |    9 +-
+ net/sunrpc/auth_gss/gss_krb5_seqnum.c    |    4 +-
+ net/sunrpc/auth_gss/gss_krb5_unseal.c    |    2 +-
+ net/sunrpc/auth_gss/gss_krb5_wrap.c      |    8 +-
+ net/sunrpc/auth_gss/gss_spkm3_seal.c     |    4 +-
+ net/sunrpc/auth_gss/svcauth_gss.c        |    9 +-
+ net/sunrpc/cache.c                       |    1 -
+ net/sunrpc/svc.c                         |   25 +--
+ net/sunrpc/svc_xprt.c                    |   30 +++-
+ net/sunrpc/svcauth_unix.c                |  118 ++++++++++-----
+ net/sunrpc/svcsock.c                     |   29 ++--
+ net/sunrpc/xprtrdma/svc_rdma_transport.c |    2 +
+ 43 files changed, 879 insertions(+), 517 deletions(-)
+ create mode 100644 Documentation/filesystems/nfs-rdma.txt
diff --git a/a/content_digest b/N1/content_digest
index bce36ee..2f3b013 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -4,116 +4,152 @@
  "To\0Linus Torvalds <torvalds@linux-foundation.org>\0"
  "Cc\0linux-nfs@vger.kernel.org"
   nfsv4@linux-nfs.org
- " linux-kernel@vger.kernel.org\0"
+  linux-kernel@vger.kernel.org
+ " Neil Brown <neilb@suse.de>\0"
  "\00:1\0"
  "b\0"
- "VGhlIGZvbGxvd2luZyBuZnNkLXJlbGF0ZWQgY2hhbmdlcyBhcmUgYXZhaWxhYmxlIGZyb20gdGhl\n"
- "IGZvci1saW51cwpicmFuY2ggb2YgdGhlIGdpdCByZXBvc2l0b3J5IGF0OgoKICBnaXQ6Ly9saW51\n"
- "eC1uZnMub3JnL35iZmllbGRzL2xpbnV4LmdpdCBmb3ItbGludXMKCk5vdGhpbmcgZWFydGgtc2hh\n"
- "dHRlcmluZzsgbW9zdGx5IG1pc2NlbGxhbmVvdXMgYnVnZml4ZXMgYW5kIGNsZWFudXAsIGZvcgps\n"
- "b2NrZCBhbmQgbmZzZC4KCkplZmYgTGF5dG9uJ3MgY29udmVyc2lvbiBvZiBsb2NrZCBhbmQgdGhl\n"
- "IE5GU3Y0IGNhbGxiYWNrIHNlcnZlciB0bwprdGhyZWFkcyBpcyBvbmUgb2YgdGhlIGxhcmdlciBw\n"
- "aWVjZXMsIENodWNrIGRpZCBhIGJ1bmNoIG9mIGtjb25maWcKY2xlYW51cCwgZXRjLgoKLS1iLgoK\n"
- "QWRyaWFuIEJ1bmsgKDEpOgogICAgICBtYWtlIG5mc2RfY3JlYXRlX3NldGF0dHIoKSBzdGF0aWMK\n"
- "CkFuZHJldyBNb3J0b24gKDEpOgogICAgICBuZXQvc3VucnBjL3N2Yy5jOiBzdXBwcmVzcyB1bmlu\n"
- "dGlhbGl6ZWQgdmFyIHdhcm5pbmcKCkF1csOpbGllbiBDaGFyYm9uICgxKToKICAgICAgSVB2NiBz\n"
- "dXBwb3J0IGZvciBORlMgc2VydmVyIGV4cG9ydCBjYWNoZXMKCkNodWNrIExldmVyICgxMik6CiAg\n"
- "ICAgIE5GU0Q6IFJlbW92ZSBORlNEX1RDUCBrZXJuZWwgYnVpbGQgb3B0aW9uCiAgICAgIE5GU0Q6\n"
- "IFVwZGF0ZSBoZWxwIHRleHQgZm9yIENPTkZJR19ORlNECiAgICAgIE5GU0Q6IE1vdmUgInNlbGVj\n"
- "dCBGU19QT1NJWF9BQ0wgaWYgTkZTRF9WNCIKICAgICAgTkZTRDogTW92ZSAic2VsZWN0IE5GU0Rf\n"
- "VjJfQUNMIGlmIE5GU0RfVjNfQUNMIgogICAgICBORlNEOiBSZW1vdmUgcmVkdW5kYW50ICJzZWxl\n"
- "Y3QiIGNsYXVzZXMgaW4gZnMvS2NvbmZpZwogICAgICBORlNEOiBVc2UgImRlcGVuZHMgb24iIGZv\n"
- "ciBQUk9DX0ZTIGRlcGVuZGVuY3kKICAgICAgU1VOUlBDOiBSZW1vdmUgUFJPQ19GUyBkZXBlbmRl\n"
- "bmN5CiAgICAgIE5GU0Q6IFJlbW92ZSBORlN2NCBkZXBlbmRlbmN5IG9uIE5GU3YzCiAgICAgIFNV\n"
- "TlJQQzogUlBDIHNlcnZlciBzdGlsbCB1c2VzIDIuNCBtZXRob2QgZm9yIGRpc2FibGluZyBUQ1Ag\n"
- "TmFnbGUKICAgICAgU1VOUlBDOiBVcGRhdGUgUlBDIHNlcnZlcidzIFRDUCByZWNvcmQgbWFya2Vy\n"
- "IGRlY29kZXIKICAgICAgU1VOUlBDOiBVc2UgdW5zaWduZWQgaW5kZXggd2hlbiBsb29waW5nIG92\n"
- "ZXIgYXJyYXlzCiAgICAgIFNVTlJQQzogVXNlIHVuc2lnbmVkIGxvb3AgYW5kIGFycmF5IGluZGV4\n"
- "IGluIHN2Y19pbml0X2J1ZmZlcigpCgpGZWxpeCBCbHlha2hlciAoMSk6CiAgICAgIG5mc2Q6IGlu\n"
- "aXRpYWxpemUgbGVhc2UgdHlwZSBpbiBuZnM0X29wZW5fZGVsZWdhdGlvbigpCgpIYXJzaHVsYSBK\n"
- "YXlhc3VyaXlhICgxKToKICAgICAgc3VucnBjOiBHU1MgaW50ZWdyaXR5IGFuZCBkZWNyeXB0aW9u\n"
- "IGZhaWx1cmVzIHNob3VsZCByZXR1cm4gR0FSQkFHRV9BUkdTCgpIYXJ2ZXkgSGFycmlzb24gKDMp\n"
- "OgogICAgICBsb2NrZDogZml4IHNwYXJzZSB3YXJuaW5nIGluIHN2Y3NoYXJlLmMKICAgICAgbmZz\n"
- "ZDogZml4IHNwYXJzZSB3YXJuaW5ncwogICAgICBuZnNkOiBmaXggc3BhcnNlIHdhcm5pbmcgaW4g\n"
- "dmZzLmMKCkouIEJydWNlIEZpZWxkcyAoMTIpOgogICAgICBuZnM6IHJlbW92ZSB1bm5lY2Vzc2Fy\n"
- "eSBORlNfTkVFRF8qIGRlZmluZXMKICAgICAgbmZzZDQ6IHJlbW92ZSB1bm5lY2Vzc2FyeSBDSEVD\n"
- "S19GSCBjaGVjayBpbiBwcmVwcm9jZXNzX3NlcWlkX29wCiAgICAgIG5mc2Q0OiBzaW1wbGlmeSBz\n"
- "dGF0ZWlkIHNlcXVlbmNpbmcgY2hlY2tzCiAgICAgIG5mc2Q0OiBraWxsIHVubmVjZXNzYXJ5IGNo\n"
- "ZWNrIGluIHByZXByb2Nlc3Nfc3RhdGVpZF9vcAogICAgICBzdmNycGM6IG1vdmUgdW51c2VkIGZp\n"
- "ZWxkIGZyb20gY2FjaGVfZGVmZXJyZWRfcmVxCiAgICAgIG5mc2Q6IGNsYXJpZnkgcmVhZGRpci9t\n"
- "b3VudHBvaW50LWNyb3NzaW5nIGNvZGUKICAgICAgbG9ja2Q6IGZpeCByYWNlIGluIG5sbV9yZWxl\n"
- "YXNlKCkKICAgICAgbG9ja2Q6IGNsZWFuIHVwIF9fbnNtX2ZpbmQoKQogICAgICBsb2NrZDogY29u\n"
- "dmVydCBuc21fbXV0ZXggdG8gYSBzcGlubG9jawogICAgICBuZnNkOiBtb3ZlIG1vc3Qgb2YgZmhf\n"
- "dmVyaWZ5IHRvIHNlcGFyYXRlIGZ1bmN0aW9uCiAgICAgIGxvY2tkOiBGaXggc3RhbGUgbmxtc3Zj\n"
- "X3VubGlua19ibG9jayBjb21tZW50CiAgICAgIG5mc2Q6IGZpeCBjb21tZW50CgpKYW1lcyBMZW50\n"
- "aW5pICgxKToKICAgICAgRG9jdW1lbnRhdGlvbjogTkZTL1JETUEgaW5zdHJ1Y3Rpb25zIGZvciAy\n"
- "LjYuMjUtcmMxCgpKZWZmIExheXRvbiAoMTApOgogICAgICBTVU5SUEM6IGV4cG9ydCBzdmNfc29j\n"
- "a191cGRhdGVfYnVmcwogICAgICBTVU5SUEM6IGhhdmUgc3ZjX3JlY3YoKSBjaGVjayBrdGhyZWFk\n"
- "X3Nob3VsZF9zdG9wKCkKICAgICAgTkxNOiBDb252ZXJ0IGxvY2tkIHRvIHVzZSBrdGhyZWFkcwog\n"
- "ICAgICBTVU5SUEM6IGFsbG93IHN2Y19yZWN2IHRvIGJyZWFrIG91dCBvZiA1MDBtcyBzbGVlcCB3\n"
- "aGVuIGFsbG9jX3BhZ2UgZmFpbHMKICAgICAgTkZTOiBjb252ZXJ0IG5mczQgY2FsbGJhY2sgdGhy\n"
- "ZWFkIHRvIGt0aHJlYWQgQVBJCiAgICAgIFNVTlJQQzogcmVtb3ZlIHN2Y19jcmVhdGVfdGhyZWFk\n"
- "KCkKICAgICAgTkZTOiBkb24ndCBsZXQgbmZzX2NhbGxiYWNrX3N2YyBleGl0IG9uIHVuZXhwZWN0\n"
- "ZWQgc3ZjX3JlY3YgZXJyb3JzICh0cnkgIzIpCiAgICAgIE5MTTogZG9uJ3QgbGV0IGxvY2tkIGV4\n"
- "aXQgb24gdW5leHBlY3RlZCBzdmNfcmVjdiBlcnJvcnMgKHRyeSAjMikKICAgICAga25mc2Q6IGdl\n"
- "dCByaWQgb2YgaW1vZGUgdmFyaWFibGUgaW4gbmZzZF9zZXRhdHRyCiAgICAgIGtuZnNkOiBjbGVh\n"
- "ciBib3RoIHNldHVpZCBhbmQgc2V0Z2lkIHdoZW5ldmVyIGEgY2hvd24gaXMgZG9uZQoKS2V2aW4g\n"
- "Q29mZm1hbiAoNCk6CiAgICAgIENvcnJlY3QgZ3JhbW1lci90eXBvcyBpbiBkcHJpbnRrcwogICAg\n"
- "ICBSZW1vdmUgZGVmaW5lIGZvciBLUkI1X0NLU1VNX0xFTkdUSCwgd2hpY2ggd2lsbCBiZWNvbWUg\n"
- "ZW5jdHlwZS1kZXBlbmRlbnQKICAgICAgZ3NzX2tyYjU6IGNvbnNpc3RlbnRseSB1c2UgdW5zaWdu\n"
- "ZWQgZm9yIHNlcW51bQogICAgICBzdW5ycGM6IG1ha2UgdG9rZW4gaGVhZGVyIHZhbHVlcyBsZXNz\n"
- "IGNvbmZ1c2luZwoKTmVpbEJyb3duICgxKToKICAgICAga25mc2Q6IFJlbW92ZSBOTE1fSE9TVF9N\n"
- "QVggYW5kIGFzc29jaWF0ZWQgbG9naWMuCgpPbGdhIEtvcm5pZXZza2FpYSAoMSk6CiAgICAgIG5m\n"
- "c2Q6IHVzZSBzdGF0aWMgbWVtb3J5IGZvciBjYWxsYmFjayBwcm9ncmFtIGFuZCBzdGF0cwoKUm9i\n"
- "ZXJ0IFAuIEouIERheSAoMSk6CiAgICAgIE5GU0Q6IFN0cmlwIF9fS0VSTkVMX18gdGVzdGluZyBm\n"
- "cm9tIHVuZXhwb3J0ZWQgaGVhZGVyIGZpbGVzLgoKU3RldmVuIFdoaXRlaG91c2UgKDEpOgogICAg\n"
- "ICBVc2UgYSB6ZXJvIHNpemVkIGFycmF5IGZvciByYXcgZmllbGQgaW4gc3RydWN0IGZpZAoKVG9t\n"
- "IFR1Y2tlciAoMSk6CiAgICAgIFNWQ1JETUE6IEFkZCBjaGVjayBmb3IgWFBUX0NMT1NFIGluIHN2\n"
- "Y19yZG1hX3NlbmQKCiBEb2N1bWVudGF0aW9uL2ZpbGVzeXN0ZW1zL25mcy1yZG1hLnR4dCAgIHwg\n"
- "IDI1MiArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysKIGZzL0tjb25maWcgICAgICAgICAg\n"
- "ICAgICAgICAgICAgICAgICAgICAgfCAgMTA5ICsrKysrKystLS0tLS0KIGZzL2xvY2tkL2hvc3Qu\n"
- "YyAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgIDczICsrKysrLS0tLS0KIGZzL2xvY2tkL3N2\n"
- "Yy5jICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgMTUwICsrKysrKysrLS0tLS0tLS0tLQog\n"
- "ZnMvbG9ja2Qvc3ZjbG9jay5jICAgICAgICAgICAgICAgICAgICAgICB8ICAgIDYgKy0KIGZzL2xv\n"
- "Y2tkL3N2Y3NoYXJlLmMgICAgICAgICAgICAgICAgICAgICAgfCAgICAzICstCiBmcy9uZnMvY2Fs\n"
- "bGJhY2suYyAgICAgICAgICAgICAgICAgICAgICAgIHwgICA5MyArKysrKystLS0tLS0KIGZzL25m\n"
- "cy9zeW1saW5rLmMgICAgICAgICAgICAgICAgICAgICAgICAgfCAgICAxIC0KIGZzL25mc2QvYXV0\n"
- "aC5jICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgICAxICsKIGZzL25mc2QvZXhwb3J0LmMg\n"
- "ICAgICAgICAgICAgICAgICAgICAgICAgfCAgICA5ICstCiBmcy9uZnNkL25mczRjYWxsYmFjay5j\n"
- "ICAgICAgICAgICAgICAgICAgIHwgICAyOCArKy0tCiBmcy9uZnNkL25mczRpZG1hcC5jICAgICAg\n"
- "ICAgICAgICAgICAgICAgIHwgICAgMiArLQogZnMvbmZzZC9uZnM0c3RhdGUuYyAgICAgICAgICAg\n"
- "ICAgICAgICAgICB8ICAgNzEgKysrKystLS0tCiBmcy9uZnNkL25mczR4ZHIuYyAgICAgICAgICAg\n"
- "ICAgICAgICAgICAgIHwgICAxMyArKy0KIGZzL25mc2QvbmZzY3RsLmMgICAgICAgICAgICAgICAg\n"
- "ICAgICAgICAgfCAgIDIyICsrLQogZnMvbmZzZC9uZnNmaC5jICAgICAgICAgICAgICAgICAgICAg\n"
- "ICAgICB8ICAyMjggKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLQogZnMvbmZzZC9uZnNzdmMu\n"
- "YyAgICAgICAgICAgICAgICAgICAgICAgICB8ICAgIDIgLQogZnMvbmZzZC92ZnMuYyAgICAgICAg\n"
- "ICAgICAgICAgICAgICAgICAgICB8ICAgMzUgKystLQogaW5jbHVkZS9saW51eC9leHBvcnRmcy5o\n"
- "ICAgICAgICAgICAgICAgICB8ICAgIDIgKy0KIGluY2x1ZGUvbGludXgvbmZzMy5oICAgICAgICAg\n"
- "ICAgICAgICAgICAgfCAgICAyICstCiBpbmNsdWRlL2xpbnV4L25mc2QvS2J1aWxkICAgICAgICAg\n"
- "ICAgICAgIHwgICAgNCArLQogaW5jbHVkZS9saW51eC9uZnNkL2NhY2hlLmggICAgICAgICAgICAg\n"
- "ICB8ICAgIDIgLQogaW5jbHVkZS9saW51eC9uZnNkL25mc2QuaCAgICAgICAgICAgICAgICB8ICAg\n"
- "MTEgKy0KIGluY2x1ZGUvbGludXgvc3VucnBjL2NhY2hlLmggICAgICAgICAgICAgfCAgICAxIC0K\n"
- "IGluY2x1ZGUvbGludXgvc3VucnBjL2dzc19rcmI1LmggICAgICAgICAgfCAgICA2ICstCiBpbmNs\n"
- "dWRlL2xpbnV4L3N1bnJwYy9zdmMuaCAgICAgICAgICAgICAgIHwgICAgMSAtCiBpbmNsdWRlL2xp\n"
- "bnV4L3N1bnJwYy9zdmNhdXRoLmggICAgICAgICAgIHwgICAgNSArLQogaW5jbHVkZS9saW51eC9z\n"
- "dW5ycGMvc3Zjc29jay5oICAgICAgICAgICB8ICAgIDQgKy0KIGluY2x1ZGUvbmV0L2lwdjYuaCAg\n"
- "ICAgICAgICAgICAgICAgICAgICAgfCAgICA5ICsKIG5ldC9zdW5ycGMvYXV0aF9nc3MvZ3NzX2dl\n"
- "bmVyaWNfdG9rZW4uYyAgfCAgICA0ICstCiBuZXQvc3VucnBjL2F1dGhfZ3NzL2dzc19rcmI1X2Ny\n"
- "eXB0by5jICAgIHwgICAgNiArLQogbmV0L3N1bnJwYy9hdXRoX2dzcy9nc3Nfa3JiNV9zZWFsLmMg\n"
- "ICAgICB8ICAgIDkgKy0KIG5ldC9zdW5ycGMvYXV0aF9nc3MvZ3NzX2tyYjVfc2VxbnVtLmMgICAg\n"
- "fCAgICA0ICstCiBuZXQvc3VucnBjL2F1dGhfZ3NzL2dzc19rcmI1X3Vuc2VhbC5jICAgIHwgICAg\n"
- "MiArLQogbmV0L3N1bnJwYy9hdXRoX2dzcy9nc3Nfa3JiNV93cmFwLmMgICAgICB8ICAgIDggKy0K\n"
- "IG5ldC9zdW5ycGMvYXV0aF9nc3MvZ3NzX3Nwa20zX3NlYWwuYyAgICAgfCAgICA0ICstCiBuZXQv\n"
- "c3VucnBjL2F1dGhfZ3NzL3N2Y2F1dGhfZ3NzLmMgICAgICAgIHwgICAgOSArLQogbmV0L3N1bnJw\n"
- "Yy9jYWNoZS5jICAgICAgICAgICAgICAgICAgICAgICB8ICAgIDEgLQogbmV0L3N1bnJwYy9zdmMu\n"
- "YyAgICAgICAgICAgICAgICAgICAgICAgICB8ICAgMjUgKy0tCiBuZXQvc3VucnBjL3N2Y194cHJ0\n"
- "LmMgICAgICAgICAgICAgICAgICAgIHwgICAzMCArKystCiBuZXQvc3VucnBjL3N2Y2F1dGhfdW5p\n"
- "eC5jICAgICAgICAgICAgICAgIHwgIDExOCArKysrKysrKysrLS0tLS0KIG5ldC9zdW5ycGMvc3Zj\n"
- "c29jay5jICAgICAgICAgICAgICAgICAgICAgfCAgIDI5ICsrLS0KIG5ldC9zdW5ycGMveHBydHJk\n"
- "bWEvc3ZjX3JkbWFfdHJhbnNwb3J0LmMgfCAgICAyICsKIDQzIGZpbGVzIGNoYW5nZWQsIDg3OSBp\n"
- "bnNlcnRpb25zKCspLCA1MTcgZGVsZXRpb25zKC0pCiBjcmVhdGUgbW9kZSAxMDA2NDQgRG9jdW1l\n"
- "bnRhdGlvbi9maWxlc3lzdGVtcy9uZnMtcmRtYS50eHQKX19fX19fX19fX19fX19fX19fX19fX19f\n"
- "X19fX19fX19fX19fX19fX19fX19fX18KTkZTdjQgbWFpbGluZyBsaXN0Ck5GU3Y0QGxpbnV4LW5m\n"
- cy5vcmcKaHR0cDovL2xpbnV4LW5mcy5vcmcvY2dpLWJpbi9tYWlsbWFuL2xpc3RpbmZvL25mc3Y0
+ "The following nfsd-related changes are available from the for-linus\n"
+ "branch of the git repository at:\n"
+ "\n"
+ "  git://linux-nfs.org/~bfields/linux.git for-linus\n"
+ "\n"
+ "Nothing earth-shattering; mostly miscellaneous bugfixes and cleanup, for\n"
+ "lockd and nfsd.\n"
+ "\n"
+ "Jeff Layton's conversion of lockd and the NFSv4 callback server to\n"
+ "kthreads is one of the larger pieces, Chuck did a bunch of kconfig\n"
+ "cleanup, etc.\n"
+ "\n"
+ "--b.\n"
+ "\n"
+ "Adrian Bunk (1):\n"
+ "      make nfsd_create_setattr() static\n"
+ "\n"
+ "Andrew Morton (1):\n"
+ "      net/sunrpc/svc.c: suppress unintialized var warning\n"
+ "\n"
+ "Aur\303\251lien Charbon (1):\n"
+ "      IPv6 support for NFS server export caches\n"
+ "\n"
+ "Chuck Lever (12):\n"
+ "      NFSD: Remove NFSD_TCP kernel build option\n"
+ "      NFSD: Update help text for CONFIG_NFSD\n"
+ "      NFSD: Move \"select FS_POSIX_ACL if NFSD_V4\"\n"
+ "      NFSD: Move \"select NFSD_V2_ACL if NFSD_V3_ACL\"\n"
+ "      NFSD: Remove redundant \"select\" clauses in fs/Kconfig\n"
+ "      NFSD: Use \"depends on\" for PROC_FS dependency\n"
+ "      SUNRPC: Remove PROC_FS dependency\n"
+ "      NFSD: Remove NFSv4 dependency on NFSv3\n"
+ "      SUNRPC: RPC server still uses 2.4 method for disabling TCP Nagle\n"
+ "      SUNRPC: Update RPC server's TCP record marker decoder\n"
+ "      SUNRPC: Use unsigned index when looping over arrays\n"
+ "      SUNRPC: Use unsigned loop and array index in svc_init_buffer()\n"
+ "\n"
+ "Felix Blyakher (1):\n"
+ "      nfsd: initialize lease type in nfs4_open_delegation()\n"
+ "\n"
+ "Harshula Jayasuriya (1):\n"
+ "      sunrpc: GSS integrity and decryption failures should return GARBAGE_ARGS\n"
+ "\n"
+ "Harvey Harrison (3):\n"
+ "      lockd: fix sparse warning in svcshare.c\n"
+ "      nfsd: fix sparse warnings\n"
+ "      nfsd: fix sparse warning in vfs.c\n"
+ "\n"
+ "J. Bruce Fields (12):\n"
+ "      nfs: remove unnecessary NFS_NEED_* defines\n"
+ "      nfsd4: remove unnecessary CHECK_FH check in preprocess_seqid_op\n"
+ "      nfsd4: simplify stateid sequencing checks\n"
+ "      nfsd4: kill unnecessary check in preprocess_stateid_op\n"
+ "      svcrpc: move unused field from cache_deferred_req\n"
+ "      nfsd: clarify readdir/mountpoint-crossing code\n"
+ "      lockd: fix race in nlm_release()\n"
+ "      lockd: clean up __nsm_find()\n"
+ "      lockd: convert nsm_mutex to a spinlock\n"
+ "      nfsd: move most of fh_verify to separate function\n"
+ "      lockd: Fix stale nlmsvc_unlink_block comment\n"
+ "      nfsd: fix comment\n"
+ "\n"
+ "James Lentini (1):\n"
+ "      Documentation: NFS/RDMA instructions for 2.6.25-rc1\n"
+ "\n"
+ "Jeff Layton (10):\n"
+ "      SUNRPC: export svc_sock_update_bufs\n"
+ "      SUNRPC: have svc_recv() check kthread_should_stop()\n"
+ "      NLM: Convert lockd to use kthreads\n"
+ "      SUNRPC: allow svc_recv to break out of 500ms sleep when alloc_page fails\n"
+ "      NFS: convert nfs4 callback thread to kthread API\n"
+ "      SUNRPC: remove svc_create_thread()\n"
+ "      NFS: don't let nfs_callback_svc exit on unexpected svc_recv errors (try #2)\n"
+ "      NLM: don't let lockd exit on unexpected svc_recv errors (try #2)\n"
+ "      knfsd: get rid of imode variable in nfsd_setattr\n"
+ "      knfsd: clear both setuid and setgid whenever a chown is done\n"
+ "\n"
+ "Kevin Coffman (4):\n"
+ "      Correct grammer/typos in dprintks\n"
+ "      Remove define for KRB5_CKSUM_LENGTH, which will become enctype-dependent\n"
+ "      gss_krb5: consistently use unsigned for seqnum\n"
+ "      sunrpc: make token header values less confusing\n"
+ "\n"
+ "NeilBrown (1):\n"
+ "      knfsd: Remove NLM_HOST_MAX and associated logic.\n"
+ "\n"
+ "Olga Kornievskaia (1):\n"
+ "      nfsd: use static memory for callback program and stats\n"
+ "\n"
+ "Robert P. J. Day (1):\n"
+ "      NFSD: Strip __KERNEL__ testing from unexported header files.\n"
+ "\n"
+ "Steven Whitehouse (1):\n"
+ "      Use a zero sized array for raw field in struct fid\n"
+ "\n"
+ "Tom Tucker (1):\n"
+ "      SVCRDMA: Add check for XPT_CLOSE in svc_rdma_send\n"
+ "\n"
+ " Documentation/filesystems/nfs-rdma.txt   |  252 ++++++++++++++++++++++++++++++\n"
+ " fs/Kconfig                               |  109 +++++++------\n"
+ " fs/lockd/host.c                          |   73 +++++-----\n"
+ " fs/lockd/svc.c                           |  150 ++++++++----------\n"
+ " fs/lockd/svclock.c                       |    6 +-\n"
+ " fs/lockd/svcshare.c                      |    3 +-\n"
+ " fs/nfs/callback.c                        |   93 ++++++------\n"
+ " fs/nfs/symlink.c                         |    1 -\n"
+ " fs/nfsd/auth.c                           |    1 +\n"
+ " fs/nfsd/export.c                         |    9 +-\n"
+ " fs/nfsd/nfs4callback.c                   |   28 ++--\n"
+ " fs/nfsd/nfs4idmap.c                      |    2 +-\n"
+ " fs/nfsd/nfs4state.c                      |   71 +++++----\n"
+ " fs/nfsd/nfs4xdr.c                        |   13 ++-\n"
+ " fs/nfsd/nfsctl.c                         |   22 ++-\n"
+ " fs/nfsd/nfsfh.c                          |  228 +++++++++++++++-------------\n"
+ " fs/nfsd/nfssvc.c                         |    2 -\n"
+ " fs/nfsd/vfs.c                            |   35 ++--\n"
+ " include/linux/exportfs.h                 |    2 +-\n"
+ " include/linux/nfs3.h                     |    2 +-\n"
+ " include/linux/nfsd/Kbuild                |    4 +-\n"
+ " include/linux/nfsd/cache.h               |    2 -\n"
+ " include/linux/nfsd/nfsd.h                |   11 +-\n"
+ " include/linux/sunrpc/cache.h             |    1 -\n"
+ " include/linux/sunrpc/gss_krb5.h          |    6 +-\n"
+ " include/linux/sunrpc/svc.h               |    1 -\n"
+ " include/linux/sunrpc/svcauth.h           |    5 +-\n"
+ " include/linux/sunrpc/svcsock.h           |    4 +-\n"
+ " include/net/ipv6.h                       |    9 +\n"
+ " net/sunrpc/auth_gss/gss_generic_token.c  |    4 +-\n"
+ " net/sunrpc/auth_gss/gss_krb5_crypto.c    |    6 +-\n"
+ " net/sunrpc/auth_gss/gss_krb5_seal.c      |    9 +-\n"
+ " net/sunrpc/auth_gss/gss_krb5_seqnum.c    |    4 +-\n"
+ " net/sunrpc/auth_gss/gss_krb5_unseal.c    |    2 +-\n"
+ " net/sunrpc/auth_gss/gss_krb5_wrap.c      |    8 +-\n"
+ " net/sunrpc/auth_gss/gss_spkm3_seal.c     |    4 +-\n"
+ " net/sunrpc/auth_gss/svcauth_gss.c        |    9 +-\n"
+ " net/sunrpc/cache.c                       |    1 -\n"
+ " net/sunrpc/svc.c                         |   25 +--\n"
+ " net/sunrpc/svc_xprt.c                    |   30 +++-\n"
+ " net/sunrpc/svcauth_unix.c                |  118 ++++++++++-----\n"
+ " net/sunrpc/svcsock.c                     |   29 ++--\n"
+ " net/sunrpc/xprtrdma/svc_rdma_transport.c |    2 +\n"
+ " 43 files changed, 879 insertions(+), 517 deletions(-)\n"
+  create mode 100644 Documentation/filesystems/nfs-rdma.txt
 
-937b332992fb313195c5e5a4a67dd5b817853aa8e62ffb60d42401113f3e929e
+6a21740bb133398314eac5d84bcbaebafe2545694819537d196bd0d4f5fb8ae9

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.