~ubuntu-kernel/ubuntu/+source/linux/+git/gutsy:linux

Last commit made on 2007-06-27
Get this branch:
git clone -b linux https://git.launchpad.net/~ubuntu-kernel/ubuntu/+source/linux/+git/gutsy
Members of Ubuntu Kernel Repositories can upload to this branch. Log in for directions.

Branch merges

Branch information

Recent commits

b75ae86... by Linus Torvalds <email address hidden> on 2007-06-27

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
  [IA64] Make SN2 PCI code use ioremap rather than manually mangle the address
  [IA64] Force error to surface in nofault code
  [IA64] change sh_change_coherence oemcall to use nolock
  [IA64] remove duplicate header include line
  [IA64] Correct unwind validation code
  [IA64] is_power_of_2-ia64/mm/hugetlbpage.c

75ca0d2... by Linus Torvalds <email address hidden> on 2007-06-27

Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  libata: kill ATA_HORKAGE_DMA_RW_ONLY
  libata: use PIO for non-16 byte aligned ATAPI commands
  libata: call ata_check_atapi_dma() with qc better prepared
  libata: fix infinite EH waiting bug
  libata: fix ata_dev_disable()
  pata_it821x: fix section mismatch warning
  libata: remove unused variable from ata_eh_reset()
  libata: be less verbose about hpa
  libata: kill non-sense warning message
  libata: kill the infamous abnormal status message
  HPT374 is UDMA100 not UDMA133

7af5f53... by Linus Torvalds <email address hidden> on 2007-06-27

Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
  2.6.22: ERROR: "__ucmpdi2" [drivers/net/s2io.ko] undefined!
  cxgb3 - fix register to stop bc/mc traffic
  au1000_eth: Fix warnings.

67a32be... by Stephen Hemminger on 2007-06-27

remove leftover documentation of acpi_generic_hotkey

This looks like leftover text in the kernel parameter in documentation.

Signed-off-by: Stephen Hemminger <email address hidden>
Signed-off-by: Linus Torvalds <email address hidden>

ad5c980... by Ian Romanick <email address hidden> on 2007-06-26

Add support SiS based XGI chips to SiS DRM.

This adds support for some of the XGI Volari family that are based on the
SiS.

Signed-off-by: Dave Airlie <email address hidden>
Signed-off-by: Linus Torvalds <email address hidden>

40a1d53... by tj on 2007-06-26

libata: kill ATA_HORKAGE_DMA_RW_ONLY

ATA_HORKAGE_DMA_RW_ONLY for TORiSAN is verified to be subset of using
DMA for ATAPI commands which aren't aligned to 16 bytes. As libata
now doesn't use DMA for unaligned ATAPI commands, the horkage is
redundant. Kill it.

Signed-off-by: Tejun Heo <email address hidden>
Signed-off-by: Jeff Garzik <email address hidden>

b9a4197... by tj on 2007-06-26

libata: use PIO for non-16 byte aligned ATAPI commands

The IDE driver used DMA for ATAPI commands if READ/WRITE command is
multiple of sector size or sg command is multiple of 16 bytes. For
libata, READ/WRITE sector alignment is guaranteed by the high level
driver (sr), so we only have to worry about the 16 byte alignment.

This patch makes ata_check_atapi_dma() always request PIO for all data
transfer commands which are not multiple of 16 bytes.

The following reports are related to this problem.

http://bugzilla.kernel.org/show_bug.cgi?id=8605 (confirmed)
http://thread.gmane.org/gmane.linux.kernel/476620 (confirmed)
https://bugzilla.novell.com/show_bug.cgi?id=229260 (probably)

Albert first pointed out the difference between IDE and libata. Kudos
to him.

Signed-off-by: Tejun Heo <email address hidden>
Cc: Albert Lee <email address hidden>
Signed-off-by: Jeff Garzik <email address hidden>

e00f1ff... by tj on 2007-06-26

libata: call ata_check_atapi_dma() with qc better prepared

In atapi_xlat(), prepare qc better before calling
ata_check_atapi_dma() such that ata_check_atapi_dma() can use info
from qc. While at it, reformat weird looking if/else block in the
function.

Signed-off-by: Tejun Heo <email address hidden>
Signed-off-by: Jeff Garzik <email address hidden>

914616a... by tj on 2007-06-25

libata: fix infinite EH waiting bug

When EH gives up after repeated exceptions, it doesn't't clear the
PENDING bit on exit which leaves PENDING bit set without EH actually
scheduled. This makes ata_port_wait_eh() to wait forever makes rmmod
hang on such port. Fix it by clearing the flag.

Signed-off-by: Tejun Heo <email address hidden>
Signed-off-by: Jeff Garzik <email address hidden>

09d7f9b... by tj on 2007-06-25

libata: fix ata_dev_disable()

Fix silly condition check bug in ata_dev_disable().

Signed-off-by: Tejun Heo <email address hidden>
Signed-off-by: Jeff Garzik <email address hidden>