iMX/i2som-imx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
fd867d51f889aec11cca235ebb008578780d052d
i2som-imx-linux/drivers/scsi
History
David S. Miller 26440c835f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/usb/asix_common.c
	net/ipv4/inet_connection_sock.c
	net/switchdev/switchdev.c

In the inet_connection_sock.c case the request socket hashing scheme
is completely different in net-next.

The other two conflicts were overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-10-20 06:08:27 -07:00
..
aacraid
…
aic7xxx
aic7xxx: Fix typo in error message
2015-08-07 14:36:05 +02:00
aic94xx
Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
2015-09-11 18:15:18 -07:00
arcmsr
Merge tag 'libnvdimm-for-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm
2015-09-08 14:35:59 -07:00
arm
…
be2iscsi
…
bfa
bfa: Fix incorrect de-reference of pointer
2015-09-06 11:39:53 -07:00
bnx2fc
bnx2fc: Read npiv table from nvram and create vports.
2015-08-06 21:54:13 -07:00
bnx2i
…
csiostor
…
cxgbi
cxgb4i: Increased the value of MAX_IMM_TX_PKT_LEN from 128 to 256 bytes
2015-10-14 18:40:32 -07:00
cxlflash
cxlflash: Remove unused variable from queuecommand
2015-08-26 18:08:47 -07:00
device_handler
scsi_dh: kill struct scsi_dh_data
2015-08-28 13:14:57 -07:00
dpt
…
esas2r
…
fcoe
Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
2015-09-11 18:15:18 -07:00
fnic
fnic: Use the local variable instead of I/O flag to acquire io_req_lock in fnic_queuecommand() to avoid deadloack
2015-08-18 08:11:23 -07:00
ibmvscsi
…
isci
…
libfc
Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
2015-09-02 12:22:54 -07:00
libsas
…
lpfc
lpfc: Fix possible use-after-free and double free in lpfc_mbx_cmpl_rdp_page_a2()
2015-09-06 11:51:39 -07:00
megaraid
megaraid_sas: fix whitespace errors
2015-08-26 07:36:51 -07:00
mpt2sas
mpt2sas: setpci reset kernel oops fix
2015-09-06 11:57:25 -07:00
mpt3sas
mpt3sas : Bump mpt3sas driver version to 9.100.00.00
2015-08-27 11:08:31 -07:00
mvsas
Merge tag 'libnvdimm-for-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm
2015-09-08 14:35:59 -07:00
osd
…
pcmcia
…
pm8001
pm80xx: Don't override ts->stat on IO_OPEN_CNX_ERROR_HW_RESOURCE_BUSY
2015-09-06 11:53:31 -07:00
qla2xxx
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2015-09-11 19:00:42 -07:00
qla4xxx
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2015-06-24 16:49:49 -07:00
snic
snic: driver for Cisco SCSI HBA
2015-06-19 16:57:51 -07:00
sym53c8xx_2
…
ufs
Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
2015-06-23 15:55:44 -07:00
.gitignore
…
3w-9xxx.c
3w-9xxx: don't unmap bounce buffered commands
2015-10-07 10:24:48 -07:00
3w-9xxx.h
…
3w-sas.c
…
3w-sas.h
…
3w-xxxx.c
…
3w-xxxx.h
…
53c700_d.h_shipped
…
53c700.c
[SCSI] Fix printk typos in drivers/scsi
2015-08-07 14:28:45 +02:00
53c700.h
…
53c700.scr
…
a100u2w.c
scsi: a100u2w: trivial typo in printk
2015-08-07 15:03:42 +02:00
a100u2w.h
…
a2091.c
…
a2091.h
…
a3000.c
…
a3000.h
…
a4000t.c
…
advansys.c
advansys: fix compilation errors and warnings when CONFIG_PCI is not set
2015-06-13 08:42:36 -07:00
aha152x.c
…
aha152x.h
…
aha1542.c
…
aha1542.h
…
aha1740.c
…
aha1740.h
…
am53c974.c
…
atari_NCR5380.c
…
atari_scsi.c
…
atp870u.c
…
atp870u.h
…
BusLogic.c
…
BusLogic.h
…
bvme6000_scsi.c
…
ch.c
…
constants.c
…
dc395x.c
…
dc395x.h
…
dmx3191d.c
…
dpt_i2o.c
x86/vm86: Clean up vm86.h includes
2015-07-31 13:31:10 +02:00
dpti.h
…
dtc.c
…
dtc.h
…
eata_generic.h
…
eata_pio.c
…
eata_pio.h
…
eata.c
…
esp_scsi.c
…
esp_scsi.h
…
fdomain.c
…
fdomain.h
…
FlashPoint.c
…
g_NCR5380_mmio.c
…
g_NCR5380.c
…
g_NCR5380.h
…
gdth_ioctl.h
…
gdth_proc.c
…
gdth_proc.h
…
gdth.c
…
gdth.h
…
gvp11.c
…
gvp11.h
…
hosts.c
…
hpsa_cmd.h
hpsa: add in new offline mode
2015-08-26 16:28:48 -07:00
hpsa.c
hpsa: fix rmmod issues
2015-08-26 16:29:49 -07:00
hpsa.h
Change how controllers in mixed mode are handled.
2015-08-26 16:28:15 -07:00
hptiop.c
hptiop: Support HighPoint RR36xx HBAs and Support SAS tape and SAS media changer
2015-08-12 13:14:57 -07:00
hptiop.h
hptiop: Support HighPoint RR36xx HBAs and Support SAS tape and SAS media changer
2015-08-12 13:14:57 -07:00
imm.c
…
imm.h
…
in2000.c
…
in2000.h
…
initio.c
…
initio.h
…
ipr.c
ipr: Enable SIS pipe commands for SIS-32 devices.
2015-08-28 13:14:53 -07:00
ipr.h
ipr: Driver version 2.6.2
2015-07-30 12:41:47 -07:00
ips.c
…
ips.h
…
iscsi_boot_sysfs.c
…
iscsi_tcp.c
…
iscsi_tcp.h
…
jazz_esp.c
…
Kconfig
cxlflash: Base support for IBM CXL Flash Adapter
2015-07-30 21:02:01 -07:00
lasi700.c
…
libiscsi_tcp.c
…
libiscsi.c
libiscsi: Fix iscsi_check_transport_timeouts possible infinite loop
2015-09-17 07:25:02 -07:00
mac53c94.c
…
mac53c94.h
…
mac_esp.c
…
mac_scsi.c
…
Makefile
scsi_dh: integrate into the core SCSI code
2015-08-28 13:14:56 -07:00
megaraid.c
megaraid : use dev_printk when possible
2015-08-26 07:23:04 -07:00
megaraid.h
…
mesh.c
…
mesh.h
…
mvme16x_scsi.c
…
mvme147.c
…
mvme147.h
…
mvumi.c
…
mvumi.h
…
ncr53c8xx.c
…
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
…
nsp32.h
…
osst_detect.h
…
osst_options.h
…
osst.c
…
osst.h
…
pas16.c
…
pas16.h
…
pmcraid.c
…
pmcraid.h
…
ppa.c
…
ppa.h
…
ps3rom.c
…
qla1280.c
…
qla1280.h
…
qlogicfas408.c
…
qlogicfas408.h
…
qlogicfas.c
…
qlogicpti.c
…
qlogicpti.h
…
raid_class.c
…
script_asm.pl
…
scsi_common.c
scsi: Protect against buffer possible overflow in scsi_set_sense_information
2015-07-23 22:53:05 -07:00
scsi_debug.c
scsi_debug: resp_request: remove unused variable
2015-09-06 11:03:14 -07:00
scsi_devinfo.c
…
scsi_dh.c
scsi_dh: Use the correct module name when loading device handler
2015-10-01 10:46:28 -07:00
scsi_error.c
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2015-09-11 19:00:42 -07:00
scsi_ioctl.c
…
scsi_lib_dma.c
…
scsi_lib.c
blk-mq: fix racy updates of rq->errors
2015-10-01 10:10:55 +02:00
scsi_logging.c
…
scsi_logging.h
…
scsi_module.c
…
scsi_netlink.c
…
scsi_pm.c
SCSI: Fix NULL pointer dereference in runtime PM
2015-08-18 08:14:14 -07:00
scsi_priv.h
scsi_dh: integrate into the core SCSI code
2015-08-28 13:14:56 -07:00
scsi_proc.c
…
scsi_sas_internal.h
…
scsi_scan.c
…
scsi_sysctl.c
…
scsi_sysfs.c
scsi_dh: integrate into the core SCSI code
2015-08-28 13:14:56 -07:00
scsi_trace.c
…
scsi_transport_api.h
…
scsi_transport_fc.c
…
scsi_transport_iscsi.c
Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
2015-09-02 12:22:54 -07:00
scsi_transport_sas.c
scsi_transport_sas: Remove check for SAS expander when querying bay/enclosure IDs.
2015-09-06 11:13:41 -07:00
scsi_transport_spi.c
[SCSI] Fix printk typos in drivers/scsi
2015-08-07 14:28:45 +02:00
scsi_transport_srp.c
IB/srp: Avoid using uninitialized variable
2015-07-14 13:20:09 -04:00
scsi_typedefs.h
…
scsi.c
…
scsi.h
…
scsicam.c
…
sd_dif.c
…
sd.c
Merge branch 'for-4.3/core' of git://git.kernel.dk/linux-block
2015-09-02 13:10:25 -07:00
sd.h
…
ses.c
…
sg.c
…
sgiwd93.c
…
sim710.c
…
sni_53c710.c
…
sr_ioctl.c
…
sr_vendor.c
…
sr.c
…
sr.h
…
st_options.h
…
st.c
st: Destroy st_index_idr on module exit
2015-08-26 07:45:25 -07:00
st.h
…
stex.c
…
storvsc_drv.c
storvsc: Set the error code correctly in failure conditions
2015-08-26 22:41:36 -07:00
sun3_scsi_vme.c
…
sun3_scsi.c
…
sun3_scsi.h
…
sun3x_esp.c
arch, drivers: don't include <asm/io.h> directly, use <linux/io.h> instead
2015-08-10 23:07:05 -04:00
sun_esp.c
…
sym53c416.c
…
sym53c416.h
…
t128.c
…
t128.h
…
u14-34f.c
…
ultrastor.c
…
ultrastor.h
…
virtio_scsi.c
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
2015-07-23 13:07:04 -07:00
vmw_pvscsi.c
…
vmw_pvscsi.h
…
wd33c93.c
…
wd33c93.h
…
wd719x.c
[SCSI] Fix printk typos in drivers/scsi
2015-08-07 14:28:45 +02:00
wd719x.h
…
wd7000.c
…
xen-scsifront.c
xen: Use correctly the Xen memory terminologies
2015-09-08 18:03:49 +01:00
zalon.c
…
zorro7xx.c
…