From: Kevin Corry <kevcorry@us.ibm.com>

DM: Add static and __init qualifiers. [Dave Olien]
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

From: Kevin Corry <kevcorry@us.ibm.com>

Some testing of DM multipath has turned up a problem with the DEVICE_WAIT
command.  In the tests, while performing a DEVICE_WAIT on a multipath device,
the command sometimes returns immediately, even though the event-number is
correct and no path-failure has occurred to trigger an event.  The problem was
tracked down to the call to schedule() in dev_wait(), which would return even
though it was not woken up by a DM table event.

This patch moves the responsibility for waiting from the ioctl interface into
the core driver, and uses wait_event_interruptible() instead of relying on
wait-queues and schedule().
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

From: Kevin Corry <kevcorry@us.ibm.com>

In __map_bio(), if the target returns an error while mapping the I/O, the
cloned bio needs to be freed.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

From: Kevin Corry <kevcorry@us.ibm.com>

Fix an OB1 error when calculating an output buffer size, that could cause a
missing null termininator in the 'list devices' ioctl results.  [Steffan
Paletta]
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

From: Matt Mackall <mpm@selenic.com>

I noticed that my vmlinux BSS had grown from 17k to 45k between 2.6.5 and
2.6.6.  8k was moving a pair of objects in head.S from the text section to
bss, 8k was the introduction of IRQ stacks, while the remainder (12k) was
page alignment slop, some of it spurious.  The following patch brings BSS
down to the expected 33k.

Throw the IRQ stacks into the page aligned section to avoided wasted BSS
space.  While we'd expect this to save up to 4k, this saves over 10k of BSS
here due to gcc3.3 spuriously aligning other objects in the vicinity.
Signed-off-by: Matt Mackall <mpm@selenic.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Jorn Engel <joern@wohnheim.fh-wedel.de>

