Patch from Tony Lindgren

This patch syncs the mainline kernel with the linux-omap tree.
The patch mostly contains minor fixes and extra register definitions
by various OMAP developers.

Signed-off-by: Tony Lindgren
Signed-off-by: Russell King

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

Patch from David Vrabel

Expand the IXP4XX_WATCHDOG (IXP4xx internal watchdog) config option help text with a note about its ineffectiveness.

Signed-off-by: David Vrabel
Signed-off-by: Russell King

Patch from Catalin Marinas

This patch enables the ARM922T configuration option for the
Integrator platforms (there is an Excalibur core module available).

Signed-off-by: Catalin Marinas
Signed-off-by: Russell King

Patch from Deepak Saxena

This patch borrows from the uclinux source where they have moved
the per-platform code for get_irqnr_and_base, disable_fiq, and
irq_prio_table out of entry-armv.S. However, instead of putting the
macros in arch/arm/mach-$(MACHINE)/entry-header.S, we just have
it in the machine's incdir. This means we don't need the extra
complexity of creating symlink at build time. The patch also removes 
the irq_prio_table as a requirement for all machines and makes it
specific to IOC/IOMD machines. 
  
This patch drastically shrinks entry-armv.S and allows us to delete 
and add machines without having to touch generic code (there were two 
dead machines laying around in entry-armv.S).
  
Tested on IXP4xx and test-built for just about every defconfig.

Signed-off-by: Deepak Saxena
Signed-off-by: Russell King

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

into pobox.com:/garz/repo/libata-2.6

After some testing, it seems that some PATA host adapter (ex. pdc20275) cannot 
work reliably with specific request buffer sizes under ATAPI DMA mode.

Detailed test result:
4096, 2048, 1024, 512, 256: OK
384, 257, 255, 128, 96, 64, 32:  failed (irq lost)
 
It seems multiple of 256 bytes are the safe ATAPI DMA buffer sizes to use.

Attached please find the patch to fix the pdc2027x ATAPI DMA problem.

Changes:
1. Add a callback function "check_atapi_dma()" to ata_port_operations such that libata core
can ask the driver: "Can this command be processed in ATAPI DMA mode safely? " 
when the the command is received.
2. ATAPI DMA is off by default if the callback function is not provided by the driver

If the callback function is not provided by the driver, the ATAPI DMA should be as is.
The ATAPI DMA is already controlled by dev->flags.

BTW, the patch isolates the ATAPI DMA workaround to the pdc20275 driver itself,
not impacting libata core .
Signed-off-by: Albert Lee <albertcc@tw.ibm.com>

Tested burning CD-RW with libata-dev-2.6 and cdrecord:
1. ATAPI DMA mode - tested OK
2. ATAPI PIO mode - test failed when cdrecord finishes burning and issues MODE_SELECT to the device.

 After checking the log, it showed that MODE_SELECT caused ata_pio_complete() to return error.
However, the error is not handled by ata_pio_task().

Attached please find the patch for ata_pio_task() error handling for your review.
(The patch is against the libata-dev-2.6 tree. )

Changes in the patch:
1. End the PIO task when PIO_ST_IDLE state is entered
2. End the PIO task after PIO_ST_TMOUT and PIO_ST_ERR state handled by ata_pio_error()
3. Remove the first "if" statement to handle the error condition returned from 
   ata_pio_block(), ata_pio_complete() and ata_pio_poll().

Change #2 is not so necessary since ata_pio_error() will put the cmd to  PIO_ST_IDLE state
after the error condition is handled. The change just saves a function call to queue_work().

Tested OK on on my machine with pdc20275 and ASUS CD-RW drive.
Signed-off-by: Albert Lee <albertcc@tw.ibm.com>

Signed-off-by: Albert Lee <albertcc@tw.ibm.com>

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

Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

Clean up in drivers/char/hw_random.c:
Make debug #defines a little easier to understand.
Small whitespace cleanup.
Change some printk()'s into pr_info()'s.
Add KERN_ constant to debug printk().
Signed-off-by: James Nelson <james4765@gmail.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

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

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

  CC [M]  drivers/scsi/scsi_transport_fc.o
