1
linux/drivers/scsi
Linus Torvalds 229aebb873 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
  Update broken web addresses in arch directory.
  Update broken web addresses in the kernel.
  Revert "drivers/usb: Remove unnecessary return's from void functions" for musb gadget
  Revert "Fix typo: configuation => configuration" partially
  ida: document IDA_BITMAP_LONGS calculation
  ext2: fix a typo on comment in ext2/inode.c
  drivers/scsi: Remove unnecessary casts of private_data
  drivers/s390: Remove unnecessary casts of private_data
  net/sunrpc/rpc_pipe.c: Remove unnecessary casts of private_data
  drivers/infiniband: Remove unnecessary casts of private_data
  drivers/gpu/drm: Remove unnecessary casts of private_data
  kernel/pm_qos_params.c: Remove unnecessary casts of private_data
  fs/ecryptfs: Remove unnecessary casts of private_data
  fs/seq_file.c: Remove unnecessary casts of private_data
  arm: uengine.c: remove C99 comments
  arm: scoop.c: remove C99 comments
  Fix typo configue => configure in comments
  Fix typo: configuation => configuration
  Fix typo interrest[ing|ed] => interest[ing|ed]
  Fix various typos of valid in comments
  ...

Fix up trivial conflicts in:
	drivers/char/ipmi/ipmi_si_intf.c
	drivers/usb/gadget/rndis.c
	net/irda/irnet/irnet_ppp.c
