David S. Miller 2745529ac7 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Couple conflicts resolved here: 1) In the MACB driver, a bug fix to properly initialize the RX tail pointer properly overlapped with some changes to support variable sized rings. 2) In XGBE we had a "CONFIG_PM" --> "CONFIG_PM_SLEEP" fix overlapping with a reorganization of the driver to support ACPI, OF, as well as PCI variants of the chip. 3) In 'net' we had several probe error path bug fixes to the stmmac driver, meanwhile a lot of this code was cleaned up and reorganized in 'net-next'. 4) The cls_flower classifier obtained a helper function in 'net-next' called __fl_delete() and this overlapped with Daniel Borkamann's bug fix to use RCU for object destruction in 'net'. It also overlapped with Jiri's change to guard the rhashtable_remove_fast() call with a check against tc_skip_sw(). 5) In mlx4, a revert bug fix in 'net' overlapped with some unrelated changes in 'net-next'. 6) In geneve, a stale header pointer after pskb_expand_head() bug fix in 'net' overlapped with a large reorganization of the same code in 'net-next'. Since the 'net-next' code no longer had the bug in question, there was nothing to do other than to simply take the 'net-next' hunks. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-12-03 12:29:53 -05:00
..
aacraid	SCSI misc on 20161006	2016-10-07 09:28:53 -07:00
aic7xxx	…
aic94xx	scsi: aic94xx: Add missing error code assignment before test	2016-08-25 23:39:25 -04:00
arcmsr	scsi: arcmsr: Send SYNCHRONIZE_CACHE command to firmware	2016-10-26 22:17:43 -04:00
arm	…
be2iscsi	Merge remote-tracking branch 'mkp-scsi/4.9/scsi-fixes' into fixes	2016-11-22 14:27:06 -08:00
bfa	scsi: bfa: Do not dereference port before it is null checked	2016-09-02 06:09:16 -04:00
bnx2fc	scsi: bnx2fc: Mark symbols static where possible	2016-09-09 07:11:07 -04:00
bnx2i	…
csiostor	scsi: csiostor: Fix completion usage	2016-09-14 13:19:15 -04:00
cxgbi	cxgb4: Allocate Tx queues dynamically	2016-11-18 14:04:29 -05:00
cxlflash	scsi: cxlflash: Fix context reference tracking on detach	2016-09-14 12:47:42 -04:00
device_handler	scsi: scsi_dh_alua: Fix a reference counting bug	2016-11-01 13:32:24 -04:00
dpt	…
esas2r	scsi: esas2r: don't reinitialize adapter's req_table	2016-08-25 22:28:17 -04:00
fcoe	SCSI misc on 20161006	2016-10-07 09:28:53 -07:00
fnic	…
hisi_sas	scsi: hisi_sas: send three identify before phy up	2016-09-14 12:54:18 -04:00
ibmvscsi	scsi: ibmvfc: Fix I/O hang when port is not mapped	2016-09-19 19:50:33 -04:00
ibmvscsi_tgt	scsi: ibmvscsis: Fixed unused variable	2016-09-19 11:51:59 -04:00
isci	…
libfc	scsi: libfc: fix seconds_since_last_reset miscalculation	2016-11-17 20:44:51 -05:00
libsas	…
lpfc	scsi: lpfc: Mark symbols static where possible	2016-09-26 20:35:51 -04:00
megaraid	scsi: megaraid_sas: fix macro MEGASAS_IS_LOGICAL to avoid regression	2016-11-09 11:26:41 -05:00
mpt3sas	scsi: mpt3sas: Unblock device after controller reset	2016-11-22 17:18:08 -05:00
mvsas	mvsas: fix error return code in mvs_task_prep()	2016-10-31 10:28:08 -06:00
osd	…
pcmcia	…
pm8001	scsi: pm8001: Mark symbols static where possible	2016-09-26 21:10:45 -04:00
qla2xxx	scsi: qla2xxx: do not abort all commands in the adapter during EEH recovery	2016-11-14 18:38:10 -05:00
qla4xxx	scsi: qla4xxx: Mark symbols static where possible	2016-09-02 06:06:43 -04:00
smartpqi	scsi: smartpqi: raid bypass lba calculation fix	2016-09-19 11:55:26 -04:00
snic	…
sym53c8xx_2	scsi: sym53c8xx_2: Use complete() instead complete_all()	2016-09-14 13:19:29 -04:00
ufs	scsi: ufs: Kconfig fix	2016-09-29 21:57:08 -04:00
.gitignore	…
3w-9xxx.c	…
3w-9xxx.h	…
3w-sas.c	…
3w-sas.h	…
3w-xxxx.c	…
3w-xxxx.h	…
53c700.c	…
53c700.h	…
53c700.scr	…
53c700_d.h_shipped	…
BusLogic.c	…
BusLogic.h	…
FlashPoint.c	…
Kconfig	scsi: dtc: remove from tree	2016-09-26 20:49:25 -04:00
Makefile	scsi: dtc: remove from tree	2016-09-26 20:49:25 -04:00
NCR53c406a.c	…
NCR5380.c	scsi: NCR5380: no longer mark irq probing as __init	2016-10-17 14:13:03 -04:00
NCR5380.h	scsi: ncr5380: Improve interrupt latency during PIO tranfers	2016-09-14 14:11:12 -04:00
NCR_D700.c	…
NCR_D700.h	…
NCR_Q720.c	…
NCR_Q720.h	…
a100u2w.c	…
a100u2w.h	…
a2091.c	…
a2091.h	…
a3000.c	…
a3000.h	…
a4000t.c	…
advansys.c	…
aha152x.c	…
aha152x.h	…
aha1542.c	…
aha1542.h	…
aha1740.c	…
aha1740.h	…
am53c974.c	…
atari_scsi.c	…
atp870u.c	…
atp870u.h	…
bvme6000_scsi.c	…
ch.c	…
constants.c	…
dc395x.c	…
dc395x.h	…
dmx3191d.c	…
dpt_i2o.c	…
dpti.h	…
eata.c	…
eata_generic.h	…
eata_pio.c	…
eata_pio.h	…
esp_scsi.c	…
esp_scsi.h	…
fdomain.c	…
fdomain.h	…
g_NCR5380.c	scsi: g_NCR5380: Stop using scsi_module.c	2016-09-29 21:52:43 -04:00
g_NCR5380.h	scsi: g_NCR5380: Stop using scsi_module.c	2016-09-29 21:52:43 -04:00
g_NCR5380_mmio.c	…
gdth.c	…
gdth.h	…
gdth_ioctl.h	…
gdth_proc.c	…
gdth_proc.h	…
gvp11.c	…
gvp11.h	…
hosts.c	SCSI misc on 20161006	2016-10-07 09:28:53 -07:00
hpsa.c	scsi: hpsa: use bus '3' for legacy HBA devices	2016-11-22 17:17:55 -05:00
hpsa.h	scsi: hpsa: use bus '3' for legacy HBA devices	2016-11-22 17:17:55 -05:00
hpsa_cmd.h	scsi: hpsa: Check for vpd support before sending	2016-09-14 14:19:31 -04:00
hptiop.c	…
hptiop.h	…
imm.c	…
imm.h	…
initio.c	…
initio.h	…
ipr.c	scsi: ipr: Fix async error WARN_ON	2016-10-14 16:26:31 -04:00
ipr.h	scsi: ipr: Don't log unnecessary 9084 error details	2016-09-19 11:57:33 -04:00
ips.c	…
ips.h	…
iscsi_boot_sysfs.c	…
iscsi_tcp.c	…
iscsi_tcp.h	…
jazz_esp.c	…
lasi700.c	…
libiscsi.c	scsi: libiscsi: Fix locking in __iscsi_conn_send_pdu	2016-10-17 13:34:44 -04:00
libiscsi_tcp.c	…
mac53c94.c	…
mac53c94.h	…
mac_esp.c	…
mac_scsi.c	…
megaraid.c	…
megaraid.h	…
mesh.c	…
mesh.h	…
mvme16x_scsi.c	…
mvme147.c	…
mvme147.h	…
mvumi.c	…
mvumi.h	…
ncr53c8xx.c	…
ncr53c8xx.h	…
nsp32.c	…
nsp32.h	…
nsp32_debug.c	…
nsp32_io.h	…
osst.c	…
osst.h	…
osst_detect.h	…
osst_options.h	…
pmcraid.c	genetlink: mark families as __ro_after_init	2016-10-27 16:16:09 -04:00
pmcraid.h	…
ppa.c	…
ppa.h	…
ps3rom.c	…
qla1280.c	…
qla1280.h	…
qlogicfas.c	…
qlogicfas408.c	…
qlogicfas408.h	…
qlogicpti.c	…
qlogicpti.h	qlogicpti: Fix compiler warnings	2016-11-28 15:51:31 -05:00
raid_class.c	…
script_asm.pl	…
scsi.c	scsi: Avoid that toggling use_blk_mq triggers a memory leak	2016-09-26 20:58:42 -04:00
scsi.h	…
scsi_common.c	…
scsi_debug.c	scsi: scsi_debug: Fix memory leak if LBP enabled and module is unloaded	2016-10-26 22:14:50 -04:00
scsi_devinfo.c	scsi: blacklist all RDAC devices for BLIST_NO_ULD_ATTACH	2016-08-16 00:58:13 -04:00
scsi_dh.c	scsi: Replace wrong device handler name for CLARiiON arrays	2016-10-11 17:56:51 -04:00
scsi_error.c	…
scsi_ioctl.c	…
scsi_lib.c	blk-mq: remove ->map_queue	2016-09-15 08:42:03 -06:00
scsi_lib_dma.c	…
scsi_logging.c	…
scsi_logging.h	…
scsi_module.c	…
scsi_netlink.c	…
scsi_pm.c	…
scsi_priv.h	SCSI misc on 20161006	2016-10-07 09:28:53 -07:00
scsi_proc.c	…
scsi_sas_internal.h	…
scsi_scan.c	scsi: Remove one useless stack variable	2016-10-11 18:02:09 -04:00
scsi_sysctl.c	…
scsi_sysfs.c	…
scsi_trace.c	…
scsi_transport_api.h	…
scsi_transport_fc.c	…
scsi_transport_iscsi.c	…
scsi_transport_sas.c	scsi: sas: remove is_sas_attached()	2016-08-18 22:23:20 -04:00
scsi_transport_spi.c	…
scsi_transport_srp.c	…
scsi_typedefs.h	…
scsicam.c	…
sd.c	scsi: sd: Move DIF protection types to t10-pi.h	2016-09-15 09:51:14 -04:00
sd.h	scsi: sd: Move DIF protection types to t10-pi.h	2016-09-15 09:51:14 -04:00
sd_dif.c	scsi: sd: Move DIF protection types to t10-pi.h	2016-09-15 09:51:14 -04:00
sense_codes.h	…
ses.c	scsi: ses: use scsi_is_sas_rphy instead of is_sas_attached	2016-08-18 22:22:19 -04:00
sg.c	scsi: sg: Use mult_frac, drop MULDIV macro	2016-08-30 22:18:59 -04:00
sgiwd93.c	…
sim710.c	…
sni_53c710.c	…
sr.c	scsi: sr: constify sr_pm_ops structure	2016-09-04 01:28:08 -04:00
sr.h	…
sr_ioctl.c	…
sr_vendor.c	…
st.c	mm: replace get_user_pages_unlocked() write/force parameters with gup_flags	2016-10-18 14:13:37 -07:00
st.h	…
st_options.h	…
stex.c	…
storvsc_drv.c	…
sun3_scsi.c	…
sun3_scsi.h	…
sun3_scsi_vme.c	…
sun3x_esp.c	…
sun_esp.c	…
sym53c416.c	…
sym53c416.h	…
virtio_scsi.c	SCSI misc on 20161006	2016-10-07 09:28:53 -07:00
vmw_pvscsi.c	scsi: vmw_pvscsi: return SUCCESS for successful command aborts	2016-11-01 13:31:23 -04:00
vmw_pvscsi.h	scsi: vmw_pvscsi: return SUCCESS for successful command aborts	2016-11-01 13:31:23 -04:00
wd33c93.c	…
wd33c93.h	…
wd719x.c	drivers/scsi/wd719x.c: remove last declaration using DEFINE_PCI_DEVICE_TABLE	2016-09-01 17:52:01 -07:00
wd719x.h	…
xen-scsifront.c	…
zalon.c	…
zorro7xx.c	…