iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
linux/drivers/scsi
History
David S. Miller 0c1072ae02 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/ethernet/freescale/fec_main.c
	drivers/net/ethernet/renesas/sh_eth.c
	net/ipv4/gre.c

The GRE conflict is between a bug fix (kfree_skb --> kfree_skb_list)
and the splitting of the gre.c code into seperate files.

The FEC conflict was two sets of changes adding ethtool support code
in an "!CONFIG_M5272" CPP protected block.

Finally the sh_eth.c conflict was between one commit add bits set
in the .eesr_err_check mask whilst another commit removed the
.tx_error_check member and assignments.

Signed-off-by: David S. Miller <davem@davemloft.net>
2013-07-03 14:55:13 -07:00
..
aacraid
[SCSI] aacraid: Dual firmware image support
2013-04-10 11:55:52 -07:00
aic7xxx
aic7xxx: switch to ->show_info()
2013-04-09 14:13:26 -04:00
aic7xxx_old
aix7xxx_old: switch to ->show_info()
2013-04-09 14:13:28 -04:00
aic94xx
[SCSI] sas: unify the pointlessly separated enums sas_dev_type and sas_device_type
2013-05-10 07:47:52 -07:00
arcmsr
workqueue: deprecate flush[_delayed]_work_sync()
2012-08-20 14:51:24 -07:00
arm
acornscsi: switch to ->show_info()
2013-04-09 14:13:27 -04:00
be2iscsi
[SCSI] be2iscsi: Bump the driver version to 10.0.467.0
2013-05-02 08:22:19 -07:00
bfa
lseek(fd, n, SEEK_END) does *not* go to eof - n
2013-06-16 08:10:53 -10:00
bnx2fc
[SCSI] bnx2fc: Bumped version to 1.0.14
2013-05-02 07:32:26 -07:00
bnx2i
treewide: Fix typo in printk and comments
2013-04-24 16:43:00 +02:00
csiostor
[SCSI] csiostor: off by one error
2013-05-02 07:37:10 -07:00
cxgbi
net, scsi/csgb4i: convert skb->transport_header into skb_transport_header(skb)
2013-06-17 17:12:20 -07:00
device_handler
[SCSI] scsi_dh_alua: Add module parameter to allow failover to non preferred path without STPG
2013-04-11 16:00:31 -07:00
dpt
atomic: use <linux/atomic.h>
2011-07-26 16:49:47 -07:00
fcoe
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2013-07-03 14:55:13 -07:00
fnic
lseek(fd, n, SEEK_END) does *not* go to eof - n
2013-06-16 08:10:53 -10:00
ibmvscsi
[SCSI] ibmvfc: Driver version 1.0.11
2013-05-02 11:58:18 -07:00
isci
[SCSI] sas: unify the pointlessly separated enums sas_dev_type and sas_device_type
2013-05-10 07:47:52 -07:00
libfc
libfc: extend ex_lock to protect all of fc_seq_send
2013-05-10 10:19:23 -07:00
libsas
Merge branch 'misc' into for-linus
2013-05-10 07:53:40 -07:00
lpfc
lseek(fd, n, SEEK_END) does *not* go to eof - n
2013-06-16 08:10:53 -10:00
megaraid
[SCSI] megaraid_sas: release lock on error path
2013-05-02 12:08:46 -07:00
mpt2sas
Merge branch 'for-3.10/core' of git://git.kernel.dk/linux-block
2013-05-08 10:13:35 -07:00
mpt3sas
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2013-05-01 17:51:54 -07:00
mvsas
[SCSI] sas: unify the pointlessly separated enums sas_dev_type and sas_device_type
2013-05-10 07:47:52 -07:00
osd
treewide: Fix typos in kernel messages
2013-03-31 17:50:31 +02:00
pcmcia
nsp_cs: switch to ->show_info()
2013-04-09 14:13:21 -04:00
pm8001
[SCSI] sas: unify the pointlessly separated enums sas_dev_type and sas_device_type
2013-05-10 07:47:52 -07:00
qla2xxx
This patch fixes a critical bug that was introduced in 3.9
2013-06-26 23:08:22 -07:00
qla4xxx
[SCSI] iscsi class, qla4xxx: fix sess/conn refcounting when find fns are used
2013-05-10 07:47:53 -07:00
sym53c8xx_2
sym53c8xx_2: switch to ->show_info()
2013-04-09 14:13:15 -04:00
ufs
[SCSI] ufs: Correct the expected data transfersize
2013-05-02 16:16:50 -07:00
.gitignore
…
3w-9xxx.c
new helper: file_inode(file)
2013-02-22 23:31:31 -05:00
3w-9xxx.h
Fix common misspellings
2011-03-31 11:26:23 -03:00
3w-sas.c
new helper: file_inode(file)
2013-02-22 23:31:31 -05:00
3w-sas.h
…
3w-xxxx.c
new helper: file_inode(file)
2013-02-22 23:31:31 -05:00
3w-xxxx.h
Fix common misspellings
2011-03-31 11:26:23 -03:00
53c700_d.h_shipped
Fix common misspellings
2011-03-31 11:26:23 -03:00
53c700.c
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
53c700.h
…
53c700.scr
Fix common misspellings
2011-03-31 11:26:23 -03:00
a100u2w.c
Drivers: scsi: remove __dev* attributes.
2013-01-03 15:57:01 -08:00
a100u2w.h
…
a2091.c
switch wd33c93 to ->show_info()
2013-04-09 14:13:15 -04:00
a2091.h
…
a3000.c
switch wd33c93 to ->show_info()
2013-04-09 14:13:15 -04:00
a3000.h
…
a4000t.c
…
advansys.c
advansys: fix buggered formats - unsigned long != u32 on 64bit
2013-04-09 14:13:22 -04:00
aha152x.c
aha152x: switch to ->show_info()
2013-04-09 14:13:22 -04:00
aha152x.h
…
aha1542.c
treewide: Put a space between #include and FILE
2012-06-28 11:44:36 +02:00
aha1542.h
…
aha1740.c
aha1740: switch to ->show_info()
2013-04-09 14:13:23 -04:00
aha1740.h
…
aic7xxx_old.c
aix7xxx_old: switch to ->show_info()
2013-04-09 14:13:28 -04:00
atari_NCR5380.c
atari_scsi: switch to ->show_info()
2013-04-09 14:13:29 -04:00
atari_scsi.c
atari_scsi: switch to ->show_info()
2013-04-09 14:13:29 -04:00
atari_scsi.h
atari_scsi: switch to ->show_info()
2013-04-09 14:13:29 -04:00
atp870u.c
atp870u: switch to ->show_info()
2013-04-09 14:13:24 -04:00
atp870u.h
…
BusLogic.c
BusLogic: switch to ->show_info()
2013-04-09 14:13:19 -04:00
BusLogic.h
BusLogic: switch to ->show_info()
2013-04-09 14:13:19 -04:00
bvme6000_scsi.c
Drivers: scsi: remove __dev* attributes.
2013-01-03 15:57:01 -08:00
ch.c
scsi: convert to idr_alloc()
2013-02-27 19:10:18 -08:00
constants.c
[SCSI] add DID_TARGET_FAILURE and DID_NEXUS_FAILURE to hostbyte_table in constants.c
2012-09-14 11:58:53 +01:00
dc395x.c
dc395x: switch to ->show_info()
2013-04-09 14:13:24 -04:00
dc395x.h
Fix common misspellings
2011-03-31 11:26:23 -03:00
dmx3191d.c
Drivers: scsi: remove __dev* attributes.
2013-01-03 15:57:01 -08:00
dpt_i2o.c
dpt_i2o: switch to ->show_info()
2013-04-09 14:13:24 -04:00
dpti.h
…
dtc.c
NCR5830: switch to ->show_info()
2013-04-09 14:13:17 -04:00
dtc.h
NCR5830: switch to ->show_info()
2013-04-09 14:13:17 -04:00
eata_generic.h
…
eata_pio.c
eata_pio: switch to ->show_info()
2013-04-09 14:13:23 -04:00
eata_pio.h
…
eata.c
[SCSI] remove cmd->serial_number litter
2011-05-01 10:22:40 -05:00
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
Drivers: scsi: remove __dev* attributes.
2013-01-03 15:57:01 -08:00
fdomain.h
…
FlashPoint.c
Fix common misspellings
2011-03-31 11:26:23 -03:00
g_NCR5380_mmio.c
…
g_NCR5380.c
NCR5830: switch to ->show_info()
2013-04-09 14:13:17 -04:00
g_NCR5380.h
…
gdth_ioctl.h
…
gdth_proc.c
gdth: switch to ->show_info()
2013-04-09 14:13:16 -04:00
gdth_proc.h
gdth: switch to ->show_info()
2013-04-09 14:13:16 -04:00
gdth.c
gdth: switch to ->show_info()
2013-04-09 14:13:16 -04:00
gdth.h
gdth: switch to ->show_info()
2013-04-09 14:13:16 -04:00
gvp11.c
switch wd33c93 to ->show_info()
2013-04-09 14:13:15 -04:00
gvp11.h
…
hosts.c
driver-core: constify data for class_find_device()
2013-02-06 12:18:56 -08: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: check for dma_mapping_error in hpsa_passthru ioctls
2013-02-24 09:36:58 +00:00
hpsa.h
[SCSI] hpsa: dial down lockup detection during firmware flash
2012-05-10 09:19:39 +01:00
hptiop.c
Drivers: scsi: remove __dev* attributes.
2013-01-03 15:57:01 -08:00
hptiop.h
[SCSI] hptiop: Support HighPoint RR4520/RR4522 HBA
2012-11-27 08:59:43 +04:00
imm.c
imm: switch to ->show_info()
2013-04-09 14:13:16 -04:00
imm.h
…
in2000.c
in2000: switch to ->show_info()
2013-04-09 14:13:25 -04:00
in2000.h
…
initio.c
Drivers: scsi: remove __dev* attributes.
2013-01-03 15:57:01 -08:00
initio.h
Fix common misspellings
2011-03-31 11:26:23 -03:00
ipr.c
[SCSI] ipr: Avoid target_destroy accessing memory after it was freed
2013-05-12 15:07:42 -07:00
ipr.h
[SCSI] ipr: Avoid target_destroy accessing memory after it was freed
2013-05-12 15:07:42 -07:00
ips.c
ips: fix format bugs exposed by previous commit
2013-04-09 14:13:27 -04:00
ips.h
ips: switch to ->show_info()
2013-04-09 14:13:27 -04:00
iscsi_boot_sysfs.c
switch ->is_visible() to returning umode_t
2012-01-03 22:54:55 -05:00
iscsi_tcp.c
[SCSI] iscsi_tcp: support PF_MEMALLOC/__GFP_MEMALLOC
2013-04-11 16:55:04 -07:00
iscsi_tcp.h
…
jazz_esp.c
Drivers: scsi: remove __dev* attributes.
2013-01-03 15:57:01 -08:00
Kconfig
[SCSI] lpfc: fix up Kconfig dependencies
2013-05-10 07:47:44 -07:00
lasi700.c
Drivers: scsi: remove __dev* attributes.
2013-01-03 15:57:01 -08:00
libiscsi_tcp.c
net: Unmap fragment page once iterator is done
2013-06-24 01:46:01 -07:00
libiscsi.c
[SCSI] libiscsi: avoid unnecessary multiple NULL assignments
2013-04-11 16:54:01 -07: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
Drivers: scsi: remove __dev* attributes.
2013-01-03 15:57:01 -08:00
mac_scsi.c
NCR5830: switch to ->show_info()
2013-04-09 14:13:17 -04:00
mac_scsi.h
NCR5830: switch to ->show_info()
2013-04-09 14:13:17 -04:00
Makefile
[SCSI] mpt3sas: add new driver supporting 12GB SAS
2012-12-01 10:09:17 +00:00
megaraid.c
megaraid: single_open() leak
2013-05-05 00:15:15 -04:00
megaraid.h
megaraid: Don't use create_proc_read_entry()
2013-04-29 15:41:57 -04:00
mesh.c
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
mesh.h
…
mvme16x_scsi.c
Drivers: scsi: remove __dev* attributes.
2013-01-03 15:57:01 -08:00
mvme147.c
switch wd33c93 to ->show_info()
2013-04-09 14:13:15 -04:00
mvme147.h
…
mvumi.c
[SCSI] mvumi: Use PCI_VENDOR_ID_MARVELL_EXT for 0x1b4b
2013-04-15 14:30:44 -06:00
mvumi.h
[SCSI] mvumi: Use PCI_VENDOR_ID_MARVELL_EXT for 0x1b4b
2013-04-15 14:30:44 -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
NCR5830: switch to ->show_info()
2013-04-09 14:13:17 -04:00
NCR5380.h
NCR5830: switch to ->show_info()
2013-04-09 14:13:17 -04:00
NCR_D700.c
Drivers: scsi: remove __dev* attributes.
2013-01-03 15:57:01 -08:00
NCR_D700.h
…
NCR_Q720.c
Drivers: scsi: remove __dev* attributes.
2013-01-03 15:57:01 -08:00
NCR_Q720.h
…
nsp32_debug.c
treewide: fix a few typos in comments
2011-05-10 10:16:21 +02:00
nsp32_io.h
…
nsp32.c
nsp32: switch to ->show_info()
2013-04-09 14:13:21 -04:00
nsp32.h
Fix common misspellings
2011-03-31 11:26:23 -03:00
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
Fix common misspellings
2011-03-31 11:26:23 -03:00
pas16.c
NCR5830: switch to ->show_info()
2013-04-09 14:13:17 -04:00
pas16.h
NCR5830: switch to ->show_info()
2013-04-09 14:13:17 -04:00
pmcraid.c
pmcraid: don't wank with fasync in ->release()
2013-04-29 15:41:45 -04:00
pmcraid.h
scsi: Fix typo in pmcraid.h
2012-02-21 11:40:37 +01:00
ppa.c
ppa: switch to ->show_info()
2013-04-09 14:13:17 -04:00
ppa.h
…
ps3rom.c
Drivers: scsi: remove __dev* attributes.
2013-01-03 15:57:01 -08:00
qla1280.c
Drivers: scsi: remove __dev* attributes.
2013-01-03 15:57:01 -08:00
qla1280.h
…
qlogicfas408.c
…
qlogicfas408.h
…
qlogicfas.c
Drivers: scsi: remove __dev* attributes.
2013-01-03 15:57:01 -08:00
qlogicpti.c
Drivers: scsi: remove __dev* attributes.
2013-01-03 15:57:01 -08:00
qlogicpti.h
…
raid_class.c
…
script_asm.pl
…
scsi_debug.c
Merge branch 'misc' into for-linus
2013-05-10 07:53:40 -07:00
scsi_devinfo.c
[SCSI] Disable DIF on Hitachi Ultrastar 15K300
2012-09-24 12:11:00 +04:00
scsi_error.c
[SCSI] Handle MLQUEUE busy response in scsi_send_eh_cmnd
2013-05-10 07:47:44 -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] sd: use REQ_PM in sd's runtime suspend operation
2013-05-06 12:48:17 -07:00
scsi_logging.h
…
scsi_module.c
…
scsi_netlink.c
scsi: replace obsolete NLMSG_* with type safe nlmsg_*
2013-03-28 14:27:24 -04:00
scsi_pm.c
[SCSI] sd: change to auto suspend mode
2013-05-06 12:48:31 -07:00
scsi_priv.h
[SCSI] async: introduce 'async_domain' type
2012-07-20 09:05:54 +01:00
scsi_proc.c
fix buffer leak after "scsi: saner replacements for ->proc_info()"
2013-05-31 15:16:51 -04:00
scsi_sas_internal.h
…
scsi_scan.c
Merge SCSI misc branch into isci-for-3.6 tag
2012-10-02 08:55:12 +01:00
scsi_sysctl.c
…
scsi_sysfs.c
[SCSI] prevent stack buffer overflow in host_reset
2012-11-30 09:08:16 +00: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] esp, scsi_tgt_lib, fcoe: use list_move() instead of list_del()/list_add() combination
2011-05-01 10:20:10 -05:00
scsi_tgt_priv.h
…
scsi_trace.c
[SCSI] scsi_trace: Decode UNMAP bit in WRITE SAME(10)
2011-05-24 12:38:36 -04:00
scsi_transport_api.h
…
scsi_transport_fc_internal.h
…
scsi_transport_fc.c
scsi: replace obsolete NLMSG_* with type safe nlmsg_*
2013-03-28 14:27:24 -04:00
scsi_transport_iscsi.c
[SCSI] iscsi class, qla4xxx: fix sess/conn refcounting when find fns are used
2013-05-10 07:47:53 -07:00
scsi_transport_sas.c
[SCSI] scsi_transport_sas: add 12GB definitions for mpt3sas
2012-12-01 10:08:41 +00: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
IB/srp: Allow SRP disconnect through sysfs
2012-11-30 17:40:33 -08:00
scsi_typedefs.h
…
scsi.c
[SCSI] Add a report opcode helper
2012-11-13 21:11:31 -08:00
scsi.h
…
scsicam.c
fs: move code out of buffer.c
2012-01-03 22:54:07 -05:00
sd_dif.c
[SCSI] sd_dif: problem with verify of type 1 protection information (PI)
2013-05-02 15:37:03 -07:00
sd.c
Merge branch 'postmerge' into for-linus
2013-05-10 07:54:01 -07:00
sd.h
[SCSI] sd: fix array cache flushing bug causing performance problems
2013-05-02 16:15:54 -07:00
ses.c
[SCSI] ses: requesting a fault indication
2011-06-29 12:14:25 -05:00
sg.c
aio: don't include aio.h in sched.h
2013-05-07 20:16:25 -07:00
sgiwd93.c
Drivers: scsi: remove __dev* attributes.
2013-01-03 15:57:01 -08:00
sim710.c
Drivers: scsi: remove __dev* attributes.
2013-01-03 15:57:01 -08:00
sni_53c710.c
Drivers: scsi: remove __dev* attributes.
2013-01-03 15:57:01 -08: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
block_device_operations->release() should return void
2013-05-07 02:16:21 -04: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
[SCSI] st: Take additional queue ref in st_probe
2013-04-06 11:14:20 +01:00
st.h
[SCSI] st: raise device limit
2012-09-14 17:59:29 +01:00
stex.c
Drivers: scsi: remove __dev* attributes.
2013-01-03 15:57:01 -08:00
storvsc_drv.c
SCSI for-linus on 20130301
2013-03-02 11:42:16 -08:00
sun3_NCR5380.c
sun3_scsi: add ->show_info()
2013-05-04 14:50:16 -04:00
sun3_scsi_vme.c
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
sun3_scsi.c
sun3_scsi: add ->show_info()
2013-05-04 14:50:16 -04:00
sun3_scsi.h
sun3_scsi: add ->show_info()
2013-05-04 14:50:16 -04:00
sun3x_esp.c
Drivers: scsi: remove __dev* attributes.
2013-01-03 15:57:01 -08:00
sun_esp.c
Drivers: scsi: remove __dev* attributes.
2013-01-03 15:57:01 -08:00
sym53c416.c
Drivers: scsi: remove __dev* attributes.
2013-01-03 15:57:01 -08:00
sym53c416.h
…
t128.c
NCR5830: switch to ->show_info()
2013-04-09 14:13:17 -04:00
t128.h
NCR5830: switch to ->show_info()
2013-04-09 14:13:17 -04:00
tmscsim.c
Drivers: scsi: remove __dev* attributes.
2013-01-03 15:57:01 -08:00
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
virtio-scsi: reset virtqueue affinity when doing cpu hotplug
2013-04-08 23:06:56 +09:30
vmw_pvscsi.c
Drivers: scsi: remove __dev* attributes.
2013-01-03 15:57:01 -08: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
switch wd33c93 to ->show_info()
2013-04-09 14:13:15 -04:00
wd33c93.h
switch wd33c93 to ->show_info()
2013-04-09 14:13:15 -04:00
wd7000.c
wd7000: switch to ->show_info()
2013-04-09 14:13:15 -04:00
zalon.c
Drivers: scsi: remove __dev* attributes.
2013-01-03 15:57:01 -08:00
zorro7xx.c
Drivers: scsi: remove __dev* attributes.
2013-01-03 15:57:01 -08:00