diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-05-21 18:03:14 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-05-21 18:03:14 +0900 |
| commit | a7aa96a92eff3c4b2c7df8c8535691a5a487207d (patch) | |
| tree | fca01e6d923d59c0b438f7b8296a03e01a30c090 /drivers/acpi/battery.c | |
| parent | b14002761c01dcd2e416ad6d922bd0acf21e4a9d (diff) | |
| parent | 1e1110c43b1cda9fe77fc4a04835e460550e6b3c (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
Pull scsi target fixes from Nicholas Bellinger:
"This series include:
- Close race between iser-target network portal shutdown + accepting
new connection logins (sagi)
- Fix free-after-use regression in tcm_fc post conversion to
percpu-ida pre-allocation (nab)
- Explicitly disable Immediate + Unsolicited Data for iser-target
connections when T10-PI is enabled (sagi + nab)
- Allow pi_prot_type + emulate_write_cache attributes to be set to
zero regardless of backend support (andy)
- memory leak fix (mikulas)"
* git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending:
target: fix memory leak on XCOPY
target: Don't allow setting WC emulation if device doesn't support
iscsi-target: Disable Immediate + Unsolicited Data with ISER Protection
tcm_fc: Fix free-after-use regression in ft_free_cmd
iscsi-target: Change BUG_ON to REJECT in iscsit_process_nop_out
Target/iscsi,iser: Avoid accepting transport connections during stop stage
Target/iser: Fix iscsit_accept_np and rdma_cm racy flow
Target/iser: Fix wrong connection requests list addition
target: Allow non-supporting backends to set pi_prot_type to 0
Diffstat (limited to 'drivers/acpi/battery.c')
0 files changed, 0 insertions, 0 deletions