summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-3.19' of git://linux-nfs.org/~bfields/linuxLinus Torvalds2014-12-1627-269/+525
|\
| * nfsd4: fix xdr4 count of server in fs_location4Benjamin Coddington2014-12-091-1/+1
| * nfsd4: fix xdr4 inclusion of escaped charBenjamin Coddington2014-12-091-0/+3
| * sunrpc/cache: convert to use string_escape_str()Andy Shevchenko2014-12-091-20/+6
| * sunrpc: only call test_bit once in svc_xprt_receivedJeff Layton2014-12-091-2/+4
| * fs: nfsd: Fix signedness bug in compare_blobRasmus Villemoes2014-12-091-8/+7
| * sunrpc: add some tracepoints around enqueue and dequeue of svc_xprtJeff Layton2014-12-092-7/+109
| * sunrpc: convert to lockless lookup of queued server threadsJeff Layton2014-12-094-103/+132
| * sunrpc: fix potential races in pool_stats collectionJeff Layton2014-12-092-9/+9
| * sunrpc: add a rcu_head to svc_rqst and use kfree_rcu to free itJeff Layton2014-12-093-5/+10
| * sunrpc: require svc_create callers to pass in meaningful shutdown routineJeff Layton2014-12-092-4/+1
| * sunrpc: have svc_wake_up only deal with pool 0Jeff Layton2014-12-091-21/+16
| * sunrpc: convert sp_task_pending flag to use atomic bitopsJeff Layton2014-12-092-5/+6
| * sunrpc: move rq_cachetype field to better optimize spaceJeff Layton2014-12-091-1/+1
| * sunrpc: move rq_splice_ok flag into rq_flagsJeff Layton2014-12-097-12/+13
| * sunrpc: move rq_dropme flag into rq_flagsJeff Layton2014-12-095-9/+9
| * sunrpc: move rq_usedeferral flag to rq_flagsJeff Layton2014-12-095-9/+10
| * sunrpc: move rq_local field to rq_flagsJeff Layton2014-12-094-5/+9
| * sunrpc: add a generic rq_flags field to svc_rqst and move rq_secure to itJeff Layton2014-12-095-10/+22
| * Merge tag 'nfs-for-3.19-1' into nfsd for-3.19 branchJ. Bruce Fields2014-12-09271-1021/+2556
| |\
| * | nfsd: minor off by one checks in __write_versions()Dan Carpenter2014-12-011-3/+3
| * | sunrpc: release svc_pool_map reference when serv allocation failsJeff Layton2014-12-011-5/+7
| * | sunrpc: eliminate the XPT_DETACHED flagJeff Layton2014-12-012-7/+4
| * | merge nfs bugfixes into nfsd for-3.19 branchJ. Bruce Fields2014-11-191364-11463/+24206
| |\ \
| * | | nfsd: convert nfs4_file searches to use RCUJeff Layton2014-11-072-23/+33
| * | | nfsd: Add DEALLOCATE supportAnna Schumaker2014-11-073-1/+17
| * | | nfsd: Add ALLOCATE supportAnna Schumaker2014-11-075-1/+85
| * | | VFS: Rename do_fallocate() to vfs_fallocate()Anna Schumaker2014-11-075-6/+7
| * | | lockd: ratelimit "lockd: cannot monitor" messagesJeff Layton2014-11-061-1/+1
| * | | SUNRPC: off by one in BUG_ON()Dan Carpenter2014-10-291-1/+1
| * | | nfsd: clean up comments over nfs4_file definitionJeff Layton2014-10-231-5/+9
| * | | NFSD: Always initialize cl_cb_addrChuck Lever2014-10-231-1/+1
| * | | rpc: change comments to assertionsJ. Bruce Fields2014-10-231-2/+3
| * | | RPC: remove unneeded checks from xdr_truncate_encode()J. Bruce Fields2014-10-231-2/+2
| * | | nfsd: fix inclusive vfs_fsync_range() endZach Brown2014-10-231-3/+7
* | | | Merge tag 'iommu-config-for-linus' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2014-12-1611-45/+243
|\ \ \ \
| * \ \ \ Merge tag 'of-iommu-configure' of git://git.kernel.org/pub/scm/linux/kernel/g...Arnd Bergmann2014-12-0511-44/+242
| |\ \ \ \
| | * | | | iommu: store DT-probed IOMMU data privatelyRobin Murphy2014-12-052-10/+41
| | * | | | arm: dma-mapping: plumb our iommu mapping ops into arch_setup_dma_opsWill Deacon2014-12-012-14/+81
| | * | | | arm: call iommu_init before of_platform_populateWill Deacon2014-12-011-0/+2
| | * | | | dma-mapping: detect and configure IOMMU in of_dma_configureWill Deacon2014-12-013-9/+24
| | * | | | iommu: fix initialization without 'add_device' callbackMarek Szyprowski2014-12-011-1/+1
| | * | | | iommu: provide helper function to configure an IOMMU for an of masterWill Deacon2014-12-013-1/+40
| | * | | | iommu: add new iommu_ops callback for adding an OF deviceWill Deacon2014-12-011-0/+6
| | * | | | dma-mapping: replace set_arch_dma_coherent_ops with arch_setup_dma_opsWill Deacon2014-12-013-27/+19
| | * | | | iommu: provide early initialisation hook for IOMMU driversWill Deacon2014-12-014-0/+46
| |/ / / /
* | | | | Merge tag 'dt2-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ar...Linus Torvalds2014-12-1613-29/+267
|\ \ \ \ \
| * \ \ \ \ Merge tag 'tegra-for-3.19-dt' of git://git.kernel.org/pub/scm/linux/kernel/gi...Arnd Bergmann2014-12-0448-1551/+4232
| |\ \ \ \ \
| | * | | | | ARM: tegra: Enable IOMMU for display controllers on Tegra124Thierry Reding2014-12-041-0/+5
| | * | | | | ARM: tegra: Enable IOMMU for display controllers on Tegra114Thierry Reding2014-12-041-0/+5