drivers/scsi/scsi_transport_fc.c: In function `fc_stat_show':
drivers/scsi/scsi_transport_fc.c:634: warning: long long unsigned int format, long unsigned int arg (arg 4)

To us %llx on a 64 bit platform we have to cast u64 to 
unsigned long long.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

From: 	James.Smart@Emulex.Com

This patch updates the fc_transport with attributes for local FC ports
(e.g. Hosts).  The port attributes are defined per HBAAPI v2.0 definitions.

This patch results in the following in /sys/class:
-----------------------------------------------------

[jsmart@elxware class]$ cd /sys/class
[jsmart@elxware class]$ ls
fc_host       graphics  misc     pci_bus       scsi_host  usb_host
fc_transport  input     net      scsi_device   tty        vc
firmware      mem       netlink  scsi_generic  usb
[jsmart@elxware class]$ cd fc_host
[jsmart@elxware fc_host]$ ls
host4

[jsmart@elxware fc_host]$ cd host4
[jsmart@elxware host4]$ ls
device                 host_port_maxframe_size      host_port_supported_speeds
host_fabric_name       host_port_name               host_port_symbolic_name
host_link_down_tmo     host_port_speed              host_port_type
host_node_name         host_port_state              host_tgtid_bind_type
host_port_active_fc4s  host_port_supported_classes  statistics
host_port_id           host_port_supported_fc4s
[jsmart@elxware host4]$ ls -ld *
lrwxrwxrwx  1 root root    0 Oct 13 18:24 device -> ../../../devices/platform/host4
-r--r--r--  1 root root 4096 Oct 13 18:24 host_fabric_name
-rw-r--r--  1 root root 4096 Oct 13 18:24 host_link_down_tmo
-r--r--r--  1 root root 4096 Oct 13 18:24 host_node_name
-r--r--r--  1 root root 4096 Oct 13 18:24 host_port_active_fc4s
-r--r--r--  1 root root 4096 Oct 13 18:24 host_port_id
-r--r--r--  1 root root 4096 Oct 13 18:24 host_port_maxframe_size
-r--r--r--  1 root root 4096 Oct 13 18:24 host_port_name
-r--r--r--  1 root root 4096 Oct 13 18:24 host_port_speed
-r--r--r--  1 root root 4096 Oct 13 18:24 host_port_state
-r--r--r--  1 root root 4096 Oct 13 18:24 host_port_supported_classes
-r--r--r--  1 root root 4096 Oct 13 18:24 host_port_supported_fc4s
-r--r--r--  1 root root 4096 Oct 13 18:24 host_port_supported_speeds
-r--r--r--  1 root root 4096 Oct 13 18:24 host_port_symbolic_name
-r--r--r--  1 root root 4096 Oct 13 18:24 host_port_type
-rw-r--r--  1 root root 4096 Oct 13 18:24 host_tgtid_bind_type
drwxr-xr-x  2 root root    0 Oct 13 18:24 statistics


Using the following script (/tmp/show_attributes):
    #!/bin/sh
    FILES=`ls *`
    for file in $FILES; do
      if [ -f $file ] ; then
        echo "$file : " `cat $file`
      fi
    done

Here's a sample of querying the attributes:

[jsmart@elxware /]$ cd /sys/class/fc_host/host4
[jsmart@elxware host4]$ /tmp/show_attributes
host_fabric_name :  0x33334444ffeeddcc
host_link_down_tmo :  30
host_node_name :  0x78563412aabbccdd
host_port_active_fc4s :  hex: 40 41 42 43 44 45 46 47 48 49 4a 4b 4c 4d 4e 4f 50 51 52 53 54 55 56 57 58 59 5a 5b 5c 5d 5e 5f
host_port_id :  0x789abc
host_port_maxframe_size :  2511 bytes
host_port_name :  0xefcdab9011223344
host_port_speed :  2 Gbit
host_port_state :  Online
host_port_supported_classes :  Class 2, Class 3
host_port_supported_fc4s :  hex: 80 81 82 83 84 85 86 87 88 89 8a 8b 8c 8d 8e 8f 90 91 92 93 94 95 96 97 98 99 9a 9b 9c 9d 9e 9f
host_port_supported_speeds :  2 Gbit, 4 Gbit, 10 Gbit
host_port_symbolic_name :  LP9052 Dual Port Adapter
host_port_type :  NPort (fabric via point-to-point)
host_tgtid_bind_type :  wwpn (World Wide Port Name)
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

Description: Use msleep() instead of schedule_timeout()
to guarantee the task delays as expected.  Originally
submitted to linux-scsi by the janitors, and resubmitted
by boutcher (after testing :-)
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Maximilian Attems <janitor@sternwelten.at>
Signed-off-by: Dave Boutcher <boutcher@us.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

the ibm_acpi.c driver references acpi_ibm_exit() from it's __init function,
which means the exit function isn't allowed to be __exit since __exit
functions are not part of vmlinux while __init functions are.
Signed-off-by: Arjan van de Ven <arjan@infradead.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

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

They were already there, properly sorted too.

into pobox.com:/garz/repo/net-drivers-2.6

into pobox.com:/garz/repo/net-drivers-2.6

into pobox.com:/garz/repo/net-drivers-2.6

into pobox.com:/garz/repo/net-drivers-2.6

into pobox.com:/garz/repo/net-drivers-2.6

into pobox.com:/garz/repo/net-drivers-2.6

into pobox.com:/garz/repo/net-drivers-2.6

Originally submitted by Mike Waychison <Michael.Waychison@sun.com> in
August but apparently lost.
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

SCSI ioctls can ask for a lot of memory and fail. We don't need to vomit
in the log file for this case. Again taken from the Red Hat minor
patches applied for FC3.

Original-patch: Arjan van de Ven <arjanv@redhat.com>
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Paul Laufer informed the list that he had changed address and his change
of address had been ignored so CREDITS was still wrong although other
files had been updated.

Fix this.
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Red Hat got some confused customers due to this message. The confused
user case is when they update the BIOS and all of a sudden we have "no
suitable data" yet we did before. We (Arjan van de Ven) thus changed it
to "No new microcode" which is much much clearer.
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Add some more funky AC97 knowledge to the intel8x0 driver. These come
from Red Hat and its partners and are included in our shipping code.
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

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

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

into pobox.com:/garz/repo/net-drivers-2.6

into pobox.com:/garz/repo/net-drivers-2.6

into pobox.com:/garz/repo/net-drivers-2.6