2010-10-24 13:41:39 -07:00
..
aacraid Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2010-10-24 13:41:39 -07:00
aic7xxx [SCSI] aic7xxx: Remove OS utility wrappers 2010-07-28 09:05:27 -05:00
aic7xxx_old fix comnment/printk typos concerning "empty" 2010-07-12 18:03:50 +02:00
aic94xx drivers/scsi/aic94xx/aic94xx_init.c: correct the size argument to kmalloc 2010-08-11 08:59:00 -07:00
arcmsr [SCSI] drivers/scsi: Adjust confusing if indentation 2010-09-05 14:18:45 -03:00
arm
be2iscsi Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 2010-10-22 17:34:15 -07:00
bfa [SCSI] bfa: cleanup driver 2010-09-16 22:54:24 -04:00
bnx2i Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 2010-10-23 11:47:02 -07:00
cxgbi [SCSI] cxgb4i: connection and ddp setting update 2010-10-07 17:21:36 -05:00
device_handler [SCSI] scsi_dh_alua: Handle all states correctly 2010-10-07 17:22:22 -05:00
dpt
fcoe Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2010-08-04 15:31:02 -07:00
fnic [SCSI] fnic: prep for fc host dev loss tmo support 2010-10-07 17:09:33 -05:00
ibmvscsi [SCSI] ibmvfc: Handle Virtual I/O Server reboot 2010-10-07 17:17:06 -05:00
libfc [SCSI] libfc: call fc_remote_port_chkready under the host lock. 2010-08-06 11:00:26 -05:00
libsas Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 2010-10-22 17:34:15 -07:00
lpfc Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2010-10-24 13:41:39 -07:00
megaraid Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 2010-10-22 17:34:15 -07:00
mpt2sas Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 2010-10-22 17:34:15 -07:00
mvsas [SCSI] Unify SAM_ and SAM_STAT_ macros 2010-07-28 09:07:49 -05:00
osd llseek: automatically add .llseek fop 2010-10-15 15:53:27 +02:00
pcmcia Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 2010-10-22 17:34:15 -07:00
pm8001 [SCSI] pm8001: handle allocation failures 2010-09-09 15:31:54 -05:00
qla2xxx Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 2010-10-22 17:34:15 -07:00
qla4xxx [SCSI] qla4xxx: fix build on PPC 2010-10-07 17:08:01 -05:00
sym53c8xx_2 [SCSI] sd, sym53c8xx: Remove warnings after vsprintf %pV introducation. 2010-09-02 17:23:20 -03:00
.gitignore
3w-9xxx.c Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl 2010-10-22 10:52:56 -07:00
3w-9xxx.h
3w-sas.c Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl 2010-10-22 10:52:56 -07:00
3w-sas.h
3w-xxxx.c Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl 2010-10-22 10:52:56 -07:00
3w-xxxx.h
53c700_d.h_shipped
53c700.c scsi: 53c700: remove dma_is_consistent usage 2010-08-11 08:59:21 -07:00
53c700.h
53c700.scr
a100u2w.c
a100u2w.h
a2091.c
a2091.h
a3000.c
a3000.h
a4000t.c
advansys.c fix typos concerning "initiali[zs]e" 2010-06-16 18:05:05 +02:00
aha152x.c
aha152x.h
aha1542.c aha1532: remove ISA_DMA_THRESHOLD usage 2010-08-07 18:15:46 +02:00
aha1542.h
aha1740.c
aha1740.h
aic7xxx_old.c aic7xxx_old: removed unused 'req' variable 2010-09-16 08:27:34 +02:00
atari_NCR5380.c
atari_scsi.c
atari_scsi.h
atp870u.c
atp870u.h
BusLogic.c
BusLogic.h
bvme6000_scsi.c
ch.c Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl 2010-10-22 10:52:56 -07:00
constants.c [SCSI] Fix warning: zero-length gnu_printf format string 2010-09-02 17:15:31 -03:00
dc395x.c dc395x: decrease iteration for tag_number of max_command in start_scsi() 2010-08-11 08:59:00 -07:00
dc395x.h
dmx3191d.c
dpt_i2o.c Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl 2010-10-22 10:52:56 -07:00
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: fix broken MMIO compilation 2010-08-11 08:59:00 -07:00
g_NCR5380.h g_NCR5380: fix broken MMIO compilation 2010-08-11 08:59:00 -07:00
gdth_ioctl.h
gdth_proc.c
gdth_proc.h
gdth.c Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl 2010-10-22 10:52:56 -07:00
gdth.h
gvp11.c
gvp11.h
hosts.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6 2010-10-22 19:36:42 -07:00
hpsa_cmd.h [SCSI] hpsa: Fix hard reset code. 2010-07-27 12:02:00 -05:00
hpsa.c [SCSI] hpsa: disable doorbell reset on reset_devices 2010-09-02 17:14:44 -03:00
hpsa.h [SCSI] hpsa: remove unused firm_ver member of the per-hba structure 2010-07-27 12:01:15 -05:00
hptiop.c [SCSI] hptiop: Eliminate a NULL pointer dereference 2010-07-27 12:01:01 -05:00
hptiop.h
ibmmca.c
imm.c
imm.h
in2000.c
in2000.h
initio.c drivers/scsi: remove unnecessary NULL test 2010-08-11 08:59:00 -07:00
initio.h
ipr.c [SCSI] ipr: fix array error logging 2010-10-07 17:24:44 -05:00
ipr.h [SCSI] ipr: fix array error logging 2010-10-07 17:24:44 -05:00
ips.c
ips.h
iscsi_boot_sysfs.c [SCSI] iscsi boot: mv iscsi_boot_sysfs to drivers/scsi 2010-08-06 10:45:07 -05:00
iscsi_tcp.c
iscsi_tcp.h
jazz_esp.c
Kconfig Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2010-10-24 13:41:39 -07:00
lasi700.c
libiscsi_tcp.c
libiscsi.c
libsrp.c
mac53c94.c powerpc/macio: Fix probing of macio devices by using the right of match table 2010-06-02 17:50:38 +10:00
mac53c94.h
mac_esp.c
mac_scsi.c
mac_scsi.h
Makefile [SCSI] cxgb3i: change cxgb3i to use libcxgbi 2010-09-05 14:29:23 -03:00
megaraid.c Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl 2010-10-22 10:52:56 -07:00
megaraid.h
mesh.c powerpc/macio: Fix probing of macio devices by using the right of match table 2010-06-02 17:50:38 +10:00
mesh.h
mvme16x_scsi.c
mvme147.c
mvme147.h
ncr53c8xx.c
ncr53c8xx.h
NCR53c406a.c
NCR5380.c NCR5380: bit MR_DMA_MODE set twice in NCR5380_transfer_dma() 2010-08-11 08:59:00 -07:00
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 scsi: autoconvert trivial BKL users to private mutex 2010-09-15 21:00:45 +02:00
osst.h
pas16.c
pas16.h
pmcraid.c llseek: automatically add .llseek fop 2010-10-15 15:53:27 +02:00
pmcraid.h [SCSI] pmcraid: MSI-X support and other changes 2010-07-27 12:01:35 -05:00
ppa.c
ppa.h
ps3rom.c
qla1280.c
qla1280.h
qlogicfas408.c
qlogicfas408.h
qlogicfas.c
qlogicpti.c of/device: Replace struct of_device with struct platform_device 2010-08-06 09:25:50 -06:00
qlogicpti.h of/device: Replace struct of_device with struct platform_device 2010-08-06 09:25:50 -06:00
raid_class.c
script_asm.pl
scsi_debug.c [SCSI] scsi_debug: Convert to use root_device_register() and root_device_unregister() 2010-09-16 22:54:08 -04:00
scsi_devinfo.c
scsi_error.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 2010-08-14 12:34:34 -07:00
scsi_ioctl.c
scsi_lib_dma.c
scsi_lib.c Merge branch 'for-2.6.37/core' of git://git.kernel.dk/linux-2.6-block 2010-10-22 17:00:32 -07:00
scsi_logging.h
scsi_module.c
scsi_netlink.c
scsi_pm.c [SCSI] implement runtime Power Management 2010-07-28 09:07:50 -05:00
scsi_priv.h SCSI: remove fake "address-of" expression 2010-08-06 09:17:02 -07:00
scsi_proc.c
scsi_sas_internal.h
scsi_scan.c driver core: remove CONFIG_SYSFS_DEPRECATED_V2 but keep it for block devices 2010-10-22 10:16:43 -07:00
scsi_sysctl.c
scsi_sysfs.c block/scsi: Provide a limit on the number of integrity segments 2010-09-10 20:50:10 +02:00
scsi_tgt_if.c Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl 2010-10-22 10:52:56 -07:00
scsi_tgt_lib.c [SCSI] tgt: fix warning 2010-08-11 00:55:42 -04:00
scsi_tgt_priv.h
scsi_trace.c
scsi_transport_api.h
scsi_transport_fc_internal.h
scsi_transport_fc.c [SCSI] fc class: add fc host dev loss sysfs file 2010-10-07 17:09:44 -05:00
scsi_transport_iscsi.c [SCSI] iscsi transport: fix kernel-doc notation 2010-09-09 15:30:08 -05:00
scsi_transport_sas.c
scsi_transport_spi.c
scsi_transport_srp_internal.h
scsi_transport_srp.c
scsi_typedefs.h
scsi_wait_scan.c
scsi.c [SCSI] Fix VPD inquiry page wrapper 2010-09-16 11:48:48 -04:00
scsi.h
scsicam.c
sd_dif.c block: Make the integrity mapped property a bio flag 2010-10-15 15:49:20 +02:00
sd.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 2010-10-22 20:30:48 -07:00
sd.h [SCSI] sd: Fix overflow with big physical blocks 2010-10-11 17:33:20 -05:00
ses.c
sg.c Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2010-10-24 13:41:39 -07:00
sgiwd93.c
sim710.c
sni_53c710.c
sr_ioctl.c
sr_vendor.c
sr.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 2010-10-22 20:30:48 -07:00
sr.h
st_options.h
st.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 2010-10-22 17:34:15 -07:00
st.h
stex.c
sun3_NCR5380.c block: remove wrappers for request type/flags 2010-08-07 18:17:56 +02:00
sun3_scsi_vme.c block: remove wrappers for request type/flags 2010-08-07 18:17:56 +02:00
sun3_scsi.c block: remove wrappers for request type/flags 2010-08-07 18:17:56 +02:00
sun3_scsi.h
sun3x_esp.c
sun_esp.c of/device: Replace struct of_device with struct platform_device 2010-08-06 09:25:50 -06:00
sym53c416.c
sym53c416.h
t128.c
t128.h
tmscsim.c
tmscsim.h
u14-34f.c
ultrastor.c
ultrastor.h
vmw_pvscsi.c
vmw_pvscsi.h
wd33c93.c
wd33c93.h
wd7000.c
zalon.c
zorro7xx.c