sugar/linux
1
0
Fork 0
Code Activity
Files
9e56e3800ea42e78b7c816bdd2d87d047be80541
linux/drivers/scsi
History
David S. Miller b26d344c6b Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/caif/caif_hsi.c
	drivers/net/usb/qmi_wwan.c

The qmi_wwan merge was trivial.

The caif_hsi.c, on the other hand, was not.  It's a conflict between
1c385f1fdf ("caif-hsi: Replace platform
device with ops structure.") in the net-next tree and commit
39abbaef19 ("caif-hsi: Postpone init of
HIS until open()") in the net tree.

I did my best with that one and will ask Sjur to check it out.

Signed-off-by: David S. Miller <davem@davemloft.net>
2012-06-28 17:37:00 -07:00
..
aacraid
[SCSI] aacraid: add an iounmap call to aac_src_ioremap
2012-04-23 19:28:24 +01:00
aic7xxx
Documentation: remove references to /etc/modprobe.conf
2012-03-30 16:03:15 -07:00
aic7xxx_old
…
aic94xx
aic94xx: Get rid of redundant NULL check before release_firmware() call
2012-04-30 13:22:58 +02:00
arcmsr
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
arm
Merge tag 'split-asm_system_h-for-linus-20120328' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-asm_system
2012-03-28 15:58:21 -07:00
be2iscsi
[SCSI] be2iscsi: fix dma free size mismatch regression
2012-05-30 13:34:22 +04:00
bfa
[SCSI] bfa: Fix to set vport FC host sysfs entries
2012-05-22 11:06:29 +01:00
bnx2fc
bnx2x, bnx2fc, bnx2i, cnic: Add statistics support and FCoE capabilities advertisement
2012-06-27 01:20:13 -07:00
bnx2i
bnx2x, bnx2fc, bnx2i, cnic: Add statistics support and FCoE capabilities advertisement
2012-06-27 01:20:13 -07:00
cxgbi
Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
2012-03-22 12:55:29 -07:00
device_handler
[SCSI] scsi_dh_alua: Optimize the STPG command
2012-04-23 19:28:18 +01:00
dpt
atomic: use <linux/atomic.h>
2011-07-26 16:49:47 -07:00
fcoe
[SCSI] fcoe, bnx2fc, libfcoe: SW FCoE and bnx2fc use FCoE Syfs
2012-05-23 09:43:13 +01:00
fnic
[SCSI] fnic: fix incorrect use of SLAB_CACHE_DMA flag
2011-06-29 16:05:41 -05:00
ibmvscsi
powerpc+sparc/vio: Modernize driver registration
2012-03-28 11:33:24 +11:00
isci
isci: End the RNC resumption wait when the RNC is destroyed.
2012-05-17 14:33:44 -07:00
libfc
Merge tag 'isci-for-3.5' into misc
2012-05-21 12:17:30 +01:00
libsas
[SCSI] Revert "[SCSI] libsas: fix sas port naming"
2012-04-23 12:15:53 +01:00
lpfc
[SCSI] lpfc 8.3.31: Update lpfc to version 8.3.31
2012-05-17 11:18:30 +01:00
megaraid
[SCSI] megaraid_sas: Version and Changelog update
2012-04-23 19:26:41 +01:00
mpt2sas
[SCSI] mpt2sas: Fix unsafe using smp_processor_id() in preemptible
2012-06-06 12:38:56 +09:00
mvsas
Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
2012-03-22 12:55:29 -07:00
osd
[SCSI] osd_uld: Bump MAX_OSD_DEVICES from 64 to 1,048,576
2012-02-25 08:25:09 -06:00
pcmcia
module_param: make bool parameters really bool (drivers & misc)
2012-01-13 09:32:20 +10:30
pm8001
[SCSI] pm8001: raise host can queue
2012-05-10 09:02:07 +01:00
qla2xxx
qla2xxx: Remove version.h header file inclusion
2012-06-12 21:25:50 -07:00
qla4xxx
[SCSI] qla4xxx: Update driver version to 5.02.00-k17
2012-05-30 13:01:34 +04:00
sym53c8xx_2
[SCSI] sym53c8xx: Fix NULL pointer dereference in slave_destroy
2012-01-10 17:01:18 -06:00
ufs
[SCSI] ufs: fix potential NULL pointer dereferencing error in ufshcd_prove.
2012-05-23 09:29:39 +01:00
.gitignore
…
3w-9xxx.c
[SCSI] 3w-9xxx: fix iommu_iova leak
2011-09-26 09:28:58 -05:00
3w-9xxx.h
…
3w-sas.c
…
3w-sas.h
…
3w-xxxx.c
…
3w-xxxx.h
…
53c700_d.h_shipped
…
53c700.c
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
53c700.h
…
53c700.scr
…
a100u2w.c
…
a100u2w.h
…
a2091.c
scsi: Fix up files implicitly depending on module.h inclusion
2011-10-31 19:31:24 -04:00
a2091.h
…
a3000.c
scsi: Fix up files implicitly depending on module.h inclusion
2011-10-31 19:31:24 -04:00
a3000.h
…
a4000t.c
…
advansys.c
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
aha152x.c
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
aha152x.h
…
aha1542.c
scsi: delete the MCA specific drivers and driver code
2012-05-17 19:03:54 -04:00
aha1542.h
…
aha1740.c
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
aha1740.h
…
aic7xxx_old.c
…
atari_NCR5380.c
…
atari_scsi.c
scsi/atari: Make more functions static
2012-04-22 20:16:49 +02:00
atari_scsi.h
scsi/atari: Make more functions static
2012-04-22 20:16:49 +02:00
atp870u.c
Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
2012-03-31 13:31:23 -07:00
atp870u.h
…
BusLogic.c
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
BusLogic.h
…
bvme6000_scsi.c
…
ch.c
…
constants.c
…
dc395x.c
module_param: make bool parameters really bool (drivers & misc)
2012-01-13 09:32:20 +10:30
dc395x.h
…
dmx3191d.c
…
dpt_i2o.c
…
dpti.h
…
dtc.c
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
dtc.h
…
eata_generic.h
…
eata_pio.c
…
eata_pio.h
…
eata.c
…
esp_scsi.c
scsi: Use vsprintf extention %pf with builtin_return_address
2012-04-05 17:09:40 -07:00
esp_scsi.h
…
fdomain.c
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
fdomain.h
…
FlashPoint.c
…
g_NCR5380_mmio.c
…
g_NCR5380.c
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
g_NCR5380.h
…
gdth_ioctl.h
…
gdth_proc.c
…
gdth_proc.h
…
gdth.c
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
gdth.h
treewide: Fix comment and string typo 'bufer'
2011-12-06 09:53:40 +01:00
gvp11.c
scsi: Fix up files implicitly depending on module.h inclusion
2011-10-31 19:31:24 -04:00
gvp11.h
…
hosts.c
[SCSI] fix oops in all legacy host adapters caused by 6f381fa
2012-05-10 08:24:13 +01:00
hpsa_cmd.h
[SCSI] hpsa: dial down lockup detection during firmware flash
2012-05-10 09:19:39 +01:00
hpsa.c
[SCSI] hpsa: dial down lockup detection during firmware flash
2012-05-10 09:19:39 +01:00
hpsa.h
[SCSI] hpsa: dial down lockup detection during firmware flash
2012-05-10 09:19:39 +01:00
hptiop.c
…
hptiop.h
…
imm.c
…
imm.h
…
in2000.c
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
in2000.h
…
initio.c
…
initio.h
…
ipr.c
[SCSI] libsas, libata: fix start of life for a sas ata_port
2012-04-23 12:11:47 +01:00
ipr.h
[SCSI] ipr: Driver version 2.5.3
2012-03-28 15:09:28 +01:00
ips.c
scsi: remove the second argument of k[un]map_atomic()
2012-03-20 21:48:19 +08:00
ips.h
…
iscsi_boot_sysfs.c
switch ->is_visible() to returning umode_t
2012-01-03 22:54:55 -05:00
iscsi_tcp.c
sock: Introduce named constants for sk_reuse
2012-04-21 15:52:25 -04:00
iscsi_tcp.h
…
jazz_esp.c
misc latin1 to utf8 conversions
2012-01-02 13:04:55 +01:00
Kconfig
Merge branch 'delete-mca' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
2012-05-23 17:12:06 -07:00
lasi700.c
…
libiscsi_tcp.c
Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
2012-03-22 12:55:29 -07:00
libiscsi.c
[SCSI] libiscsi: fix cmd timeout/completion race
2012-02-19 08:09:00 -06:00
libsrp.c
scsi: Fix up files implicitly depending on module.h inclusion
2011-10-31 19:31:24 -04:00
mac53c94.c
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
mac53c94.h
…
mac_esp.c
mac_esp: rename irq
2012-01-22 14:50:03 +01:00
mac_scsi.c
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
mac_scsi.h
…
Makefile
scsi: delete the MCA specific drivers and driver code
2012-05-17 19:03:54 -04:00
megaraid.c
scsi: remove the second argument of k[un]map_atomic()
2012-03-20 21:48:19 +08:00
megaraid.h
…
mesh.c
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
mesh.h
…
mvme16x_scsi.c
…
mvme147.c
…
mvme147.h
…
mvumi.c
[SCSI] mvumi: Add Marvell UMI driver
2011-08-27 08:36:58 -06:00
mvumi.h
[SCSI] mvumi: Add Marvell UMI driver
2011-08-27 08:36:58 -06:00
ncr53c8xx.c
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
ncr53c8xx.h
…
NCR53c406a.c
…
NCR5380.c
…
NCR5380.h
…
NCR_D700.c
…
NCR_D700.h
…
NCR_Q720.c
…
NCR_Q720.h
…
nsp32_debug.c
…
nsp32_io.h
…
nsp32.c
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
nsp32.h
…
osst_detect.h
…
osst_options.h
…
osst.c
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
osst.h
…
pas16.c
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
pas16.h
…
pmcraid.c
SCSI, pmcraid: Fix spelling error in a pmcraid_err() call
2011-12-15 16:35:38 +01:00
pmcraid.h
scsi: Fix typo in pmcraid.h
2012-02-21 11:40:37 +01:00
ppa.c
…
ppa.h
…
ps3rom.c
scsi: Fix up files implicitly depending on module.h inclusion
2011-10-31 19:31:24 -04:00
qla1280.c
qla1280: Remove redundant NULL check before release_firmware() call
2012-04-30 13:25:43 +02:00
qla1280.h
…
qlogicfas408.c
…
qlogicfas408.h
…
qlogicfas.c
…
qlogicpti.c
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
qlogicpti.h
…
raid_class.c
…
script_asm.pl
…
scsi_debug.c
Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
2012-03-31 13:31:23 -07:00
scsi_devinfo.c
…
scsi_error.c
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-05-22 19:22:50 -07:00
scsi_ioctl.c
…
scsi_lib_dma.c
scsi: Add export.h for EXPORT_SYMBOL/THIS_MODULE as required
2011-10-31 19:31:23 -04:00
scsi_lib.c
[SCSI] Fix dm-multipath starvation when scsi host is busy
2012-05-23 09:34:17 +01:00
scsi_logging.h
…
scsi_module.c
…
scsi_netlink.c
Merge branch 'for-linus' of git://selinuxproject.org/~jmorris/linux-security
2012-01-14 18:36:33 -08:00
scsi_pm.c
[SCSI] scsi_pm: resume device if suspend failed
2012-05-22 11:09:50 +01:00
scsi_priv.h
[SCSI] sd: limit the scope of the async probe domain
2012-05-17 09:10:46 +01:00
scsi_proc.c
…
scsi_sas_internal.h
…
scsi_scan.c
[SCSI] fix async probe regression
2012-05-30 13:37:07 +04:00
scsi_sysctl.c
…
scsi_sysfs.c
[SCSI] scsi: Added support for adapter and firmware reset
2011-08-27 08:36:46 -06:00
scsi_tgt_if.c
scsi: Add export.h for EXPORT_SYMBOL/THIS_MODULE as required
2011-10-31 19:31:23 -04:00
scsi_tgt_lib.c
…
scsi_tgt_priv.h
…
scsi_trace.c
…
scsi_transport_api.h
…
scsi_transport_fc_internal.h
…
scsi_transport_fc.c
[SCSI] fc class: fix scanning when devs are offline
2012-05-10 08:59:23 +01:00
scsi_transport_iscsi.c
[SCSI] iscsi class: fix gfp use in ping compl and host event
2012-03-27 08:26:36 +01:00
scsi_transport_sas.c
[SCSI] scsi_transport_sas: 'enable' phys on reset
2012-02-29 15:43:54 -06:00
scsi_transport_spi.c
[SCSI] scsi_transport_spi: fix for unbalanced reference counting
2012-05-10 09:06:12 +01:00
scsi_transport_srp_internal.h
…
scsi_transport_srp.c
…
scsi_typedefs.h
…
scsi_wait_scan.c
[SCSI] fix scsi_wait_scan
2012-05-30 13:46:37 +04:00
scsi.c
[SCSI] Fix sd_probe_domain config problem
2012-06-07 10:16:20 +09:00
scsi.h
…
scsicam.c
fs: move code out of buffer.c
2012-01-03 22:54:07 -05:00
sd_dif.c
scsi: remove the second argument of k[un]map_atomic()
2012-03-20 21:48:19 +08:00
sd.c
SCSI & usb-storage: add try_rc_10_first flag
2012-06-22 22:05:31 -07:00
sd.h
[SCSI] Handle disk devices which can not process medium access commands
2012-02-19 10:14:52 -06:00
ses.c
…
sg.c
[SCSI] sg: constify sg_proc_leaf_arr
2012-05-17 10:08:57 +01:00
sgiwd93.c
…
sim710.c
scsi: delete the MCA specific drivers and driver code
2012-05-17 19:03:54 -04:00
sni_53c710.c
misc latin1 to utf8 conversions
2012-01-02 13:04:55 +01:00
sr_ioctl.c
scsi: Fix up files implicitly depending on module.h inclusion
2011-10-31 19:31:24 -04:00
sr_vendor.c
…
sr.c
[SCSI] sr: check_events() ignore GET_EVENT when TUR says otherwise
2011-07-21 14:15:58 -07:00
sr.h
[SCSI] sr: check_events() ignore GET_EVENT when TUR says otherwise
2011-07-21 14:15:58 -07:00
st_options.h
…
st.c
Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
2012-03-31 13:31:23 -07:00
st.h
[SCSI] st: fix memory leak with >1MB tape I/O
2012-05-10 08:32:34 +01:00
stex.c
…
storvsc_drv.c
[SCSI] storvsc: Properly handle errors from the host
2012-04-25 09:51:43 +01:00
sun3_NCR5380.c
…
sun3_scsi_vme.c
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
sun3_scsi.c
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
sun3_scsi.h
…
sun3x_esp.c
…
sun_esp.c
…
sym53c416.c
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
sym53c416.h
…
t128.c
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
t128.h
…
tmscsim.c
…
tmscsim.h
…
u14-34f.c
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
ultrastor.c
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
ultrastor.h
…
virtio_scsi.c
[SCSI] virtio_scsi: fix TMF use-after-free
2012-05-10 08:27:06 +01:00
vmw_pvscsi.c
[SCSI] vmw_pvscsi: Try setting host->max_id as suggested by the device.
2012-03-27 08:26:36 +01:00
vmw_pvscsi.h
[SCSI] vmw_pvscsi: Try setting host->max_id as suggested by the device.
2012-03-27 08:26:36 +01:00
wd33c93.c
…
wd33c93.h
…
wd7000.c
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
zalon.c
…
zorro7xx.c
…