into home.osdl.org:/home/torvalds/v2.5/linux

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

[ GregKH has already done this is USB and PCI core. ]

From: "Warren A. Layton" <zeevon@debian.org>

Based on a request from Matthew Wilcox, convert instances of
pci_dev->slot_name to use pci_name() instead:

  "In order to support PCI Domains, we have to stop using slot_name.
   It's related to driver model transition too since pci_dev->slot_name
   was redundant with pci_dev->dev.bus_id.  So I introduced the inline
   function pci_name().  Now there's about 300-400 places in the tree
   that're using slot_name which need to be converted to use pci_name().
   once that's done, we can remove the slot_name pointer in pci_dev and
   save a (void *) per pci_dev."

From: Leann Ogasawara <ogasawara@osdl.org>

Uninitialize static variables initialized to 0 so they are pushed to the
.bss instead of .data.

From: Leann Ogasawara <ogasawara@osdl.org>

Uninitialize static variables initialized to 0 so they are pushed to the
.bss instead of .data.

From: Daniele Bellucci <bellucda@tiscali.it>

Return proper error code from copy_to_user failure in fs/sysfs/bin.c

From: maximilian attems <janitor@sternwelten.at>

Use char arrays instead of char* for strings:
 a. uses a single variable instead of two.
 b. shorter code.
 c. __initdata will be completely dropped.

From: Daniele Bellucci <bellucda@tiscali.it>

From: dan carpenter <error27@email.com>

Neither one of these drivers has a clear maintainer.  The patches are
straight forward and tested.  Both drivers are released under the GPL.

By Leann Ogasawara <ogasawara@osdl.org>

Uninitialize static variables initialized to 0 so they are pushed to the
.bss instead of .data.

This fixes a bug in locking (we take one lock twice) for old quota
format.  Without this patch the old format simply don't work (I really
don't know how that could happen).

Thanks go to Herbert Potzl who spotted it.

into home.osdl.org:/home/torvalds/v2.5/linux

