Jeff Garzik
11fff8287f
Merge branch 'upstream'
2006-02-20 16:56:08 -05:00
Jeff Garzik
f131883e73
Merge branch 'upstream-fixes'
2006-02-20 16:55:56 -05:00
Jeff Garzik
c5580a7ecb
Merge branch 'forcedeth'
2006-02-20 05:59:59 -05:00
Jeff Garzik
a5fd79ccd6
sata_vsc build fix
2006-02-20 05:21:14 -05:00
Jeff Garzik
ff60774859
Merge branch 'upstream'
2006-02-20 05:13:31 -05:00
Jeff Garzik
5b2ffed906
Merge branch 'master'
2006-02-20 02:16:23 -05:00
Jeff Garzik
b04a92e160
Merge branch 'upstream-fixes'
2006-02-17 16:20:30 -05:00
Jeff Garzik
e7f52e4c43
Merge branch 'for-jeff' of git://electric-eye.fr.zoreil.com/home/romieu/linux-2.6
2006-02-17 16:11:47 -05:00
Jeff Garzik
249b94a5f7
Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
2006-02-17 16:10:20 -05:00
Jeff Garzik
db024d5398
[libata] build fix after cdb_len move
2006-02-13 00:23:57 -05:00
Jeff Garzik
3875e1945b
Merge branch 'upstream'
2006-02-13 00:13:48 -05:00
Jeff Garzik
f1b318793d
Merge branch 'master'
2006-02-13 00:12:09 -05:00
Jeff Garzik
587005de14
[libata irq-pio] s/assert/WARN_ON/
2006-02-11 18:17:32 -05:00
Jeff Garzik
1cb9d721d9
Merge branch 'upstream'
2006-02-11 18:02:04 -05:00
Jeff Garzik
cbefa3258e
Merge branch 'master'
2006-02-11 17:51:46 -05:00
Jeff Garzik
c5014de8a7
Merge branch 'master'
2006-02-10 10:30:02 -05:00
Jeff Garzik
ca7d5e42d7
Merge branch 'upstream'
2006-02-10 07:09:37 -05:00
Jeff Garzik
70c07e0262
Merge branch 'viro'
2006-02-09 14:17:05 -05:00
Jeff Garzik
2746b8623a
Merge branch 'net.b0' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/bird
2006-02-09 14:15:02 -05:00
Jeff Garzik
a081975002
Merge branch 'upstream'
2006-02-09 05:15:47 -05:00
Jeff Garzik
1fdffbce03
[libata] Move PCI IDE BMDMA-related code to new file libata-bmdma.c.
2006-02-09 05:15:27 -05:00
Jeff Garzik
41232d3eca
[libata] build fix after merging some pre-packet_task-removal code
2006-02-09 04:52:55 -05:00
Jeff Garzik
2ddd1023d2
Merge branch 'upstream'
2006-02-09 04:31:08 -05:00
Jeff Garzik
389984cb75
Merge branch 'upstream-fixes'
2006-02-09 04:30:18 -05:00
Jeff Garzik
9caafa6c86
Merge branch 'upstream-fixes'
2006-02-09 04:29:00 -05:00
Jeff Garzik
99b3738fbf
Merge branch 'upstream'
2006-02-09 04:28:13 -05:00
Jeff Garzik
5140788f77
[libata scsi] build fix for ATA_FLAG_IN_EH change
2006-02-09 01:56:05 -05:00
Jeff Garzik
725b2805fd
Merge branch 'upstream-fixes'
2006-02-09 00:59:34 -05:00
Jeff Garzik
cac0e8e8bb
Merge branch 'master'
2006-02-09 00:58:59 -05:00
Jeff Garzik
5d1769ac3d
Merge branch 'master'
2006-02-07 15:16:27 -05:00
Jeff Garzik
23a56e2cbe
Merge branch 'upstream-fixes'
2006-02-07 02:06:12 -05:00
Jeff Garzik
3cfc15103a
Merge branch 'for-jeff' of git://electric-eye.fr.zoreil.com/home/romieu/linux-2.6
2006-02-07 02:05:17 -05:00
Jeff Garzik
6bd0e10e53
Merge branch 'sundance'
2006-02-07 01:47:33 -05:00
Jeff Garzik
3c9b3a8575
Merge branch 'master'
2006-02-07 01:47:12 -05:00
Jeff Garzik
9ac341ae79
Merge branch 'upstream-fixes'
2006-02-02 16:17:31 -05:00
Jeff Garzik
ddef9bb367
[libata sata_mv] do not enable PCI MSI by default
...
Several bug reports have come in, noting that disabling CONFIG_PCI_MSI
has fixed their problems with this driver. This may be generic system
issues, but there is also the probability of unimplemented hardware
errata workarounds. Until this ream of bug reports is sorted out, we
can get them going in non-MSI interrupt mode.
As such, this change adds an 'msi' module option, which defaults to off.
2006-02-02 16:17:06 -05:00
Jeff Garzik
18ee361004
Merge branch 'master'
2006-02-02 01:12:54 -05:00
Jeff Garzik
e4e7b89280
[libata sata_mv] add 6042 support, fix 60xx/50xx EDMA configuration
2006-01-31 12:18:41 -05:00
Jeff Garzik
a03b195052
Merge branch 'upstream-fixes'
2006-01-31 11:52:21 -05:00
Jeff Garzik
0b310f36d7
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
2006-01-31 11:50:55 -05:00
Jeff Garzik
359b8800d3
Merge branch 'upstream-fixes'
2006-01-31 11:50:25 -05:00
Jeff Garzik
0febb720fe
Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
2006-01-31 11:50:11 -05:00
Jeff Garzik
d6fb89bf6b
Merge branch 'upstream-fixes'
2006-01-29 12:41:09 -05:00
Jeff Garzik
9220a2d0da
[libata ahci] add another JMicron pci id
2006-01-29 12:40:57 -05:00
Jeff Garzik
b1d917739a
Merge branch 'upstream-fixes'
2006-01-29 02:47:18 -05:00
Jeff Garzik
bd12097c74
[libata ahci] Isolate Intel-ism, add JMicron JMB360 support
...
Isolate some PCI config register bitbanging to Intel hardware, as it
should have been all along.
Add support for JMicron JMB360.
2006-01-29 02:47:03 -05:00
Jeff Garzik
4f975b3243
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
2006-01-28 16:07:32 -05:00
Jeff Garzik
0cc349d130
Merge branch 'upstream-fixes'
2006-01-28 16:06:45 -05:00
Jeff Garzik
b0b020d478
Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
2006-01-28 16:06:30 -05:00
Jeff Garzik
b376bc1f6b
[libata ata_piix] Fix ICH6/7 map value interpretation
...
The previous change failed to properly mask out unrelated bits, which
resulted in a failure to detect devices.
2006-01-28 12:26:23 -05:00
Jeff Garzik
51e9f2ff83
[libata sata_sil] implement 'slow_down' module parameter
...
On occasion, a user will submit a patch that enables the "mod15write"
quirk for their device. Enabling this quirk has the effect of clamping
all ATA commands to no more than 15 sectors. The intended use of this
quirk is to stop the controller from generating FIS's of unusual size
("but Wesley, what about the FOUS's?"), which in turn works around
problems in a <list> of hard drives.
One side effect of this quirk is greatly decreased performance. Users
often enable the mod15write quirk to fix various system, power, chip,
and/or driver problems. For a few rare problematic cases, enabling this
has cured lockups or data corruption.
Rather than add bogus listings to the mod15write quirk list (I get a
patch every month doing such), we add a 'slow_down' module parameter.
This allows users to employ a performance sledgehammer in the hopes
of curing a problem. It defaults to off (0), of course.
2006-01-27 16:50:27 -05:00
Jeff Garzik
cfc88b0729
Merge branch 'upstream-fixes'
2006-01-27 11:09:39 -05:00
Jeff Garzik
f6ef65e6d0
Merge branch 'upstream-2.6.17'
2006-01-27 02:45:00 -05:00
Jeff Garzik
7103c7bc86
Merge branch 'tmp'
2006-01-27 02:39:25 -05:00
Jeff Garzik
b4d28889f7
Merge branch 'tmp'
2006-01-27 02:37:46 -05:00
Jeff Garzik
7dfb869c8e
Merge branch 'tmp'
2006-01-27 02:36:14 -05:00
Jeff Garzik
628e386e27
Merge branch 'tmp'
2006-01-27 02:29:20 -05:00
Jeff Garzik
8dd2e3bd57
Merge branch 'tmp'
2006-01-27 02:26:46 -05:00
Jeff Garzik
2af5920b81
Merge branch 'master'
2006-01-27 02:20:42 -05:00
Jeff Garzik
71e834f563
Merge branch 'master'
2006-01-26 22:33:43 -05:00
Jeff Garzik
97309d1a0b
Merge branch 'upstream-fixes'
2006-01-26 22:19:57 -05:00
Jeff Garzik
b4ea75b649
Merge branch 'upstream-fixes'
2006-01-18 16:20:16 -05:00
Jeff Garzik
7db74a4780
Merge branch 'master'
2006-01-18 01:01:22 -05:00
Jeff Garzik
2baeaaa4da
Merge branch 'upstream'
2006-01-17 19:57:15 -05:00
Jeff Garzik
35cfc45c58
Merge branch 'lba48-opt'
2006-01-17 19:46:58 -05:00
Jeff Garzik
8a6d498e86
Merge branch 'debug'
2006-01-17 19:46:27 -05:00
Jeff Garzik
ef6f63a4aa
Merge branch 'upstream'
2006-01-17 19:29:28 -05:00
Jeff Garzik
03a49eebca
Merge branch 'janitor'
2006-01-17 19:19:20 -05:00
Jeff Garzik
ea9b395fe2
Merge branch 'upstream'
2006-01-17 10:29:06 -05:00
Jeff Garzik
0825788ff2
Merge branch 'upstream'
2006-01-17 10:26:28 -05:00
Jeff Garzik
0f1c122ecf
Merge branch 'upstream-jgarzik' of git://git.tuxdriver.com/git/wireless-2.6
2006-01-17 07:22:26 -05:00
Jeff Garzik
61420e147a
Merge branch 'upstream'
2006-01-03 11:00:06 -05:00
Jeff Garzik
02f693c711
Merge branch 'upstream'
2006-01-03 10:59:55 -05:00
Jeff Garzik
a18ceba7b4
Merge branch 'master'
2006-01-03 10:58:53 -05:00
Jeff Garzik
ac67c62473
Merge branch 'master'
2006-01-03 10:49:18 -05:00
Jeff Garzik
aaadff8119
Merge branch 'master'
2005-12-24 09:31:05 -05:00
Jeff Garzik
ebc62fb36c
Merge branch 'master'
2005-12-24 09:28:21 -05:00
Jeff Garzik
418fbfe979
Merge branch 'master'
2005-12-19 00:09:53 -05:00
Jeff Garzik
3d0a59c023
[libata sata_promise] irq_pio: fix merge bug
2005-12-13 22:28:19 -05:00
Jeff Garzik
36dfc3f67b
Merge branch 'upstream'
2005-12-13 22:22:50 -05:00
Jeff Garzik
e7fb585940
Merge branch 'upstream'
2005-12-13 22:22:41 -05:00
Jeff Garzik
c6329f4df2
Merge branch 'master'
2005-12-13 22:20:12 -05:00
Jeff Garzik
8b132f4ee7
Merge branch 'master'
2005-12-13 22:15:52 -05:00
Jeff Garzik
d22a8ccff7
Merge branch 'upstream-fixes'
2005-12-13 11:36:18 -05:00
Jeff Garzik
98684a9d91
[netdrvr skge] fix build
2005-12-13 11:35:22 -05:00
Jeff Garzik
e8b0942848
Merge branch 'upstream'
2005-12-13 02:32:01 -05:00
Jeff Garzik
e508a391a0
Merge branch 'upstream-fixes'
2005-12-13 02:30:04 -05:00
Jeff Garzik
50630195bb
[libata] mark certain hardware (or drivers) with a no-atapi flag
...
Some hardware does not support the PACKET command at all.
Other hardware supports ATAPI, but the driver does something nasty such
as calling BUG() when an ATAPI command is issued.
For these such cases, we mark them with a new flag, ATA_FLAG_NO_ATAPI.
Initial version contributed by Ben Collins.
2005-12-13 02:29:45 -05:00
Jeff Garzik
d1397f8376
Merge branch 'upstream'
2005-12-13 01:47:05 -05:00
Jeff Garzik
80c7af4074
Merge branch 'upstream'
2005-12-13 01:46:20 -05:00
Jeff Garzik
d00d598ffb
Merge branch 'master'
2005-12-13 01:43:33 -05:00
Jeff Garzik
783e3385a1
Merge branch 'upstream-fixes'
2005-12-13 00:07:46 -05:00
Jeff Garzik
ff7eba15ae
Merge branch 'e1000'
2005-12-13 00:01:02 -05:00
Jeff Garzik
575ab52a21
Merge branch 'upstream-fixes'
2005-12-12 23:51:01 -05:00
Jeff Garzik
9da305eb08
Merge branch 'master'
2005-12-12 22:03:53 -05:00
Jeff Garzik
20234989a8
Merge branch 'master'
2005-12-12 15:30:15 -05:00
Jeff Garzik
b1086eef81
Merge branch 'master'
2005-12-12 15:24:45 -05:00
Jeff Garzik
278efe9509
[libata] irq-pio: fix breakage related to err_mask merge
2005-12-06 05:01:27 -05:00
Jeff Garzik
701db69d66
Merge branch 'upstream'
2005-12-06 04:52:48 -05:00
Jeff Garzik
3c92cae74b
Merge branch 'master'
2005-12-06 04:40:05 -05:00
Jeff Garzik