Adds a `make checkstack' target.  This disassembles and parses vmlinux and
*.ko, generating a sorted list of stack hogs, eg:

0xc0100663 huft_build:                                  1456
0xc01022d3 huft_build:                                  1456
0xc0103127 inflate_dynamic:                             1328
0xc0101487 inflate_dynamic:                             1324
0xc010131f inflate_fixed:                               1168
0xc0102fb7 inflate_fixed:                               1168
0x00000003 sha512_transform:                            984
0xc024aee3 Vpd:                                         952
0x00000003 twofish_setkey:                              804
0x000060c3 isd200_action:                               792
0x0000e6cb nfsd4_proc_compound:                         760
0xc0249087 SkPnmiGetStruct:                             712
....


Supported architectures are alleged to be arm, x86, ia64, mips, mips64, ppc,
ppc64 and s390x.
Signed-off-by: Jörn Engel <joern@wohnheim.fh-wedel.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

From: Anton Blanchard <anton@samba.org>

A few xmon fixes:

- Check we have the set-indicator property before calling rtas.
- We were printing a cpu number in one place with %s, fix.
Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

From: Matt Porter <mporter@kernel.crashing.org>

Reorg PPC DMA API. Use PCI DMA API wrapper and add coherent alloc in irq.
Signed-off-by: Matt Porter <mporter@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

From: Matt Porter <mporter@kernel.crashing.org>

Fixes PPC4xx from the do_page_fault()->handle_page_fault() change.
Signed-off-by: Matt Porter <mporter@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

From: Tom Rini <trini@kernel.crashing.org>

When the 826x enet driver was made to call register_netdev/free_netdev,
no one declared 'err' in the function.
Signed-off-by: Tom Rini <trini@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

From: Benjamin Herrenschmidt <benh@kernel.crashing.org>

This patch replaces schedule_timeout() with the new msleep().
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Colin Leroy <colin@colino.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

From: Benjamin Herrenschmidt <benh@kernel.crashing.org>

This patch fixes the lack of /dev/adb in kernel 2.6.7-rc1.  The call to
devfs_mk_cdev() has probably been removed too soon.  Hope this one is
better than the last one ;)
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Colin Leroy <colin@colino.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

From: Benjamin Herrenschmidt <benh@kernel.crashing.org>

This patch fixes a typo preventing channel B from working on the Rx path of
pmac zilog (never calling tty_flip_*).  I think I never tested channel B :)

Thanks to Hollis Blanchard for spotting the bug.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

From: David Gibson <david@gibson.dropbear.id.au>

Currently the get_vsid() and get_kernel_vsid() functions have a test which
enables a different VSID algorithm for debugging.  Using a dumb VSID
algorithm for stressing the hash table is a reasonable debugging tool, but
switching it at runtime makes no sense at all.  Plus it adds another test
and memory access to the performance critical SLB miss path.

This patch removes the test, replacing it with a compile time switch.  It
seems to make a measurable, although small speedup to the SLB miss path
(maybe 0.5%).
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

The recent nfsd fix was too fancy.  When initialising d_bucket to an "invalid"
value, all we need is a NULL in there.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This patch to radeonfb fixes support for the latest iBook models along
with an initialisation problem on some IGP chipsets. Please apply.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

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

Sparse found an instance where we were directly dereferencing a
userspace pointer in the signal handling code.  This change
fixes that.

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

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

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

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

Cset exclude: akpm@osdl.org[torvalds]|ChangeSet|20040510205830|02933

From: Christoph Hellwig <hch@lst.de>

All watchdog drivers need linux/fs.h

This patch also removes the cbar usage which is unnecessary. The MMCR is
always available at 0xfffef000; there is no need to use the cbar register
(if mmcr aliasing is enabled, then the MMCR is _also_ available at
another address set by CBAR).

Clean-up (general stuff: comments, keep module parameters together, ...)
Added clear definitions for the Watchdog Timer Control Register bits
Made start, stop and keepalive return 0 if successful
Fixed nowayout behaviour so that it is consistent with other watchdog drivers
Fixed release behaviour so that it is consistent with other watchdog drivers
Added wdt_set_heartbeat function to set the timeout/heartbeat of the watchdog
Made sure that memory remapping (wdtmrctl) is done before misc_register is started
MMCR_BASE_DEFAULT was wrong (Bug 2497 reported by Sean Young)

Tested by Sean Young

When drivers starts show the correct watchdog driver info.

into kroah.com:/home/greg/linux/BK/i2c-2.6

into kroah.com:/home/greg/linux/BK/usb-2.6

This is a driver for "Remote/Local Temperature Sensor with Dual-Alarm Outputs
and SMBus Serial Interface" MAX1619. I found this chip an my Laptop SAMSUNG
NV5000. Daryng I use Linux cooling didn't worked at all, naw  with this
driwer it's working. I hope  this will be usefool for ather too.

I didn't hade any expiriens with programming, but i didn't wont to wait wann
some body make it vor me. Jean halped me correrct any mysteiks wich i made.
Thanks Jaen :)
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

The following patch adds support for the ADM1030 and ADM1031 evaluation
boards to the i2c-parport and i2c-parport-light drivers. They are almost
compatible with the already supported ADM1025 and ADM1032 boards, except
that the ADM1032 board needs some pins to be set high to draw its power,
while the same pins power up heating resistors on the ADM1031 board. I
considered it was a bit dangerous to do that by default, so I ended up
with two different device definitions, one with powering pins set, and
one with these pins cleared.
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

 In drivers/pci/probe.c::pci_scan_bridge() the call for pci_alloc_child_bus()
can return NULL, but it is not handled by the function (detected by
Coverity's checker).

 The patch bellow fix that returning `max' if we got the NULL, but
I do not know if it is right. I guess it is, because in that case
the function will act in the same way as with `pass != 0'.

Signed-off by: Luiz Capitulino <lcapitulino@prefeitura.sp.gov.br>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

We would like to have the InfiniCon PCI Vendor ID added to pci_ids.h
Below is a context diff, which would would greatly appreciate if you
applied and included in future kernel releases.
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

This patch fixes throttling problems in the ftdi_sio driver for the
2.6 kernel.  The old throttling mechanism (unlinking the read urb)
often failed to work, and even it did work, would lose any data
held in the transfer buffer.  The new mechanism presented here is
based on what the whitehead driver does (defer processing and
resubmitting of the read urb until unthrottled).
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

This patch changes the return codes used by hub_port_wait_reset(),
hub_port_reset(), and hub_port_debounce() in hub.c.  I couldn't stand the
{-1=error, 0=okay, 1=disconnect} scheme; the meanings seemed arbitrary and
I constantly forgot which number stood for what status.  The revised code
uses normal negative error codes, including -ENOTCONN to indicate device
disconnected, or 0 for success.
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

A patch to fix my previous
leave-runtime-suspended-devices-off-at-system-resume patch; the new
changes save a copy of power.power_state in order to know whether to
resume a device, independently of mods to that field by a driver suspend
routine.  This fixes 2.6.7-rc1-mm1 in the same fashion as the updated
2.6.6 patch sent previously.
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

into kroah.com:/home/greg/linux/BK/driver-2.6

Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

into kroah.com:/home/greg/linux/BK/pci-2.6

Based on a patch from Nickolai Zeldovich <kolya@MIT.EDU> but put into the
proper place by me.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>