diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-27 19:14:39 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-27 19:14:39 +0200 |
| commit | d2c3ac7e7e39ec6d37e4114ae7444948561e59af (patch) | |
| tree | c0e6a9eed0139de4e757fbf64498fe8c0b291e44 /drivers/tty/sysrq.c | |
| parent | Merge tag 'gfs2-merge-window' of git://git.kernel.org:/pub/scm/linux/kernel/g... (diff) | |
| parent | sunrpc: use sg_init_one() in krb5_rc4_setup_enc/seq_key() (diff) | |
| download | linux-d2c3ac7e7e39ec6d37e4114ae7444948561e59af.tar.xz linux-d2c3ac7e7e39ec6d37e4114ae7444948561e59af.zip | |
Merge branch 'for-4.2' of git://linux-nfs.org/~bfields/linux
Pull nfsd updates from Bruce Fields:
"A relatively quiet cycle, with a mix of cleanup and smaller bugfixes"
* 'for-4.2' of git://linux-nfs.org/~bfields/linux: (24 commits)
sunrpc: use sg_init_one() in krb5_rc4_setup_enc/seq_key()
nfsd: wrap too long lines in nfsd4_encode_read
nfsd: fput rd_file from XDR encode context
nfsd: take struct file setup fully into nfs4_preprocess_stateid_op
nfsd: refactor nfs4_preprocess_stateid_op
nfsd: clean up raparams handling
nfsd: use swap() in sort_pacl_range()
rpcrdma: Merge svcrdma and xprtrdma modules into one
svcrdma: Add a separate "max data segs macro for svcrdma
svcrdma: Replace GFP_KERNEL in a loop with GFP_NOFAIL
svcrdma: Keep rpcrdma_msg fields in network byte-order
svcrdma: Fix byte-swapping in svc_rdma_sendto.c
nfsd: Update callback sequnce id only CB_SEQUENCE success
nfsd: Reset cb_status in nfsd4_cb_prepare() at retrying
svcrdma: Remove svc_rdma_xdr_decode_deferred_req()
SUNRPC: Move EXPORT_SYMBOL for svc_process
uapi/nfs: Add NFSv4.1 ACL definitions
nfsd: Remove dead declarations
nfsd: work around a gcc-5.1 warning
nfsd: Checking for acl support does not require fetching any acls
...
Diffstat (limited to 'drivers/tty/sysrq.c')
0 files changed, 0 insertions, 0 deletions