summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'linus' into perf/urgent, to resolve conflictIngo Molnar2017-03-02195-6901/+13074
|\
| * Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ke...Linus Torvalds2017-03-026-9/+11
| |\
| | * objtool, modules: Discard objtool annotation sections for modulesJosh Poimboeuf2017-03-016-8/+10
| | * objtool, compiler.h: Fix __unreachable section relocation sizeJosh Poimboeuf2017-03-011-1/+1
| * | Merge tag 'nfs-for-4.11-1' of git://git.linux-nfs.org/projects/anna/linux-nfsLinus Torvalds2017-03-0239-832/+902
| |\ \
| | * | NFSv4: fix getacl ERANGE for some ACL buffer sizesWeston Andros Adamson2017-02-231-6/+2
| | * | NFSv4: fix getacl head length estimationJ. Bruce Fields2017-02-231-1/+1
| | * | Revert "NFSv4.1: Handle NFS4ERR_BADSESSION/NFS4ERR_DEADSESSION replies to OP_...Trond Myklebust2017-02-221-4/+0
| | * | NFSv4: Fix reboot recovery in copy offloadTrond Myklebust2017-02-221-26/+37
| | * | pNFS/flexfiles: If the layout is invalid, it must be updated before retryingTrond Myklebust2017-02-221-6/+7
| | * | NFSv4: Clean up owner/group attribute decodeTrond Myklebust2017-02-211-60/+57
| | * | SUNRPC: Add a helper function xdr_stream_decode_string_dup()Trond Myklebust2017-02-212-0/+36
| | * | NFSv4: Remove bogus "struct nfs_client" argument from decode_ace()Trond Myklebust2017-02-211-2/+2
| | * | NFSv4: Fix the underestimation of delegation XDR space reservationTrond Myklebust2017-02-211-0/+2
| | * | NFSv4: Replace callback string decode function with a genericTrond Myklebust2017-02-211-22/+8
| | * | NFSv4: Replace the open coded decode_opaque_inline() with the new genericTrond Myklebust2017-02-211-21/+8
| | * | NFSv4: Replace ad-hoc xdr encode/decode helpers with xdr_stream_* genericsTrond Myklebust2017-02-213-34/+12
| | * | SUNRPC: Add generic helpers for xdr_stream encode/decodeTrond Myklebust2017-02-211-0/+177
| | * | sunrpc: silence uninitialized variable warningDan Carpenter2017-02-211-1/+3
| | * | nlm: Ensure callback code also checks that the files matchTrond Myklebust2017-02-131-1/+2
| | * | sunrpc: Allow xprt->ops->timer method to sleepChuck Lever2017-02-102-2/+2
| | * | xprtrdma: Refactor management of mw_list fieldChuck Lever2017-02-105-24/+29
| | * | xprtrdma: Handle stale connection rejectionChuck Lever2017-02-101-45/+21
| | * | xprtrdma: Properly recover FRWRs with in-flight FASTREG WRsChuck Lever2017-02-102-10/+8
| | * | xprtrdma: Shrink send SGEs arrayChuck Lever2017-02-101-4/+7
| | * | xprtrdma: Reduce required number of send SGEsChuck Lever2017-02-103-9/+32
| | * | xprtrdma: Disable pad optimization by defaultChuck Lever2017-02-102-1/+2
| | * | xprtrdma: Per-connection pad optimizationChuck Lever2017-02-103-14/+16
| | * | xprtrdma: Fix Read chunk paddingChuck Lever2017-02-101-6/+4
| | * | NFSv4: Set the connection timeout to match the lease periodTrond Myklebust2017-02-093-7/+10
| | * | SUNRPC: Allow changing of the TCP timeout parameters on the flyTrond Myklebust2017-02-094-11/+77
| | * | SUNRPC: Refactor TCP socket timeout code into a helper functionTrond Myklebust2017-02-091-19/+26
| | * | SUNRPC: Remove unused function rpc_get_timeout()Trond Myklebust2017-02-092-16/+0
| | * | NFSv4: Fix memory and state leak in _nfs4_open_and_get_stateTrond Myklebust2017-02-081-1/+1
| | * | sunrpc: use simple_read_from_buffer for reading cache flushKinglong Mee2017-02-081-12/+3
| | * | sunrpc: record rpc client pointer in seq->private directlyKinglong Mee2017-02-081-25/+10
| | * | sunrpc: update the comments of sunrpc proc pathKinglong Mee2017-02-081-2/+2
| | * | sunrpc: remove dead codes of cr_magic in rpc_credKinglong Mee2017-02-083-11/+0
| | * | sunrpc: rename NFS_NGROUPS to UNX_NGROUPS for auth unixKinglong Mee2017-02-083-12/+11
| | * | sunrpc/nfs: cleanup procfs/pipefs entry in cache_detailKinglong Mee2017-02-083-46/+21
| | * | sunrpc: error out if register_shrinker failKinglong Mee2017-02-081-1/+5
| | * | nfs: no PG_private waiters remain, remove wakerNicholas Piggin2017-02-081-2/+0
| | * | NFS: nfs_rename() handle -ERESTARTSYS dentry left behindBenjamin Coddington2017-02-081-11/+25
| | * | NFSv4: Fix warning for using 0 as NULLWei Yongjun2017-01-301-1/+1
| | * | pNFS/flexfiles: Make local symbol layoutreturn_ops staticWei Yongjun2017-01-301-1/+1
| | * | NFS: Return the comparison result directly in nfs41_match_stateid()Anna Schumaker2017-01-301-3/+1
| | * | NFS: Clean up nfs41_same_server_scope()Anna Schumaker2017-01-301-5/+3
| | * | NFS: No need to set and return status in nfs41_lock_expired()Anna Schumaker2017-01-301-2/+1
| | * | NFS: Remove unnecessary goto in nfs4_lookup_root_sec()Anna Schumaker2017-01-301-8/+3
| | * | NFS: Remove nfs4_recover_expired_lease()Anna Schumaker2017-01-301-6/+1