Jens Axboe b28bc9b38c Linux 3.13-rc6 ... -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAABAgAGBQJSwLfoAAoJEHm+PkMAQRiGi6QH/1U1B7lmHChDTw3jj1lfm9gA 189Si4QJlnxFWCKHvKEL+pcaVuACU+aMGI8+KyMYK4/JfuWVjjj5fr/SvyHH2/8m LdSK8aHMhJ46uBS4WJ/l6v46qQa5e2vn8RKSBAyKm/h4vpt+hd6zJdoFrFai4th7 k/TAwOAEHI5uzexUChwLlUBRTvbq4U8QUvDu+DeifC8cT63CGaaJ4qVzjOZrx1an eP6UXZrKDASZs7RU950i7xnFVDQu4PsjlZi25udsbeiKcZJgPqGgXz5ULf8ZH8RQ YCi1JOnTJRGGjyIOyLj7pyB01h7XiSM2+eMQ0S7g54F2s7gCJ58c2UwQX45vRWU= =/4/R -----END PGP SIGNATURE----- Merge tag 'v3.13-rc6' into for-3.14/core Needed to bring blk-mq uptodate, since changes have been going in since for-3.14/core was established. Fixup merge issues related to the immutable biovec changes. Signed-off-by: Jens Axboe <axboe@kernel.dk> Conflicts: block/blk-flush.c fs/btrfs/check-integrity.c fs/btrfs/extent_io.c fs/btrfs/scrub.c fs/logfs/dev_bdev.c		2013-12-31 09:51:02 -07:00
..
aacraid	[SCSI] Disable WRITE SAME for RAID and virtual host adapter drivers	2013-11-29 08:48:39 +04:00
aic7xxx	[SCSI] aic7xxx: fix swapped arguments in ahc_find_pci_device	2013-09-10 14:48:16 -07:00
aic7xxx_old	…
aic94xx	…
arcmsr	[SCSI] Disable WRITE SAME for RAID and virtual host adapter drivers	2013-11-29 08:48:39 +04:00
arm	…
be2iscsi	[SCSI] be2iscsi: Bump driver version	2013-10-25 09:58:11 +01:00
bfa	[SCSI] bfa: Fix crash when symb name set for offline vport	2013-12-03 06:56:49 -08:00
bnx2fc	Pull Request for 3.13	2013-11-10 12:19:15 +08:00
bnx2i	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2013-11-15 16:47:22 -08:00
csiostor	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2013-11-15 16:47:22 -08:00
cxgbi	treewide: Add __GFP_NOWARN to k.alloc calls with v.alloc fallbacks	2013-08-20 13:06:40 +02:00
device_handler	[SCSI] scsi_dh_alua: ALUA handler attach should succeed while TPG is transitioning	2013-10-25 11:19:33 +01:00
dpt	…
esas2r	[SCSI] esas2r: Cleanup snprinf formatting of firmware version	2013-10-25 09:58:59 +01:00
fcoe	SCSI for-linus on 20131110	2013-11-14 12:25:38 +09:00
fnic	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2013-11-15 16:47:22 -08:00
ibmvscsi	[SCSI] ibmvfc: Fix for offlining devices during error recovery	2013-09-06 11:41:34 -07:00
isci	[SCSI] isci: Fix a infinite loop.	2013-08-26 12:51:30 +04:00
libfc	fcp: Do not interpret check condition as underrun	2013-09-04 13:52:35 -07:00
libsas	Linux 3.13-rc6	2013-12-31 09:51:02 -07:00
lpfc	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2013-11-15 16:47:22 -08:00
megaraid	[SCSI] Disable WRITE SAME for RAID and virtual host adapter drivers	2013-11-29 08:48:39 +04:00
mpt2sas	block: Kill bio_segments()/bi_vcnt usage	2013-11-23 22:33:51 -08:00
mpt3sas	block: Kill bio_segments()/bi_vcnt usage	2013-11-23 22:33:51 -08:00
mvsas	SCSI: remove unnecessary pci_set_drvdata()	2013-10-14 15:26:04 +02:00
osd	block: Abstract out bvec iterator	2013-11-23 22:33:47 -08:00
pcmcia	…
pm8001	[SCSI] pm80xx: Tasklets synchronization fix.	2013-12-02 10:47:38 -08:00
qla2xxx	qla2xxx: Fix scsi_host leak on qlt_lport_register callback failure	2013-12-19 14:50:17 -08:00
qla4xxx	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2013-11-15 16:47:22 -08:00
sym53c8xx_2	treewide: Fix common typo in "identify"	2013-10-14 15:31:06 +02:00
ufs	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2013-11-15 16:47:22 -08:00
.gitignore	…
3w-9xxx.c	[SCSI] Disable WRITE SAME for RAID and virtual host adapter drivers	2013-11-29 08:48:39 +04:00
3w-9xxx.h	…
3w-sas.c	[SCSI] Disable WRITE SAME for RAID and virtual host adapter drivers	2013-11-29 08:48:39 +04:00
3w-sas.h	…
3w-xxxx.c	[SCSI] Disable WRITE SAME for RAID and virtual host adapter drivers	2013-11-29 08:48:39 +04:00
3w-xxxx.h	…
53c700.c	…
53c700.h	…
53c700.scr	…
53c700_d.h_shipped	…
BusLogic.c	[SCSI] buslogic: Added check for DMA mapping errors	2013-10-25 09:57:57 +01:00
BusLogic.h	[SCSI] BusLogic: Port driver to 64-bit.	2013-06-26 18:32:47 -07:00
FlashPoint.c	[SCSI] BusLogic: Port driver to 64-bit.	2013-06-26 18:32:47 -07:00
Kconfig	SCSI misc on 20130903	2013-09-03 15:48:06 -07:00
Makefile	[SCSI] esas2r: ATTO Technology ExpressSAS 6G SAS/SATA RAID Adapter Driver	2013-09-03 07:27:58 -07:00
NCR53c406a.c	…
NCR5380.c	…
NCR5380.h	…
NCR_D700.c	…
NCR_D700.h	…
NCR_Q720.c	…
NCR_Q720.h	…
a100u2w.c	…
a100u2w.h	…
a2091.c	…
a2091.h	…
a3000.c	[SCSI] a3000: use module_platform_driver_probe()	2013-06-24 19:44:18 +02:00
a3000.h	…
a4000t.c	[SCSI] a4000t: use module_platform_driver_probe()	2013-06-24 19:44:18 +02:00
advansys.c	[SCSI] advansys: Remove 'last_reset' references	2013-10-25 11:44:54 +01:00
aha152x.c	…
aha152x.h	…
aha1542.c	…
aha1542.h	…
aha1740.c	…
aha1740.h	…
aic7xxx_old.c	…
atari_NCR5380.c	…
atari_scsi.c	…
atari_scsi.h	…
atp870u.c	SCSI: remove unnecessary pci_set_drvdata()	2013-10-14 15:26:04 +02:00
atp870u.h	…
bvme6000_scsi.c	…
ch.c	…
constants.c	[SCSI] scsi constants: command, sense key + additional sense strings	2013-07-09 22:52:29 +01:00
dc395x.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2013-11-15 16:47:22 -08:00
dc395x.h	…
dmx3191d.c	…
dpt_i2o.c	[SCSI] dpt_i2o: return SCSI_MLQUEUE_HOST_BUSY when in reset	2013-10-25 11:40:42 +01:00
dpti.h	[SCSI] dpt_i2o: Remove DPTI_STATE_IOCTL	2013-10-25 11:36:26 +01:00
dtc.c	…
dtc.h	…
eata.c	…
eata_generic.h	…
eata_pio.c	[SCSI] eata_pio: off by one in eata_pio_detect()	2013-09-03 07:27:58 -07:00
eata_pio.h	…
esp_scsi.c	esp_scsi: Fix tag state corruption when autosensing.	2013-08-01 18:08:34 -07:00
esp_scsi.h	esp_scsi: Fix tag state corruption when autosensing.	2013-08-01 18:08:34 -07:00
fdomain.c	…
fdomain.h	…
g_NCR5380.c	…
g_NCR5380.h	…
g_NCR5380_mmio.c	…
gdth.c	[SCSI] Disable WRITE SAME for RAID and virtual host adapter drivers	2013-11-29 08:48:39 +04:00
gdth.h	…
gdth_ioctl.h	…
gdth_proc.c	…
gdth_proc.h	…
gvp11.c	…
gvp11.h	…
hosts.c	[SCSI] Disable WRITE SAME for RAID and virtual host adapter drivers	2013-11-29 08:48:39 +04:00
hpsa.c	[SCSI] hpsa: return 0 from driver probe function on success, not 1	2013-11-30 19:28:00 -05:00
hpsa.h	[SCSI] hpsa: remove unneeded variable	2013-08-26 12:51:31 +04:00
hpsa_cmd.h	…
hptiop.c	…
hptiop.h	…
imm.c	…
imm.h	…
in2000.c	…
in2000.h	…
initio.c	…
initio.h	…
ipr.c	[SCSI] Disable WRITE SAME for RAID and virtual host adapter drivers	2013-11-29 08:48:39 +04:00
ipr.h	[SCSI] ipr: Add sereral new CCIN definitions for new adapters support	2013-08-26 12:51:32 +04:00
ips.c	[SCSI] Disable WRITE SAME for RAID and virtual host adapter drivers	2013-11-29 08:48:39 +04:00
ips.h	…
iscsi_boot_sysfs.c	…
iscsi_tcp.c	[SCSI] iscsi_tcp: consider session state in iscsi_sw_sk_state_check	2013-10-25 09:58:13 +01:00
iscsi_tcp.h	…
jazz_esp.c	…
lasi700.c	…
libiscsi.c	[SCSI] IB/iser: Add Discovery support	2013-08-26 18:53:49 +04:00
libiscsi_tcp.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2013-07-09 18:24:39 -07:00
libsrp.c	…
mac53c94.c	…
mac53c94.h	…
mac_esp.c	…
mac_scsi.c	…
mac_scsi.h	…
megaraid.c	[SCSI] Disable WRITE SAME for RAID and virtual host adapter drivers	2013-11-29 08:48:39 +04:00
megaraid.h	…
mesh.c	…
mesh.h	…
mvme16x_scsi.c	…
mvme147.c	…
mvme147.h	…
mvumi.c	SCSI: remove unnecessary pci_set_drvdata()	2013-10-14 15:26:04 +02:00
mvumi.h	…
ncr53c8xx.c	treewide: Fix common typo in "identify"	2013-10-14 15:31:06 +02:00
ncr53c8xx.h	…
nsp32.c	…
nsp32.h	…
nsp32_debug.c	…
nsp32_io.h	…
osst.c	…
osst.h	…
osst_detect.h	…
osst_options.h	…
pas16.c	…
pas16.h	…
pmcraid.c	SCSI fixes on 20131206	2013-12-06 08:30:18 -08:00
pmcraid.h	…
ppa.c	…
ppa.h	…
ps3rom.c	…
qla1280.c	…
qla1280.h	…
qlogicfas.c	…
qlogicfas408.c	…
qlogicfas408.h	…
qlogicpti.c	…
qlogicpti.h	…
raid_class.c	…
script_asm.pl	…
scsi.c	[SCSI] remove check for 'resetting'	2013-10-25 12:00:23 +01:00
scsi.h	…
scsi_debug.c	[SCSI] scsi_debug: fix sparse warnings related to data integrity field	2013-10-25 09:58:12 +01:00
scsi_devinfo.c	[SCSI] Workaround for disks that report bad optimal transfer length	2013-06-24 13:00:10 -07:00
scsi_error.c	[SCSI] scsi_error: Escalate to LUN reset if abort fails	2013-10-25 12:18:30 +01:00
scsi_ioctl.c	…
scsi_lib.c	ARM: 7796/1: scsi: Use dma_max_pfn(dev) helper for bounce_limit calculations	2013-10-31 14:49:26 +00:00
scsi_lib_dma.c	…
scsi_logging.h	…
scsi_module.c	…
scsi_netlink.c	…
scsi_pm.c	[SCSI] sd: Add error handling during flushing caches	2013-10-25 09:58:13 +01:00
scsi_priv.h	…
scsi_proc.c	…
scsi_sas_internal.h	…
scsi_scan.c	[SCSI] Workaround for disks that report bad optimal transfer length	2013-06-24 13:00:10 -07:00
scsi_sysctl.c	…
scsi_sysfs.c	[SCSI] Add 'eh_deadline' to limit SCSI EH runtime	2013-10-25 12:17:59 +01:00
scsi_tgt_if.c	…
scsi_tgt_lib.c	…
scsi_tgt_priv.h	…
scsi_trace.c	…
scsi_transport_api.h	…
scsi_transport_fc.c	drivers: avoid format strings in names passed to alloc_workqueue()	2013-07-03 16:07:41 -07:00
scsi_transport_fc_internal.h	…
scsi_transport_iscsi.c	[SCSI] scsi_transport_iscsi: Add support to set CHAP entries	2013-10-25 09:58:01 +01:00
scsi_transport_sas.c	…
scsi_transport_spi.c	…
scsi_transport_srp.c	scsi_transport_srp: Add periodic reconnect support	2013-11-08 14:43:16 -08:00
scsi_transport_srp_internal.h	…
scsi_typedefs.h	…
scsicam.c	…
sd.c	Linux 3.13-rc6	2013-12-31 09:51:02 -07:00
sd.h	[SCSI] Derive the FLUSH_TIMEOUT from the basic I/O timeout	2013-10-25 09:58:16 +01:00
sd_dif.c	bio-integrity: Convert to bvec_iter	2013-11-23 22:33:50 -08:00
ses.c	…
sg.c	[SCSI] Revert "sg: use rwsem to solve race during exclusive open"	2013-10-25 10:59:54 +01:00
sgiwd93.c	…
sim710.c	…
sni_53c710.c	…
sr.c	…
sr.h	…
sr_ioctl.c	…
sr_vendor.c	…
st.c	[SCSI] st: convert class code to use dev_groups	2013-08-21 10:10:50 -07:00
st.h	…
st_options.h	…
stex.c	SCSI: remove unnecessary pci_set_drvdata()	2013-10-14 15:26:04 +02:00
storvsc_drv.c	[SCSI] Disable WRITE SAME for RAID and virtual host adapter drivers	2013-11-29 08:48:39 +04:00
sun3_NCR5380.c	…
sun3_scsi.c	…
sun3_scsi.h	…
sun3_scsi_vme.c	…
sun3x_esp.c	…
sun_esp.c	…
sym53c416.c	…
sym53c416.h	…
t128.c	…
t128.h	…
tmscsim.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2013-11-15 16:47:22 -08:00
tmscsim.h	[SCSI] tmscsim: Move 'last_reset' into host structure	2013-10-25 11:51:37 +01:00
u14-34f.c	…
ultrastor.c	…
ultrastor.h	…
virtio_scsi.c	virtio_scsi: verify if queue is broken after virtqueue_get_buf()	2013-11-11 11:53:26 +10:30
vmw_pvscsi.c	SCSI: remove unnecessary pci_set_drvdata()	2013-10-14 15:26:04 +02:00
vmw_pvscsi.h	…
wd33c93.c	…
wd33c93.h	…
wd7000.c	…
zalon.c	…
zorro7xx.c	…