These have been in the pci.ids file for awhile but not in <linux/pci_ids.h>
They're used by my drivers/atm/lanai.c driver that has been in tree for
some time now (it provides its own copy of these #define's protected by
an #ifndef - I'll remove that once this patch goes into the mainline)

As far as I can tell "pci_set_consistent()" doesn't exist - the docs probably
meant to say "pci_set_consistent_dma_mask()".

Diagnosis from Christian Vogel <vogel@skunk.physik.uni-erlangen.de>

cpu_idle() tests pm_idle() just once then falls into the

	while (!need_resched())
		idle();

loop.

Problem is, that loop never terminates (need_resched() always returns false
on preemptive kernels).

The other problem is that ACPI updates pm_idle _after_ cpu_idle() has taken a
local copy.  So we always call default_idle(), even when pm_idle is pointing
at a new idle handler.

So fix it to pick up changed values of pm_idle() each time around the inner
loop.

install_page() is a library function which we expect will be used by all
drivers which implement vm_operations.populate().  Therefore it should be
exported to kernel modules.

Petr Vandrovec has a project which involves sparse mappings of device memory
which can use remap_file_pages().  It needs install_page().

From: Wim Van Sebroeck <wim@iguana.be>

The first patch convert these watchdog modules to the new module_param syntax.

The second patch fixes machzwd.c (you need to declare the variable before
using the module_param subroutine).

From: Adrian Bunk <bunk@fs.tum.de>

A 16bit number can _never_ be > 65536.  So don't bother to check for it.

From: Andries.Brouwer@cwi.nl

A few days ago I needed a serial line and couldnt find the option in
menuconfig.  Turned out that SERIAL_8250 depends on EXPERIMENTAL.  I
suppose that dependence should be removed.

From: Francois Romieu <romieu@fr.zoreil.com>

The wan driver I maintain was hit by hdlc changes too. Please
apply patch below. It is diffed against plain -test2 but it
applies equally as well against -test2-mm2.

More important changes will come in a near future for this
driver but I'd rather keep the changes separated.

Description:
- after the hdlc changes, dscc4 module doesn't need to set
  hdlc->proto(.id) itself anymore;
- MOD_{INC/DEC}_USE_COUNT removal;
- SET_NETDEV_DEV() use;

From: Krzysztof Halasa <khc@pm.waw.pl>

The following patch upgrades generic HDLC to support "new" protocol
handlers.

From: Adrian Bunk <bunk@fs.tum.de>

Fix ACPI compile error if doing processor probing only: acpi_find_bmc is
only available #ifdef CONFIG_ACPI_INTERPRETER.

nvidia-agp needs it.

The module device table is not NULL-terminated, so we run off the end during
probing and oops.

Also, move all those static decls out of .h and into .c

From: Herbert Potzl <herbert@13thfloor.at>

quota.h typo fix

From: Dave Olien <dmo@osdl.org>

It wasn't initializing the devfs_name member of the gendisk structures to
contain the root name of the logical disk.

From: Arun Sharma <arun.sharma@intel.com>

A script such as

  #!/bin/foo.bar
  ...

where /bin/foo.bar is handled by binfmt_misc, is not handled correctly i.e.
the interpreter of foo.bar doesn't receive the correct arguments.

The binfmt_misc handler requires that bprm->filename is appropriately
filled so that the argv[1] could be correctly passed to the interpreter.

However, binfmt_script, as it exists today doesn't populate bprm->filename
correctly.

Another motivation for this patch is the output of ps.  Emulators which use
binfmt_misc may want to keep the output of ps consistent with native
execution.  This requires preserving bprm->filename.  The attached patch
guarantees this even if we have to go through several binfmt handlers
(think of finite loops involving binfmt_script and binfmt_misc).

From: Adrian Bunk <bunk@fs.tum.de>

Fix compile error introduced by the HDLC update.

From: Adrian Bunk <bunk@fs.tum.de>

drivers/net/pcmcia/com20020_cs.c wasn't updated to the module owner
field changes

From: <ffrederick@prov-liege.be>

Add the necessary locking around uid_hash_insert() in uid_cache_init().

(It's an initcall, and the chances of another CPU racing with us here are
basically zero.  But it's good for documentary purposes and the code gets
dropped later anyway...)

From: <ffrederick@prov-liege.be>

The special_file() macro is being duplicated in JFS.  Move it to fs.h.

This function tries to allocate increasingly large buffers, but it gets the
bounds wrong by a factor of PAGE_SIZE.  It causes boot-time devfs mounting
to fail.

We're getting asserion failures in commit in data=journal mode.

journal_unmap_buffer() has unexpectedly donated this buffer to the committing
transaction, and the commit-time assertion doesn't expect that to happen.  It
doesn't happen in 2.4 because both paths are under lock_journal().

Simply remove the assertion: the commit code will uncheckpoint the buffer and
then recheckpoint it if needed.

From: Felipe Alfaro Solana <felipe_alfaro@linuxmail.org>

Fix compile error in 2.6.0-test2 when Netfilter IP connection tracking
is enabled.

From: Manfred Spraul <manfred@colorfullife.com>

Eli Barzilay noticed that select() for tty devices is broken: For
stopped tty devices, select says POLLOUT and write fails with -EAGAIN.

    http://marc.theaimsgroup.com/?l=linux-kernel&m=105902461110282&w=2

I've tracked this back to normal_poll in drivers/char/n_tty.c:

 > if (tty->driver->chars_in_buffer(tty) < WAKEUP_CHARS)
 >                mask |= POLLOUT | POLLWRNORM;

It assumes that a following write will succeed if less than 256 bytes
are in the write buffer right now. This assumption is wrong for
con_write_room: if the console is stopped, it returns 0 bytes buffer
size (con_write_room()). Ditto for pty_write_room.

From: florin@iucha.net (Florin Iucha)

Fix compilation of net/ipv4/netfilter/ipt_helper.c by including the
proper header files.