summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 's390-4.21-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390...Linus Torvalds2019-01-0317-204/+222
|\
| * Merge tag 'vfio-ccw-20181213' of git://git.kernel.org/pub/scm/linux/kernel/gi...Martin Schwidefsky2018-12-133-8/+4
| |\
| | * MAINTAINERS/vfio-ccw: add Farhan and Eric, make Halil ReviewerChristian Borntraeger2018-12-121-1/+3
| | * vfio: ccw: Merge BUSY and BOXED statesPierre Morel2018-12-122-7/+1
| * | s390/zcrypt: rework ap scan bus codeHarald Freudenberger2018-12-131-117/+160
| * | s390/zcrypt: make sysfs reset attribute trigger queue resetHarald Freudenberger2018-12-131-1/+22
| * | s390/pci: fix sleeping in atomic during hotplugSebastian Ott2018-12-131-1/+1
| * | s390/pci: remove bit_lock usage in interrupt handlerSebastian Ott2018-12-131-3/+1
| * | s390/drivers: fix proc/debugfs file permissionsSebastian Ott2018-12-133-8/+4
| * | s390: convert to DEFINE_SHOW_ATTRIBUTEYangtao Li2018-12-132-28/+3
| |/
| * s390: use common bust_spinlocks()Sergey Senozhatsky2018-11-302-27/+3
| * s390/zcrypt: improve special ap message cmd handlingHarald Freudenberger2018-11-302-2/+4
| * s390/ap: rework assembler functions to use unions for in/out register variablesHarald Freudenberger2018-11-301-9/+19
| * s390: vfio-ap: include <asm/facility> for test_facility()Petr Tesarik2018-11-301-0/+1
* | Merge tag 'nfs-for-4.21-1' of git://git.linux-nfs.org/projects/anna/linux-nfsLinus Torvalds2019-01-0363-1995/+1518
|\ \
| * | sunrpc: convert to DEFINE_SHOW_ATTRIBUTEYangtao Li2019-01-021-16/+3
| * | sunrpc: Add xprt after nfs4_test_session_trunk()Santosh kumar pradhan2019-01-025-9/+15
| * | sunrpc: convert unnecessary GFP_ATOMIC to GFP_NOFSJ. Bruce Fields2019-01-021-2/+2
| * | sunrpc: handle ENOMEM in rpcb_getport_asyncJ. Bruce Fields2019-01-021-0/+8
| * | NFS: remove unnecessary test for IS_ERR(cred)NeilBrown2019-01-021-5/+0
| * | xprtrdma: Prevent leak of rpcrdma_rep objectsChuck Lever2019-01-022-0/+32
| * | NFSv4.2 fix async copy reboot recoveryOlga Kornievskaia2019-01-021-1/+1
| * | xprtrdma: Don't leak freed MRsChuck Lever2019-01-021-12/+15
| * | xprtrdma: Add documenting comment for rpcrdma_buffer_destroyChuck Lever2019-01-021-0/+8
| * | xprtrdma: Replace outdated comment for rpcrdma_ep_postChuck Lever2019-01-021-3/+7
| * | xprtrdma: Update comments in frwr_op_sendChuck Lever2019-01-021-2/+2
| * | SUNRPC: Fix some kernel doc complaintsChuck Lever2019-01-024-4/+6
| * | SUNRPC: Simplify defining common RPC trace eventsChuck Lever2019-01-021-103/+69
| * | NFS: Fix NFSv4 symbolic trace point outputChuck Lever2019-01-021-143/+313
| * | xprtrdma: Trace mapping, alloc, and dereg failuresChuck Lever2019-01-024-10/+144
| * | xprtrdma: Add trace points for calls to transport switch methodsChuck Lever2019-01-022-11/+17
| * | xprtrdma: Relocate the xprtrdma_mr_map trace pointsChuck Lever2019-01-021-1/+1
| * | xprtrdma: Clean up of xprtrdma chunk trace pointsChuck Lever2019-01-022-19/+29
| * | xprtrdma: Remove unused fields from rpcrdma_iaChuck Lever2019-01-021-2/+0
| * | xprtrdma: Cull dprintk() call sitesChuck Lever2019-01-024-68/+19
| * | xprtrdma: Simplify locking that protects the rl_allreqs listChuck Lever2019-01-023-35/+23
| * | xprtrdma: Expose transport header errorsChuck Lever2019-01-021-1/+0
| * | xprtrdma: Remove request_module from backchannelChuck Lever2019-01-021-2/+0
| * | xprtrdma: Recognize XDRBUF_SPARSE_PAGESChuck Lever2019-01-021-5/+6
| * | NFS: Make "port=" mount option optional for RDMA mountsChuck Lever2019-01-021-2/+8
| * | xprtrdma: Plant XID in on-the-wire RDMA offset (FRWR)Chuck Lever2019-01-023-5/+8
| * | xprtrdma: Remove rpcrdma_memreg_opsChuck Lever2019-01-025-101/+116
| * | xprtrdma: Remove support for FMR memory registrationChuck Lever2019-01-024-359/+2
| * | xprtrdma: Reduce max_frwr_depthChuck Lever2019-01-021-4/+11
| * | xprtrdma: Fix ri_max_segs and the result of ro_maxpagesChuck Lever2019-01-023-6/+14
| * | xprtrdma: Don't wake pending tasks until disconnect is doneChuck Lever2019-01-025-17/+23
| * | xprtrdma: No qp_event disconnectChuck Lever2019-01-022-33/+0
| * | xprtrdma: Replace rpcrdma_receive_wq with a per-xprt workqueueChuck Lever2019-01-024-48/+44
| * | xprtrdma: Refactor Receive accountingChuck Lever2019-01-025-39/+19
| * | xprtrdma: Ensure MRs are DMA-unmapped when posting LOCAL_INV failsChuck Lever2019-01-021-2/+2