Please pull to get these IDE bug fixes:

1) DMA timeouts cause requests to get lost completely and never
   requeued.  Fix from Herbert Xu.  (Tejun has a different
   approach to this problem which makes PIO and DMA timeouts
   get handled more symmetrically, but I'll defer that to
   ide-next-2.6)

2) taskfile ops with CFQ scheduler bomb because the taskfile
   code allocates a request then changes it's direction (e.g.
   READ vs. WRITE) and this makes CFQ explode.  Fix by allocating
   the correct request type from the beginning.  From Mikulas Patocka.

Thanks!

The following changes since commit 48de8cb7847d040c8892701c1ff3c55eff1f46b4:
  Linus Torvalds (1):
        Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/.../tip/linux-2.6-tip

are available in the git repository at:

  master.kernel.org:/pub/scm/linux/kernel/git/davem/ide-2.6.git master

Herbert Xu (2):
      ide: Requeue request after DMA timeout
      ide: Must hold queue lock when requeueing

Mikulas Patocka (1):
      ide: Fix IDE taskfile with cfq scheduler

 drivers/ide/ide-atapi.c    |    2 +-
 drivers/ide/ide-dma.c      |    1 +
 drivers/ide/ide-io.c       |    2 +-
 drivers/ide/ide-taskfile.c |    6 ++----
 include/linux/ide.h        |    1 +
 5 files changed, 6 insertions(+), 6 deletions(-)
--
unsubscribe notice
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/