into kernel.bkbits.net:/home/davem/net-2.6

into nuts.davemloft.net:/disk1/BK/sparc-2.6

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

The calculation ended up believing we had one less UART than we
really had.  Fix it.

Don't touch the wakee stack after marking it runnable.

"sparse" warns about implicit type conversions that may cause
surprising results. Did you know that large decimal types have
different type conversions from large hexadecimals?

From Christoph Hellwig <hch@lst.de>

If we're ever going to ressurect umsdos it should be a stackable
filesystem..

From: René Scharfe <l.s.r@web.de>

the following patch converts the error handling paths in VFAT fs to use
goto, making it more consistent with other filesystem code. Shrinks the
resulting binary by 144 bytes in my build.

The ->dentry_to_fh() can use the 20 bytes in the case of NFSv2, but
fat_dentry_to_fh() requires 24 bytes by my patch.

So nfsd reply the EOPNOTSUPP to nfs client, then nfs client convert
the unknown error to -EIO.

This patch fixes the problem by pushing the handle data into 20 bytes.

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

The mcdx.c author had pulled off something absolutely amazing - he had
declared several unsigned variables (ISA port numbers) as void *, using
explicit cast to unsigned in almost all places that used them. 
Exception: printk.  There he proudly used them as pointers - with %3p in
format.  That cute trick allowed him to avoid using %03x, which
apparently scared him for some reason. 

Switched to use of unsigned, killed casts, replaced %3p with %03x in
formats.  BTW, the code had been that way since the initial merge back
in 1.3.7...

This fixes a bug in the ppc64 signal delivery code where the signal
number argument to a signal handler can get corrupted before the handler
is called.  The specific scenario is that a process is in a blocking
system call when two signals get generated for it, both of which have
handlers.

The signal code will stack up two signal frames on the process stack
(assuming the mask for the first signal delivered doesn't block the
second signal) and return to userspace to run the handler for the second
signal.  On return from that handler the first handler gets run with an
incorrect signal number argument because we end up with regs->result
still having a negative value (left over from when the system call was
interrupted) when it should be zero.  This patch sets it to zero when we
set up the signal frame (in three places; for 64-bit processes, and for
32-bit processes for RT and non-RT signals). 

The way we handle signal delivery and signal handler return using the
regs->result field in ppc64 is more complicated than it needs to be.  In
ppc32 I have already simplified it and eliminated use of the
regs->result field.  I am going to do the same in the ppc64 code, but I
think this patch should go in for now to fix the bug. 

The patch also fixes a couple of places where we were unnecessarily and
incorrectly truncating the regs->result value to 32 bits
(sys32_sigreturn and sys32_rt_sigreturn return a long value, as all
syscalls do, and if regs->result is negative we need those syscalls to
return a negative value).

Thanks to Maneesh Soni for identifying the specific circumstances
under which this bug shows up.

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

into kernel.bkbits.net:/home/davem/net-2.6

There is a bug in listening_get_first() which used by /proc/net/tcp*
where it wasn't looping through all the sockets in each hash chain.
This problem doesn't show up unless the first socket in a chain doesn't
match the family that is being looked up.

The following patch fixes this by getting rid of listening_get_first()
altogether.

There's a subtle problem with "inline" usage in <linux/string.h>:

 <linux/string.h>:
        this pulls in __constant_c_and_count_memset()

 <linux/mm.h>:
        this pulls <compiler.h>, re-defining
        inline == __inline__ __attribute__((always_inline)).

 But by now it is too late! The compiler has already seen the bare
 "inline" in string.h, and hasn't inlined it.

Result:

	# grep __constant System.map
	c0144670 t __constant_c_and_count_memset
	c0145c60 t __constant_c_and_count_memset
	... many more copies of this function ...

Fixed by including <compiler.h> early enough.

into hostme.bitkeeper.com:/repos/c/cifs/linux-2.5cifs

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

into nuts.davemloft.net:/disk1/BK/net-2.6

From: Patrick Wildi <patrick@wildi.com>

On OSB4 the hwif->ultra_mask is set to not support UDMA.
Unfortunately in that case svwks_config_drive_xfer_rate()
falls through to the end of the function, instead of trying
other DMA modes.

 - Correctly handle wraparound on offset+len
 - fix FADV_WILLNEED handling of non-page-aligned (offset+len)

Let's hope we don't need to fix the fixed fix.

On sparc64 toolchain:

drivers/built-in.o(.init.text+0xaf8c): In function `usb_init':
: undefined reference to `usbfs_cleanup'

usb_init() is __init and usbfs_cleanup() is __exit.  No can do.

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

Patch from Nicolas Pitre

Patch from Nicolas Pitre

... including the new PXA270 aka Bulverde.

Patch from Nicolas Pitre

Before previous patch this driver compiled OK but was buggy.
Now it doesn't compile anymore as the bogus macro has been
deleted.  Fix that in any case.

The same fix has been committed to the MTD CVS already, but please forward 
this to Linus otherwise Lubbock won't compile from kernel.org tree anymore
(waiting for dwmw2 to update this might prove ... hrm ... long) 

Patch from Nicolas Pitre

Too many macro with too generic names.  Let's remove unneeded code and
redundant/unused macros.  This also prevent namespace clash with upcoming 
patches.

Patch from Nicolas Pitre

Minor cleanup of Lubbock specific code, like removal of
redundant mappings. 
Also a prerequisite for some upcoming patches.

Patch from Nicolas Pitre

virtual address mapping can change.

The recent slab alignment changes broke an unknown number of architectures
(parisc and x86_64 for sure) by causing task_structs to be insufficiently
aligned.

We need good alignemnt because architectures do things like dumping FP state
into the task_struct with instructions which require particular alignment (I
think).

So change the default alignment to L1_CACHE_BYTES, which is what we used to
have, via SLAB_HW_CACHE_ALIGN.

This patch updates the MTD concatenating driver from MTD CVS, which
fixes issues found with this driver which concatenates multiple MTD
devices into one MTD device.

From David Woodhouse, through CVS:

	revision 1.8
	date: 2003/06/30 11:01:26;  author: dwmw2;  state: Exp;  lines: +5 -5
	I will not commit stuff whilst pissed
	I will not commit stuff whilst pissed

	revision 1.7
	date: 2003/06/29 21:26:34;  author: dwmw2;  state: Exp;  lines: +9 -9
	Fix ecc/oob subdev comparisions

	revision 1.6
	date: 2003/06/25 12:37:50;  author: dwmw2;  state: Exp;  lines: +14 -6
	Don't pretend to have {read,write}_{oob,ecc} functions if subdevices don't

	revision 1.5
	date: 2003/06/25 12:21:16;  author: dwmw2;  state: Exp;  lines: +390 -397
	coding style cleanup

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