tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
1907131bbeabb33db313bad34f3ec1a5faedbd64
ack-tegra/drivers/scsi
History
Linus Torvalds 70ca0a42fe Fix networking tree iscsi_tcp.c mis-merge 
The removal of the 'waitqueue_active()' test in commit d7d05548a6
("[SCSI] iscsi_tcp: fix relogin/shutdown hang") got incorrectly resolved
by David when he back-merged the main git tree into the networking tree
in commit 278554bd65 ("Merge branch 'master' of master.kernel.org:...").

There was a content conflict due to 'sock->sk->sk_sleep' being changed
into 'sk_sleep(sock->sk)' in the networking tree, but David didn't pick
up the iscsi change from the main tree.

Reported-by: James Bottomley <James.Bottomley@suse.de>
Cc: David Miller <davem@davemloft.net>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2010-05-21 09:48:36 -07:00
..
aacraid
[SCSI] aacraid: add an ifdef'd device delete case instead of taking the device offline
2010-05-16 22:58:27 -04:00
aic7xxx
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
aic7xxx_old
…
aic94xx
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
arcmsr
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
arm
ARM: 5944/1: scsi: fix timer setup in fas216.c
2010-02-18 17:24:21 +00:00
be2iscsi
[SCSI] be2iscsi: fix lock imbalance
2010-04-08 18:41:50 -04:00
bfa
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
2010-05-21 07:19:18 -07:00
bnx2i
[SCSI] Merge scsi-misc-2.6 into scsi-rc-fixes-2.6
2010-05-18 10:37:41 -04:00
cxgb3i
[SCSI] cxgb3i: Fix error path for module init
2010-05-02 15:35:23 -04:00
device_handler
[SCSI] scsi_dh_emc: request flag cleanup
2010-04-11 14:04:02 -05:00
dpt
…
fcoe
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
2010-05-21 07:19:18 -07:00
fnic
[SCSI] fcoe, fnic, libfc: increased CDB size to 16 bytes for fcoe.
2010-04-11 14:02:39 -05:00
ibmvscsi
[SCSI] Merge scsi-misc-2.6 into scsi-rc-fixes-2.6
2010-05-18 10:37:41 -04:00
libfc
[SCSI] libfc: Move the port_id into lport
2010-05-16 22:22:34 -04:00
libsas
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
2010-05-21 07:19:18 -07:00
lpfc
[SCSI] lpfc 8.3.12: Update Driver version to 8.3.12
2010-04-11 13:46:09 -05:00
megaraid
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
mpt2sas
[SCSI] mpt2sas: Bump version 05.100.00.02
2010-04-11 14:00:33 -05:00
mvsas
[SCSI] mvsas: fix hot plug handling and IO issues
2010-04-11 14:44:01 -05:00
osd
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
pcmcia
pcmcia: dev_node removal (write-only drivers)
2010-05-10 10:23:14 +02:00
pm8001
[SCSI] pm8001: potential null dereference in pm8001_dev_gone_notify()
2010-05-02 11:04:23 -04:00
qla2xxx
[SCSI] qla2xxx: Updates to ISP82xx support.
2010-05-16 18:22:11 -04:00
qla4xxx
[SCSI] Merge scsi-misc-2.6 into scsi-rc-fixes-2.6
2010-05-18 10:37:41 -04:00
sym53c8xx_2
drivers/scsi/sym53c8xx_2/sym_glue.c: rename skip_spaces() to sym_skip_spaces()
2009-12-15 08:53:32 -08:00
.gitignore
…
3w-9xxx.c
[SCSI] 3w-xxxx, 3w-9xxx: force 60 second timeout
2010-04-11 09:23:25 -05:00
3w-9xxx.h
[SCSI] 3w-xxxx, 3w-9xxx: force 60 second timeout
2010-04-11 09:23:25 -05:00
3w-sas.c
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
3w-sas.h
…
3w-xxxx.c
[SCSI] 3w-xxxx, 3w-9xxx: force 60 second timeout
2010-04-11 09:23:25 -05:00
3w-xxxx.h
[SCSI] 3w-xxxx, 3w-9xxx: force 60 second timeout
2010-04-11 09:23:25 -05:00
53c700_d.h_shipped
…
53c700.c
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
53c700.h
…
53c700.scr
…
a100u2w.c
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
a100u2w.h
…
a2091.c
[SCSI] a2091: Kill ugly DMA() macro
2010-05-02 16:02:11 -04:00
a2091.h
[SCSI] a2091: Reindentation
2010-05-02 15:54:31 -04:00
a3000.c
[SCSI] a3000: Use shost_priv() and kill ugly HDATA() macro
2010-05-02 16:01:55 -04:00
a3000.h
[SCSI] a3000: Reindentation
2010-05-02 15:55:17 -04:00
a4000t.c
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
advansys.c
[SCSI] advansys: fix narrow board error path
2010-05-01 09:54:22 -05:00
aha152x.c
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
aha152x.h
…
aha1542.c
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
aha1542.h
…
aha1740.c
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
aha1740.h
…
aic7xxx_old.c
…
atari_NCR5380.c
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
atari_scsi.c
…
atari_scsi.h
…
atp870u.c
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
atp870u.h
…
BusLogic.c
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
BusLogic.h
…
bvme6000_scsi.c
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
ch.c
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
constants.c
[SCSI] Fix printing of failed 32-byte commands
2010-02-19 11:15:33 -06:00
dc395x.c
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
dc395x.h
…
dmx3191d.c
tree-wide: fix misspelling of "definition" in comments
2009-12-04 23:41:47 +01:00
dpt_i2o.c
[SCSI] dpt_i2o: several use after free issues
2010-04-08 18:26:15 -04:00
dpti.h
…
dtc.c
…
dtc.h
…
eata_generic.h
…
eata_pio.c
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
eata_pio.h
…
eata.c
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
esp_scsi.c
[SCSI] mac_esp: fix PIO mode, take 2
2010-01-18 10:48:10 -06:00
esp_scsi.h
…
fd_mcs.c
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
fdomain.c
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
fdomain.h
…
FlashPoint.c
[SCSI] FlashPoint: fix off by one tests
2010-01-18 10:48:14 -06:00
g_NCR5380_mmio.c
…
g_NCR5380.c
…
g_NCR5380.h
…
gdth_ioctl.h
[SCSI] gdth: Convert to use regular kernel types.
2010-01-18 10:48:16 -06:00
gdth_proc.c
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
gdth_proc.h
[SCSI] gdth: Convert to use regular kernel types.
2010-01-18 10:48:16 -06:00
gdth.c
[SCSI] gdth: fix buffer overflow
2010-04-11 09:23:31 -05:00
gdth.h
[SCSI] gdth: Convert to use regular kernel types.
2010-01-18 10:48:16 -06:00
gvp11.c
[SCSI] gvp11: Use shost_priv() and kill ugly HDATA() macro
2010-05-02 16:01:24 -04:00
gvp11.h
[SCSI] gvp11: Reindentation
2010-05-02 15:54:47 -04:00
hosts.c
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
hpsa_cmd.h
[SCSI] hpsa: remove unneeded defines
2010-05-02 11:02:17 -04:00
hpsa.c
[SCSI] hpsa: remove unneeded defines
2010-05-02 11:02:17 -04:00
hpsa.h
[SCSI] hpsa: Increase the number of scatter gather elements supported.
2010-03-03 18:37:22 +05:30
hptiop.c
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
hptiop.h
…
ibmmca.c
[SCSI] ibmmca: fix buffer overflow
2010-01-18 10:48:08 -06:00
imm.c
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
imm.h
…
in2000.c
…
in2000.h
…
initio.c
tree-wide: Assorted spelling fixes
2010-02-09 11:13:56 +01:00
initio.h
…
ipr.c
libata: kill ATA_FLAG_DISABLED
2010-05-17 22:49:02 -04:00
ipr.h
[SCSI] ipr: adds PCI ID definitions for new adapters
2010-03-03 16:05:05 +05:30
ips.c
…
ips.h
…
iscsi_tcp.c
Fix networking tree iscsi_tcp.c mis-merge
2010-05-21 09:48:36 -07:00
iscsi_tcp.h
[SCSI] iscsi_tcp: Remove unused field iscsi_conn from struct iscsi_sw_tcp_conn
2010-04-11 14:04:05 -05:00
jazz_esp.c
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
Kconfig
[SCSI] raid_attrs: fix dependency problems
2010-03-03 21:17:06 +05:30
lasi700.c
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
libiscsi_tcp.c
[SCSI] iscsi_tcp: change & to &&
2010-04-11 14:03:59 -05:00
libiscsi.c
[SCSI] libiscsi: regression: fix header digest errors
2010-05-02 11:16:50 -04:00
libsrp.c
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
mac53c94.c
…
mac53c94.h
…
mac_esp.c
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
mac_scsi.c
…
mac_scsi.h
…
Makefile
[SCSI] add scsi trace core functions and put trace points
2010-04-30 12:51:10 -05:00
megaraid.c
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
megaraid.h
…
mesh.c
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
mesh.h
…
mvme16x_scsi.c
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
mvme147.c
[SCSI] mvme147: Use shost_priv() and kill ugly HDATA() macro
2010-05-02 16:01:38 -04:00
mvme147.h
[SCSI] mvme147: Reindentation
2010-05-02 15:55:03 -04:00
ncr53c8xx.c
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
ncr53c8xx.h
…
NCR53c406a.c
…
NCR5380.c
…
NCR5380.h
…
NCR_D700.c
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
NCR_D700.h
…
NCR_Q720.c
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
NCR_Q720.h
…
nsp32_debug.c
…
nsp32_io.h
…
nsp32.c
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
nsp32.h
…
osst_detect.h
…
osst_options.h
…
osst.c
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
osst.h
…
pas16.c
…
pas16.h
…
pmcraid.c
[SCSI] pmcraid: redundant check in pmcraid_check_ioctl_buffer()
2010-04-11 09:23:32 -05:00
pmcraid.h
tree-wide: Assorted spelling fixes
2010-02-09 11:13:56 +01:00
ppa.c
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
ppa.h
…
ps3rom.c
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
qla1280.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
2010-04-05 15:37:12 -07:00
qla1280.h
…
qlogicfas408.c
…
qlogicfas408.h
…
qlogicfas.c
…
qlogicpti.c
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
qlogicpti.h
…
raid_class.c
[SCSI] raid_attrs: fix dependency problems
2010-03-03 21:17:06 +05:30
script_asm.pl
…
scsi_debug.c
[SCSI] Merge scsi-misc-2.6 into scsi-rc-fixes-2.6
2010-05-18 10:37:41 -04:00
scsi_devinfo.c
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
scsi_error.c
[SCSI] Merge scsi-misc-2.6 into scsi-rc-fixes-2.6
2010-05-18 10:37:41 -04:00
scsi_ioctl.c
…
scsi_lib_dma.c
…
scsi_lib.c
Merge branch 'for-2.6.34' of git://git.kernel.dk/linux-2.6-block
2010-03-01 09:00:29 -08:00
scsi_logging.h
…
scsi_module.c
…
scsi_netlink.c
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
scsi_priv.h
…
scsi_proc.c
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
scsi_sas_internal.h
[SCSI] scsi_transport_sas: add support for transport layer retries (TLR)
2010-02-08 17:15:19 -06:00
scsi_scan.c
[SCSI] don't kfree an initialized struct device
2010-04-11 09:24:15 -05:00
scsi_sysctl.c
…
scsi_sysfs.c
[SCSI] fix sdev_rw_attr macro for scsi device sysfs entries
2010-05-01 14:16:30 -05:00
scsi_tgt_if.c
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
scsi_tgt_lib.c
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
scsi_tgt_priv.h
…
scsi_trace.c
[SCSI] scsi_trace: Enhance SCSI command tracing
2010-04-30 12:52:08 -05:00
scsi_transport_api.h
…
scsi_transport_fc_internal.h
…
scsi_transport_fc.c
[SCSI] Allow FC LLD to fast-fail scsi eh by introducing new eh return
2010-04-11 09:49:33 -05:00
scsi_transport_iscsi.c
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
scsi_transport_sas.c
[SCSI] scsi_transport_sas: add support for transport layer retries (TLR)
2010-02-08 17:15:19 -06:00
scsi_transport_spi.c
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
scsi_transport_srp_internal.h
…
scsi_transport_srp.c
…
scsi_typedefs.h
…
scsi_wait_scan.c
…
scsi.c
[SCSI] add scsi trace core functions and put trace points
2010-04-30 12:51:10 -05:00
scsi.h
…
scsicam.c
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
sd_dif.c
…
sd.c
[SCSI] Merge scsi-misc-2.6 into scsi-rc-fixes-2.6
2010-05-18 10:37:41 -04:00
sd.h
[SCSI] sd: WRITE SAME(16) / UNMAP support
2009-12-10 08:54:15 -06:00
ses.c
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
sg.c
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
sgiwd93.c
platform-drivers: move probe to .devinit.text in drivers/scsi
2010-03-07 17:04:50 -08:00
sim710.c
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
sni_53c710.c
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
sr_ioctl.c
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
sr_vendor.c
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
sr.c
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
sr.h
…
st_options.h
…
st.c
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
st.h
[SCSI] st: fix mdata->page_order handling
2009-12-10 08:54:13 -06:00
stex.c
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
sun3_NCR5380.c
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
sun3_scsi_vme.c
…
sun3_scsi.c
…
sun3_scsi.h
…
sun3x_esp.c
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
sun_esp.c
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
sym53c416.c
…
sym53c416.h
…
t128.c
…
t128.h
…
tmscsim.c
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
tmscsim.h
…
u14-34f.c
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
ultrastor.c
…
ultrastor.h
…
vmw_pvscsi.c
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
vmw_pvscsi.h
…
wd33c93.c
[SCSI] wd33c93: Kill empty wd33c93_release()
2010-05-02 15:54:15 -04:00
wd33c93.h
[SCSI] wd33c93: Kill empty wd33c93_release()
2010-05-02 15:54:15 -04:00
wd7000.c
[SCSI] wd7000: fix reset handler typo spin_unlock_irq() => spin_lock_irq()
2010-04-11 13:37:33 -05:00
zalon.c
…
zorro7xx.c
m68k: amiga - Zorro bus modalias support
2010-05-17 21:37:41 +02:00