David S. Miller 2be09de7d6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Lots of conflicts, by happily all cases of overlapping changes, parallel adds, things of that nature. Thanks to Stephen Rothwell, Saeed Mahameed, and others for their guidance in these resolutions. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-12-20 11:53:36 -08:00
..
aacraid	SCSI misc on 20181024	2018-10-25 07:40:30 -07:00
aic7xxx	scsi: aic7xxx: remove set but not used variable 'shared_scb_data'	2018-09-17 02:34:16 -04:00
aic94xx	scsi: aic94xx: fully convert to the generic DMA API	2018-10-17 21:58:51 -04:00
arcmsr	scsi: arcmsr: Remove set but not used variables 'id, lun'	2018-10-16 18:13:59 -04:00
arm	…
be2iscsi	SCSI misc on 20181024	2018-10-25 07:40:30 -07:00
bfa	SCSI misc on 20181024	2018-10-25 07:40:30 -07:00
bnx2fc	scsi: bnx2fc: Fix NULL dereference in error handling	2018-12-07 22:23:41 -05:00
bnx2i	…
csiostor	SCSI misc on 20181024	2018-10-25 07:40:30 -07:00
cxgbi	cxgb4: use new fw interface to get the VIN and smt index	2018-11-23 11:11:15 -08:00
cxlflash	SCSI misc on 20180815	2018-08-15 22:06:26 -07:00
device_handler	…
dpt	…
esas2r	…
fcoe	SCSI misc on 20180815	2018-08-15 22:06:26 -07:00
fnic	scsi: fnic: replace gross legacy tag hack with blk-mq hack	2018-10-17 22:06:04 -04:00
hisi_sas	scsi: hisi_sas: Remove set but not used variable 'dq_list'	2018-11-05 22:43:13 -05:00
ibmvscsi	scsi: ibmvscsi: change strncpy+truncation to strlcpy	2018-07-30 23:17:53 -04:00
ibmvscsi_tgt	SCSI misc on 20181024	2018-10-25 07:40:30 -07:00
isci	scsi: isci: Change sci_controller_start_task's return type to sci_status	2018-10-16 21:38:47 -04:00
libfc	scsi: libfc: retry PRLI if we cannot analyse the payload	2018-10-15 23:53:37 -04:00
libsas	scsi: libsas: fix a race condition when smp task timeout	2018-09-25 21:20:23 -04:00
lpfc	scsi: lpfc: fix block guard enablement on SLI3 adapters	2018-11-28 12:14:25 -05:00
megaraid	scsi: megaraid_sas: switch to generic DMA API	2018-10-17 21:58:52 -04:00
mpt3sas	SCSI misc on 20181024	2018-10-25 07:40:30 -07:00
mvsas	scsi: mvsas: Remove set but not used variable 'id'	2018-10-23 21:36:02 -04:00
osd	scsi: osd: initiator should use mq variant of request ending	2018-10-16 17:48:35 -04:00
pcmcia	scsi: aha152x: rename the PCMCIA define	2018-11-02 00:15:23 +09:00
pm8001	scsi: pm8001: switch to generic DMA API	2018-10-17 21:58:52 -04:00
qedf	scsi: qedf: fully convert to the generic DMA API	2018-10-17 21:58:53 -04:00
qedi	SCSI misc on 20181024	2018-10-25 07:40:30 -07:00
qla2xxx	Revert "scsi: qla2xxx: Fix NVMe Target discovery"	2018-12-07 22:22:33 -05:00
qla4xxx	SCSI misc on 20181024	2018-10-25 07:40:30 -07:00
smartpqi	scsi: smartpqi: fully convert to the generic DMA API	2018-10-17 21:58:53 -04:00
snic	scsi: snic: switch to generic DMA API	2018-10-17 21:58:53 -04:00
sym53c8xx_2	scsi: sym53c8xx: fix NULL pointer dereference panic in sym_int_sir()	2018-09-11 20:54:02 -04:00
ufs	scsi: ufs: Fix hynix ufs bug with quirk on hi36xx SoC	2018-11-08 21:22:52 -05:00
.gitignore	…
3w-9xxx.c	scsi: 3w-sas: 3w-9xxx: Use unsigned char for cdb	2018-10-23 21:27:53 -04:00
3w-9xxx.h	…
3w-sas.c	scsi: 3w-sas: 3w-9xxx: Use unsigned char for cdb	2018-10-23 21:27:53 -04:00
3w-sas.h	…
3w-xxxx.c	scsi: 3w-xxx: fully convert to the generic DMA API	2018-10-17 21:58:51 -04:00
3w-xxxx.h	scsi: 3w-xxx: fully convert to the generic DMA API	2018-10-17 21:58:51 -04:00
53c700.c	…
53c700.h	scsi: 53c700: Fix spelling of 'NEGOTIATION'	2018-08-30 07:27:22 -04:00
53c700.scr	…
53c700_d.h_shipped	…
BusLogic.c	scsi: BusLogic: switch to generic DMA API	2018-10-17 21:58:51 -04:00
BusLogic.h	…
FlashPoint.c	scsi: FlashPoint: Remove unnecessary parentheses	2018-09-25 20:45:53 -04:00
Kconfig	scsi: myrs: only build on little-endian platforms	2018-11-05 22:35:01 -05:00
Makefile	scsi: myrs: Add Mylex RAID controller (SCSI interface)	2018-10-17 21:07:54 -04:00
NCR5380.c	scsi: NCR5380: Return false instead of NULL	2018-11-05 22:47:38 -05:00
NCR5380.h	scsi: NCR5380: Have NCR5380_select() return a bool	2018-09-28 02:17:51 -04:00
a100u2w.c	scsi: a100u2w: switch to generic DMA API	2018-10-17 21:58:51 -04:00
a100u2w.h	…
a2091.c	…
a2091.h	…
a3000.c	…
a3000.h	…
a4000t.c	…
advansys.c	scsi: advansys: remove unused variable 'srb_tag' in adv_isr_callback	2018-10-17 21:01:59 -04:00
aha152x.c	scsi: aha152x: rename the PCMCIA define	2018-11-02 00:15:23 +09:00
aha152x.h	…
aha1542.c	…
aha1542.h	…
aha1740.c	…
aha1740.h	…
am53c974.c	scsi: esp_scsi: move dma mapping into the core code	2018-10-15 23:00:38 -04:00
atari_scsi.c	…
atp870u.c	scsi: atp870u: switch to generic DMA API	2018-10-17 21:58:52 -04:00
atp870u.h	…
bvme6000_scsi.c	…
ch.c	…
constants.c	…
dc395x.c	scsi: dc395x: use generic DMA API	2018-10-17 21:34:20 -04:00
dc395x.h	…
dmx3191d.c	…
dpt_i2o.c	…
dpti.h	…
esp_scsi.c	scsi: esp_scsi: Optimize PIO loops	2018-10-17 21:38:29 -04:00
esp_scsi.h	scsi: esp_scsi: De-duplicate PIO routines	2018-10-17 21:38:20 -04:00
g_NCR5380.c	…
gdth.c	…
gdth.h	…
gdth_ioctl.h	…
gdth_proc.c	…
gdth_proc.h	…
gvp11.c	…
gvp11.h	…
hosts.c	Revert "scsi: core: avoid host-wide host_busy counter for scsi_mq"	2018-08-27 13:17:00 -04:00
hpsa.c	SCSI misc on 20181024	2018-10-25 07:40:30 -07:00
hpsa.h	scsi: hpsa: correct enclosure sas address	2018-07-10 22:25:03 -04:00
hpsa_cmd.h	…
hptiop.c	…
hptiop.h	…
imm.c	…
imm.h	…
initio.c	…
initio.h	…
ipr.c	scsi: ipr: System hung while dlpar adding primary ipr adapter back	2018-09-21 12:35:39 -04:00
ipr.h	scsi: ipr: System hung while dlpar adding primary ipr adapter back	2018-09-21 12:35:39 -04:00
ips.c	scsi: ips: switch to generic DMA API	2018-10-17 21:58:53 -04:00
ips.h	…
iscsi_boot_sysfs.c	…
iscsi_tcp.c	scsi: iscsi_tcp: Explicitly cast param in iscsi_sw_tcp_host_get_param	2018-10-16 21:50:06 -04:00
iscsi_tcp.h	…
jazz_esp.c	scsi: esp_scsi: move dma mapping into the core code	2018-10-15 23:00:38 -04:00
lasi700.c	…
libiscsi.c	scsi: libiscsi: Fix NULL pointer dereference in iscsi_eh_session_reset	2018-11-28 18:38:22 -05:00
libiscsi_tcp.c	…
mac53c94.c	…
mac53c94.h	…
mac_esp.c	scsi: esp_scsi: De-duplicate PIO routines	2018-10-17 21:38:20 -04:00
mac_scsi.c	…
megaraid.c	…
megaraid.h	…
mesh.c	scsi: mesh: switch to generic DMA API	2018-10-17 21:58:53 -04:00
mesh.h	…
mvme16x_scsi.c	…
mvme147.c	…
mvme147.h	…
mvumi.c	scsi: mvumi: switch to generic DMA API	2018-10-17 21:58:52 -04:00
mvumi.h	…
myrb.c	scsi: myrb: fix sprintf buffer overflow warning	2018-11-05 22:35:01 -05:00
myrb.h	scsi: myrb: Add Mylex RAID controller (block interface)	2018-10-17 21:06:49 -04:00
myrs.c	scsi: myrs: avoid stack overflow warning	2018-11-05 22:35:01 -05:00
myrs.h	scsi: myrs: Add Mylex RAID controller (SCSI interface)	2018-10-17 21:07:54 -04:00
ncr53c8xx.c	scsi: ncr53c8xx: remove ScsiResult macro	2018-07-10 22:42:47 -04:00
ncr53c8xx.h	…
nsp32.c	scsi: nsp32: switch to generic DMA API	2018-10-17 21:58:52 -04:00
nsp32.h	…
nsp32_debug.c	…
nsp32_io.h	…
osst.c	…
osst.h	…
osst_detect.h	…
osst_options.h	…
pmcraid.c	…
pmcraid.h	…
ppa.c	…
ppa.h	…
ps3rom.c	…
qla1280.c	scsi: qla1280: switch to generic DMA API	2018-10-17 21:58:53 -04:00
qla1280.h	…
qlogicfas.c	…
qlogicfas408.c	…
qlogicfas408.h	…
qlogicpti.c	…
qlogicpti.h	…
raid_class.c	scsi: raid_attrs: fix unused variable warning	2018-08-30 07:21:04 -04:00
script_asm.pl	…
scsi.c	…
scsi.h	…
scsi_common.c	…
scsi_debug.c	SCSI misc on 20180815	2018-08-15 22:06:26 -07:00
scsi_debugfs.c	…
scsi_debugfs.h	…
scsi_devinfo.c	…
scsi_dh.c	…
scsi_error.c	scsi: core: Remove scsi_block_when_processing_errors: message	2018-10-17 20:54:20 -04:00
scsi_ioctl.c	…
scsi_lib.c	SCSI: fix queue cleanup race before queue initialization is done	2018-11-14 08:19:10 -07:00
scsi_lib_dma.c	…
scsi_logging.c	…
scsi_logging.h	…
scsi_netlink.c	…
scsi_pm.c	block: Move power management code into a new source file	2018-09-26 15:11:28 -06:00
scsi_priv.h	…
scsi_proc.c	…
scsi_sas_internal.h	…
scsi_scan.c	…
scsi_sysctl.c	…
scsi_sysfs.c	scsi: core: Avoid that SCSI device removal through sysfs triggers a deadlock	2018-08-02 15:53:36 -04:00
scsi_trace.c	…
scsi_transport_api.h	…
scsi_transport_fc.c	SCSI misc on 20180815	2018-08-15 22:06:26 -07:00
scsi_transport_iscsi.c	…
scsi_transport_sas.c	scsi: libsas: delete dead code in scsi_transport_sas.c	2018-09-25 21:20:23 -04:00
scsi_transport_spi.c	…
scsi_transport_srp.c	…
scsicam.c	…
sd.c	block: Introduce blk_revalidate_disk_zones()	2018-10-25 11:17:40 -06:00
sd.h	block: Introduce blk_revalidate_disk_zones()	2018-10-25 11:17:40 -06:00
sd_dif.c	block: move dif_prepare/dif_complete functions to block layer	2018-07-30 08:27:02 -06:00
sd_zbc.c	block: Introduce blk_revalidate_disk_zones()	2018-10-25 11:17:40 -06:00
sense_codes.h	…
ses.c	…
sg.c	scsi: sg: remove bad blk_end_request_all() call	2018-10-16 17:49:57 -04:00
sgiwd93.c	…
sim710.c	…
sni_53c710.c	…
sr.c	block: genhd: add 'groups' argument to device_add_disk	2018-09-28 08:30:28 -06:00
sr.h	…
sr_ioctl.c	block: Switch struct packet_command to use struct scsi_sense_hdr	2018-08-02 15:22:13 -06:00
sr_vendor.c	…
st.c	scsi: st: remove redundant pointer STbuffer	2018-08-08 21:15:54 -04:00
st.h	…
st_options.h	…
stex.c	…
storvsc_drv.c	scsi: storvsc: Fix a race in sub-channel creation that can cause panic	2018-11-28 21:33:16 -05:00
sun3_scsi.c	…
sun3_scsi_vme.c	…
sun3x_esp.c	scsi: esp_scsi: move dma mapping into the core code	2018-10-15 23:00:38 -04:00
sun_esp.c	scsi: esp_scsi: move dma mapping into the core code	2018-10-15 23:00:38 -04:00
virtio_scsi.c	scsi: virtio_scsi: fix pi_bytes{out,in} on 4 KiB block size devices	2018-07-26 15:49:43 -06:00
vmw_pvscsi.c	scsi: vmw_pscsi: Rearrange code to avoid multiple calls to free_irq during unload	2018-11-28 18:55:57 -05:00
vmw_pvscsi.h	…
wd33c93.c	…
wd33c93.h	…
wd719x.c	…
wd719x.h	…
xen-scsifront.c	…
zalon.c	…
zorro7xx.c	…
zorro_esp.c	scsi: esp_scsi: De-duplicate PIO routines	2018-10-17 21:38:20 -04:00