With Olaf Hering <olh@suse.de>.

Parameters were interchanged.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

From: Prarit Bhargava <prarit@sgi.com>

I discovered an issue where a hwif_init() failure lead to /proc/ide files
being created for devices that failed probes.  This resulted in
oops/WARN_ON/BUG_ON executions through the kernel depending on what
actions were on going.

slightly changed by me (bart)
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

ide_hwgroup_t.polling field added.  0 in poll_timeout field
used to indicate inactive polling but because 0 is a valid
jiffy value, though slim, there's a chance that something
weird can happen.
Signed-off-by: Tejun Heo <tj@home-tj.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

ide_drive_t.sleeping field added.  0 in sleep field used to
indicate inactive sleeping but because 0 is a valid jiffy
value, though slim, there's a chance that something can go
weird.  And while at it, explicit jiffy comparisons are
converted to use time_before() macros.
Signed-off-by: Tejun Heo <tj@home-tj.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

Signed-off-by: Tejun Heo <tj@home-tj.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

In ide_error(), drive cannot be NULL.  ide_dump_status() can't
handle NULL drive.

From: Tejun Heo <tj@home-tj.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

Explicit jiffy comparision converted to time_after() macro.
Signed-off-by: Tejun Heo <tj@home-tj.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

In __ide_do_rw_disk(), ide_started used to be returned blindly
after issusing PIO write.  This can cause hang if
pre_task_out_intr() returns ide_stopped due to failed
ide_wait_stat() test.  Fixed to pass the return value of
pre_task_out_intr().
Signed-off-by: Tejun Heo <tj@home-tj.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

In __ide_do_rw_disk(), the shifted block, instead of the
original rq->sector, should be used when checking range for
lba48 dma.
Signed-off-by: Tejun Heo <tj@home-tj.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

In drivers/ide/pci/piix.[hc], init_setup_piix() is defined and
used but only one init_setup function is defined and no
demultiplexing is done using init_setup callback.  As other
drivers call ide_setup_pci_device() directly in such cases,
this patch removes init_setup_piix() and makes piix_init_one()
call ide_setup_pci_device() directly.
Signed-off-by: Tejun Heo <tj@home-tj.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

In drivers/ide/pci/opti612.[hc], init_setup_opti621() is
declared, defined and referenced but never actually used.
This patch removes the function.
Signed-off-by: Tejun Heo <tj@home-tj.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

In drivers/ide/pci/it8172.h, it8172_ratefilter() and
init_setup_it8172() are declared and the latter is referenced
in it8172_chipsets.  Both functions are not defined or used
anywhere.  This patch removes the prototypes and reference.
it8172 should be compilable now.
Signed-off-by: Tejun Heo <tj@home-tj.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

Removes drivers/ide/pci/adma100.[hc].  The driver isn't
compilable (missing functions) and no Kconfig actually enables
CONFIG_BLK_DEV_ADMA100.

On Wed, 02 Feb 2005 03:31:59 -0500, Jeff Garzik <jgarzik@pobox.com> wrote:
> Also, the libata-dev-2.6 tree has an "ata_adma" driver which is
> complete, but needs some testing (and I have h/w).
Signed-off-by: Tejun Heo <tj@home-tj.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

This patch contains the following possible cleanups:
- make some needlessly global code static
- ide-dma.c: remove the unneeded EXPORT_SYMBOL(__ide_dma_test_irq)

slightly changed by me (bart)
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

From: Arjan van de Ven <arjan@infradead.org>

* make atapi_{input,output}_bytes() static, fix users to use drive->hwif
* remove ide_read_24() export; it's unused since the ide-io.c reorganization
* add a FIXME comment to the ide_fix_driveid() export

slightly changed by me (bart)
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

On the one hand APM isn't enabled on all laptops.
On the other hand, this also affects regular PCs with APM support (or
using a distribution kernel with APM support).

The time for the !APM case was already increased from 30msec in 2.4 .
Isn't there a timeout that is suitable for all cases?

Alan Cox answered:
> The five seconds should be just fine for all cases. The smaller value
> with no
> power manglement should help speed up recovery however. It probably
> doesn't belong CONFIG_APM now ACPI and friends are involved either.

Until someone has a real good solution (consider e.g. that most PC users 
might have ACPI support enabled), this patch unconditionally sets 
WAIT_READY to 5 seconds.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

into ppc970.osdl.org:/home/torvalds/v2.6/linux

into ppc970.osdl.org:/home/torvalds/v2.6/linux

into intel.com:/home/lenb/src/26-latest-dev

Signed-off-by: Len Brown <len.brown@intel.com>

into intel.com:/home/lenb/src/26-latest-dev

Signed-off-by: David Shaohua Li <shaohua.li@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>

into intel.com:/home/lenb/src/26-latest-dev

Signed-off-by: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

The function returns before recalculating the checksum in some cases.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

Same fix as per ipv4 ip_copy_metadata().
Signed-off-by: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

Netfilter conntrack can defragment locally generated
packets before they hit ip_fragment().  In this case
the fragments have skb->dst set already, so we have to
release that existing reference before overwriting
skb->dst.
Signed-off-by: David S. Miller <davem@davemloft.net>

into nuts.davemloft.net:/disk1/BK/net-2.6

into ppc970.osdl.org:/home/torvalds/v2.6/linux

This is the third of 4 patches which factor out common code in
the ARM exception entry assembly code, aiming towards a reduction
in the size of the changes required here for SMP support.  These
patches are low impact, and will be merged over the coarse of the
next few days.

This patch addresses the code handling exception entry from user
modes.

Thanks to Russell King for some excellent debugging.

Conntrack defragments locally generated packets before they hit
ip_fragment.  In this case the fragments have skb->dst set, and
that needs to be released.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

When selecting the best source device for outgoing connections the
devices in raw mode should be skipped.
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

into ppc970.osdl.org:/home/torvalds/v2.6/linux

This is the second of 4 patches which factor out common code in
the ARM exception entry assembly code, aiming towards a reduction
in the size of the changes required here for SMP support.  These
patches are low impact, and will be merged over the coarse of the
next 3 days.

This patch addresses the code handling exception entry from
invalid (irq, fiq, abort) modes.  However, in converting to a
macro, a minor bug has been fixed which would merely cause a
misleading register dump.

The CSR sniffer device looks like a normal H:2 Bluetooth device,
but it is not and so mark it as raw mode device.
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

This patch introduces a quirk flag for turning a device into a raw
mode only device.
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

The HCI clock offset event contains the actual clock offset for the
connection. It is the same value that is received from an inquiry
response and it can be used to make further reconnections faster.
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

The L2CAP raw socket is associated with the signal channel and the
check for the maximum transfer unit makes no sense here.
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>