Linus Torvalds b3c9dd182e Merge branch 'for-3.3/core' of git://git.kernel.dk/linux-block ... * 'for-3.3/core' of git://git.kernel.dk/linux-block: (37 commits) Revert "block: recursive merge requests" block: Stop using macro stubs for the bio data integrity calls blockdev: convert some macros to static inlines fs: remove unneeded plug in mpage_readpages() block: Add BLKROTATIONAL ioctl block: Introduce blk_set_stacking_limits function block: remove WARN_ON_ONCE() in exit_io_context() block: an exiting task should be allowed to create io_context block: ioc_cgroup_changed() needs to be exported block: recursive merge requests block, cfq: fix empty queue crash caused by request merge block, cfq: move icq creation and rq->elv.icq association to block core block, cfq: restructure io_cq creation path for io_context interface cleanup block, cfq: move io_cq exit/release to blk-ioc.c block, cfq: move icq cache management to block core block, cfq: move io_cq lookup to blk-ioc.c block, cfq: move cfqd->icq_list to request_queue and add request->elv.icq block, cfq: reorganize cfq_io_context into generic and cfq specific parts block: remove elevator_queue->ops block: reorder elevator switch sequence ... Fix up conflicts in: - block/blk-cgroup.c Switch from can_attach_task to can_attach - block/cfq-iosched.c conflict with now removed cic index changes (we now use q->id instead)		2012-01-15 12:24:45 -08:00
..
aacraid	drivers/scsi/aacraid/commctrl.c: fix mem leak in aac_send_raw_srb()	2012-01-08 14:15:21 -08:00
aic7xxx	treewide: Fix typos in various parts of the kernel, and fix some comments.	2011-12-02 14:57:31 +01:00
aic7xxx_old
aic94xx	Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6	2011-10-28 16:44:18 -07:00
arcmsr
arm
be2iscsi	SCSI updates for post 3.2 merge window	2012-01-10 10:36:08 -08:00
bfa	SCSI updates for post 3.2 merge window	2012-01-10 10:36:08 -08:00
bnx2fc	[SCSI] bnx2fc: Bumped version to 1.0.9	2011-10-30 14:05:52 +04:00
bnx2i	switch ->is_visible() to returning umode_t	2012-01-03 22:54:55 -05:00
cxgbi	Merge branch 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2012-01-08 12:19:57 -08:00
device_handler	[SCSI] scsi_dh: code cleanup and remove the references to scsi_dev_info	2011-12-15 10:55:00 +04:00
dpt	atomic: use <linux/atomic.h>	2011-07-26 16:49:47 -07:00
fcoe	[SCSI] fcoe: fix fcoe in a DCB environment by adding DCB notifiers to set skb priority	2011-12-15 11:02:07 +04:00
fnic
ibmvscsi
isci	[SCSI] isci: overriding max_concurr_spinup oem parameter by max(oem, user)	2011-10-31 13:23:18 +04:00
libfc	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
libsas	scsi: Add export.h for EXPORT_SYMBOL/THIS_MODULE as required	2011-10-31 19:31:23 -04:00
lpfc	[SCSI] lpfc 8.3.28: Update driver version to 8.3.28	2011-12-15 10:57:45 +04:00
megaraid	scsi: Fix up files implicitly depending on module.h inclusion	2011-10-31 19:31:24 -04:00
mpt2sas	[SCSI] mpt2sas: Removed redundant calling of _scsih_probe_devices() from _scsih_probe	2011-12-15 10:57:43 +04:00
mvsas	[SCSI] mv_sas: OCZ RevoDrive3 & zDrive R4 support	2011-10-31 13:29:01 +04:00
osd	scsi: Fix up files implicitly depending on module.h inclusion	2011-10-31 19:31:24 -04:00
pcmcia	module_param: make bool parameters really bool (drivers & misc)	2012-01-13 09:32:20 +10:30
pm8001	[SCSI] isci: export phy events via ->lldd_control_phy()	2011-10-02 13:24:26 -05:00
qla2xxx	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2012-01-08 13:21:22 -08:00
qla4xxx	SCSI updates for post 3.2 merge window	2012-01-10 10:36:08 -08:00
sym53c8xx_2
.gitignore
3w-9xxx.c	[SCSI] 3w-9xxx: fix iommu_iova leak	2011-09-26 09:28:58 -05:00
3w-9xxx.h
3w-sas.c
3w-sas.h
3w-xxxx.c
3w-xxxx.h
53c700_d.h_shipped
53c700.c
53c700.h
53c700.scr
a100u2w.c
a100u2w.h
a2091.c	scsi: Fix up files implicitly depending on module.h inclusion	2011-10-31 19:31:24 -04:00
a2091.h
a3000.c	scsi: Fix up files implicitly depending on module.h inclusion	2011-10-31 19:31:24 -04:00
a3000.h
a4000t.c
advansys.c
aha152x.c
aha152x.h
aha1542.c	module_param: make bool parameters really bool (drivers & misc)	2012-01-13 09:32:20 +10:30
aha1542.h
aha1740.c
aha1740.h
aic7xxx_old.c
atari_NCR5380.c
atari_scsi.c
atari_scsi.h
atp870u.c
atp870u.h
BusLogic.c
BusLogic.h
bvme6000_scsi.c
ch.c
constants.c
dc395x.c	module_param: make bool parameters really bool (drivers & misc)	2012-01-13 09:32:20 +10:30
dc395x.h
dmx3191d.c
dpt_i2o.c
dpti.h
dtc.c
dtc.h
eata_generic.h
eata_pio.c
eata_pio.h
eata.c
esp_scsi.c
esp_scsi.h
fd_mcs.c
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	treewide: Fix comment and string typo 'bufer'	2011-12-06 09:53:40 +01:00
gvp11.c	scsi: Fix up files implicitly depending on module.h inclusion	2011-10-31 19:31:24 -04:00
gvp11.h
hosts.c	[SCSI] Make scsi_free_queue() kill pending SCSI commands	2011-10-30 13:20:28 +04:00
hpsa_cmd.h	[SCSI] hpsa: fix potential array overflow in hpsa_update_scsi_devices	2011-10-30 14:34:04 +04:00
hpsa.c	[SCSI] hpsa: add the Smart Array 5i to the kdump blacklist	2011-12-15 10:57:30 +04:00
hpsa.h	[SCSI] hpsa: detect controller lockup	2011-10-30 14:35:01 +04:00
hptiop.c
hptiop.h
ibmmca.c
imm.c
imm.h
in2000.c
in2000.h
initio.c
initio.h
ipr.c	PCI: Rework config space blocking services	2012-01-06 12:10:33 -08:00
ipr.h	PCI: Rework config space blocking services	2012-01-06 12:10:33 -08:00
ips.c	treewide: Fix typos in various parts of the kernel, and fix some comments.	2011-12-02 14:57:31 +01:00
ips.h
iscsi_boot_sysfs.c	switch ->is_visible() to returning umode_t	2012-01-03 22:54:55 -05:00
iscsi_tcp.c	switch ->is_visible() to returning umode_t	2012-01-03 22:54:55 -05:00
iscsi_tcp.h
jazz_esp.c	misc latin1 to utf8 conversions	2012-01-02 13:04:55 +01:00
Kconfig	Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild	2011-11-06 18:54:53 -08:00
lasi700.c
libiscsi_tcp.c	scsi: Fix up files implicitly depending on module.h inclusion	2011-10-31 19:31:24 -04:00
libiscsi.c	scsi: Fix up files implicitly depending on module.h inclusion	2011-10-31 19:31:24 -04:00
libsrp.c	scsi: Fix up files implicitly depending on module.h inclusion	2011-10-31 19:31:24 -04:00
mac53c94.c	scsi: Fix up files implicitly depending on module.h inclusion	2011-10-31 19:31:24 -04:00
mac53c94.h
mac_esp.c	m68k/mac: cleanup mac_irq_pending	2011-12-10 19:52:46 +01:00
mac_scsi.c	[SCSI] mac_scsi: Remove obsolete IRQ_FLG_* users	2011-12-15 10:57:43 +04:00
mac_scsi.h
Makefile	Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6	2011-10-28 16:44:18 -07:00
megaraid.c
megaraid.h
mesh.c
mesh.h
mvme16x_scsi.c
mvme147.c
mvme147.h
mvumi.c	[SCSI] mvumi: Add Marvell UMI driver	2011-08-27 08:36:58 -06:00
mvumi.h	[SCSI] mvumi: Add Marvell UMI driver	2011-08-27 08:36:58 -06:00
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	module_param: make bool parameters really bool (drivers & misc)	2012-01-13 09:32:20 +10:30
nsp32.h
osst_detect.h
osst_options.h
osst.c
osst.h
pas16.c
pas16.h
pmcraid.c	SCSI, pmcraid: Fix spelling error in a pmcraid_err() call	2011-12-15 16:35:38 +01:00
pmcraid.h	Remove unneeded version.h includes from drivers/scsi/	2011-09-15 14:57:07 +02:00
ppa.c
ppa.h
ps3rom.c	scsi: Fix up files implicitly depending on module.h inclusion	2011-10-31 19:31:24 -04:00
qla1280.c
qla1280.h
qlogicfas408.c
qlogicfas408.h
qlogicfas.c
qlogicpti.c	[SCSI] qlogicpti: fix timeout	2011-10-16 10:58:52 -05:00
qlogicpti.h
raid_class.c
script_asm.pl
scsi_debug.c
scsi_devinfo.c
scsi_error.c	[SCSI] add flag to skip the runtime PM calls on the host	2012-01-08 19:14:57 -05: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] Silencing 'killing requests for dead queue'	2011-11-09 12:07:07 -06:00
scsi_logging.h
scsi_module.c
scsi_netlink.c	Merge branch 'for-linus' of git://selinuxproject.org/~jmorris/linux-security	2012-01-14 18:36:33 -08:00
scsi_pm.c	[SCSI] runtime resume parent for child's system-resume	2012-01-08 19:14:59 -05:00
scsi_priv.h	[SCSI] scsi_dh: code cleanup and remove the references to scsi_dev_info	2011-12-15 10:55:00 +04:00
scsi_proc.c
scsi_sas_internal.h
scsi_scan.c	block: misc updates to blk_get_queue()	2011-12-14 00:33:38 +01:00
scsi_sysctl.c
scsi_sysfs.c	[SCSI] scsi: Added support for adapter and firmware reset	2011-08-27 08:36:46 -06: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_tgt_priv.h
scsi_trace.c
scsi_transport_api.h
scsi_transport_fc_internal.h
scsi_transport_fc.c
scsi_transport_iscsi.c	SCSI updates for post 3.2 merge window	2012-01-10 10:36:08 -08:00
scsi_transport_sas.c	[SCSI] libsas: disable scanning lun > 0 on ata devices	2011-10-02 12:29:19 -05:00
scsi_transport_spi.c	switch ->is_visible() to returning umode_t	2012-01-03 22:54:55 -05:00
scsi_transport_srp_internal.h
scsi_transport_srp.c
scsi_typedefs.h
scsi_wait_scan.c
scsi.c
scsi.h
scsicam.c	fs: move code out of buffer.c	2012-01-03 22:54:07 -05:00
sd_dif.c
sd.c	block: fail SCSI passthrough ioctls on partition devices	2012-01-14 15:07:24 -08:00
sd.h	[SCSI] sd: remove arbitrary SD_MAX_DISKS namespace limit	2011-10-30 12:58:11 +04:00
ses.c
sg.c	switch procfs to umode_t use	2012-01-03 22:54:56 -05:00
sgiwd93.c
sim710.c
sni_53c710.c	misc latin1 to utf8 conversions	2012-01-02 13:04:55 +01: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	[SCSI] sr: check_events() ignore GET_EVENT when TUR says otherwise	2011-07-21 14:15:58 -07: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: fix race in st_scsi_execute_end	2011-10-30 13:27:28 +04:00
st.h
stex.c
sun3_NCR5380.c
sun3_scsi_vme.c
sun3_scsi.c
sun3_scsi.h
sun3x_esp.c
sun_esp.c
sym53c416.c
sym53c416.h
t128.c
t128.h
tmscsim.c
tmscsim.h
u14-34f.c
ultrastor.c
ultrastor.h
vmw_pvscsi.c	treewide: Fix typos in various parts of the kernel, and fix some comments.	2011-12-02 14:57:31 +01:00
vmw_pvscsi.h
wd33c93.c
wd33c93.h
wd7000.c
zalon.c
zorro7xx.c