diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-07 07:00:42 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-07 07:00:42 +0400 |
| commit | 6aad3738f6a79fd0ca480eaceefe064cc471f6eb (patch) | |
| tree | 08fb9ec4824bf3320af01f29fe84b75f814c0fa0 /net/rds/stats.c | |
| parent | 02ebbbd481635fd3ce7018e5bb19c18c0f1e4561 (diff) | |
| parent | 5bda90c8f20f0af93375721533f4081a40fa6f41 (diff) | |
| download | linux-6aad3738f6a79fd0ca480eaceefe064cc471f6eb.tar.xz | |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending:
target: use ->exectute_task for all CDB emulation
target: remove SCF_EMULATE_CDB_ASYNC
target: refactor transport_emulate_control_cdb
target: pass the se_task to the CDB emulation callback
target: split core_scsi3_emulate_pr
target: split core_scsi2_emulate_crh
target: Add generic active I/O shutdown logic
target: add back error handling in transport_complete_task
target/pscsi: blk_make_request() returns an ERR_PTR()
target: Remove core TRANSPORT_FREE_CMD_INTR usage
target: Make TFO->check_stop_free return free status
iscsi-target: Fix non-immediate TMR handling
iscsi-target: Add missing CMDSN_LOWER_THAN_EXP check in iscsit_handle_scsi_cmd
target: Avoid double list_del for aborted se_tmr_req
target: Minor cleanups to core_tmr_drain_tmr_list
target: Fix wrong se_tmr being added to drain_tmr_list
target: Fix incorrect se_cmd assignment in core_tmr_drain_tmr_list
target: Check -ENOMEM to signal QUEUE_FULL from fabric callbacks
tcm_loop: Add explict read buffer memset for SCF_SCSI_CONTROL_SG_IO_CDB
target: Fix compile warning w/ missing module.h include
Diffstat (limited to 'net/rds/stats.c')
0 files changed, 0 insertions, 0 deletions