]> git.baikalelectronics.ru Git - kernel.git/commitdiff
projects / kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 24a1921 b0e3d26)
Merge Trond's nfs-for-next
authorJ. Bruce Fields <bfields@redhat.com>
Fri, 26 Apr 2013 15:37:29 +0000 (11:37 -0400)
committerJ. Bruce Fields <bfields@redhat.com>
Fri, 26 Apr 2013 15:37:43 +0000 (11:37 -0400)
Merging Trond's nfs-for-next branch, mainly to get
ebf8625d8e2c3016434152513da2094352a1634b "SUNRPC: Allow rpc_create() to
request that TCP slots be unlimited", which a small piece of the
gss-proxy work depends on.

1  2 
net/sunrpc/xprtsock.c patch | diff1 | diff2 | blob | history

diff --cc net/sunrpc/xprtsock.c
Simple merge
Linux Kernel Source Tree.