into kanga.twiddle.home:/home/rth/work/linux/axp-2.6

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

The recent addition of linux/bitops.h inside linux/kernel.h has
created a circular dependency:

asm/system.h -> linux/kernel.h -> linux/bitops.h -> asm/bitops.h
 -> asm/system.h

which results in an unbuildable kernel.  We appear not to need
linux/kernel.h in asm/system.h, but do need linux/linkage.h, so
make this the case.

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

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

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

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

Else we risk an OOPS.
Signed-off-by: David S. Miller <davem@davemloft.net>

Otherwise modules that get loaded dynamically will not be able
to resolve the iomap functions, if no built-in drivers caused
it to be linked in at compile-time.

It missed the new vmlinux.strip file.

 # CONFIG_PCI is not set
 CONFIG_EISA=y

drivers/net/3c59x.c: In function `vortex_ioctl':
drivers/net/3c59x.c:2916: warning: dereferencing `void *' pointer
drivers/net/3c59x.c:2916: error: request for member `current_state' in something not a structure or union
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Quiet mmtimer on non-SGI boxes (previously it printed "mmtimer: unable to
determine clock frequency").
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

From: Doug Dumitru <doug@easyco.com>

I have been fighting a buffering error when sending large amounts of data out
pty devices from UML.  I have tried a couple of patches that did not really
fix the problem (and were rightly rejected by the group), but have finally
found the real bug.

In /arch/um/drivers/line.c there is a function "buffer_data" that is
responsible for storing data into the lines ring buffer.  The function is
"supposed" to return the number of characters actually buffered.
Unfortunately, in the case where the buffer wraps, the "len" variable is
decremented by "end" before it is used as the return parameter.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade_spam@yahoo.it>
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Make sure we print ERRNO and not always -1.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade_spam@yahoo.it>
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Simple corrections to some error messages, which list wrong limits for UBD
devices and such.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade_spam@yahoo.it>
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Output a nice error message for people who need mem > 256M but don't increase
on the host /proc/sys/vm/max_map_count, telling them to do so.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade_spam@yahoo.it>
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade_spam@yahoo.it>
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

From: "D.  Bahi" @ enterasys.com - remove an unneeded line from the dynamic
linker script.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade_spam@yahoo.it>
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This makes UML load at 0x8048000 rather than 0xa0000000 when CONFIG_MODE_SKAS
is on and CONFIG_MODE_TT is off.  This will make it more valgrind-friendly,
and also allow much greater physical memory sizes without needing to use
highmem.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade_spam@yahoo.it>
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade_spam@yahoo.it>
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

__wrap_free is now careful about freeing to the same allocator that allocated
the buffer.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade_spam@yahoo.it>
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Tidied up some whitespace in arch/um/Makefile.  Added -DUM_FASTCALL to
Makefile-i386.  make clean descends into util in order to get rid of the
binaries there.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade_spam@yahoo.it>
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

arch/um/uml.lds.S has already been moved to arch/um/kernel. dyn.lds.S has just
been forgotten, so fix this.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade_spam@yahoo.it>
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Unconditionally enabling interrupts is upsetting the ACPI time resume code.
Signed-off-by: Li Shaohua <shaohua.li@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Fix various gcc-4.0 compilation errors.

Signed-off-by: Grzegorz Jaskiewicz <gj at pointblue.com.pl>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

The following patch to the generic direct IO code fixes a problem we've
come across that affects the way XFS interacts with it.  Between 2.6.5 and
2.6.6 several changes to direct IO were made, in particular the
fallback-to-buffered path was introduced in that timeframe.

Those changes split the locking done within direct-io.c into two cases -
generic filesystems and blkdev/XFS.  There is no locking done for the
second case, and we also never set the create parameter to the get_blocks
call (via direct_io_worker ->do_direct_IO->get_more_blocks) for that case. 
This meant that XFS was accidentally no longer being told when a direct IO
write was being performed, which in turn meant that XFS would (often -
depending on the inode's size and bmap) tell get_more_blocks that it was
mapping to a hole.  It also means that currently all direct writes into XFS
are falling back to buffered writes.  Further, skipping the i_alloc_sem
locking entirely is not correct for us, we are relying on that aspect of
the generic locking.

The fallback behaviour from direct to buffered is "silent", so we didn't
actually pick up on these problems until just recently, unfortunately.

The approach I've taken here is to split the blkdev/XFS case into two, and
corrected the new third case behaviour for the functionality XFS provides. 
The generic behavior used by other filesystems remains unchanged, as does
direct IO to the block device, and XFS now becomes fully functional.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Add PTRACE_GETREGS and PTRACE_SETREGS functions for the native debugging
support of the GNU Project Debugger, GDB.
Signed-off-by: Hirokazu Takata <takata@linux-m32r.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This patch is for upgrading m32r's code to the 2.6.9-rc1-mm5 source as well as
the other architectures.

* arch/m32r/Makefile: Replace assigment to CHECK with assignment to CHECKFLAGS

* arch/m32r/kernel/vmlinux.lds.S:
	- out-of-line locks / m32r; Include LOCK_TEXT to .text section.
	- Move param section out of init area, for export of built-in
	  module params

* arch/m32r/mm/ioremap.c (__ioremap):
	Add __iomem modifier to the return value type of __ioremap()
	for much stricter type-checking.

* include/asm-m32r/resource.h:
	- rlimit-based mlocks for unprivileged users
	- Increase per-user mlock limit default to 32k	

* include/asm-m32r/socket.h:
	- [NET]: Move SOCK_foo types into linux/net.h

* include/asm-m32r/unistd.h:
  Add system calls; taken from asm-i386/unistd.h.
    - [PATCH][2/6] perfctr-2.7.3 for 2.6.7-rc1-mm1: i386  (05/31/2004)
    - [PATCH] Make key management use syscalls not prctls (09/06/2004)
Signed-off-by: Hirokazu Takata <takata@linux-m32r.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Here is the fix for dio_new_bio() BUG() with fsx tests.  The problem is, I
changed dio_pages_in_io calculation to be exactly the number of pages we
needed to map the user-buffer to do the IO.  But with fine-grain alignment
(non fs-blocksize), we may need 2 more pages (ZERO_PAGE) to zero out first
and last block if needed.

Here is the bug info.

http://bugme.osdl.org/show_bug.cgi?id=3447Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This fixes a few warnings in radeonfb and add proper PLL divider values
for Apple latest PowerBook Aliminium 17" so the display isn't "fuzzy"
(the LVDS interface needs special PLL values that the driver can't
calculate, on most x86, the BIOS tells us the values to use, on Apple
laptops, we have to hard code them for each model).
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

The battery calculation code in via-pmu triggers a few warnings (and
actually, one of them would lead to a real error if we ever get an
unrecognized type from the PMU).  Fix this.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This makes the ADB->Linux keycodes conversion table a lot more readable
(and thus easy to fix :) and adds conversion of the laptop Fn-enter
(keypad enter, also present on apple laptop keyboards on the bottom
right, left of the arrow keys) to "compose" (or menu key on modern PC
keyboard).

Thanks to Frank Murphy <murphyf@f-m.fm> for spotting this keycode
feature of MacOS (and apple docs)

It also fixes a small possible race in the LED code
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

This is a gcc error, but let's fix it anyway, it isn't a perf critical
codepath and warnings are ugly.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Another bunch of annoying warnings gone, and code cleaned up.

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

      and then went and used the looked up attribute...  Ooops.
Signed-off-by: Anton Altaparmakov <aia21@cantab.net>

into cantab.net:/home/src/ntfs-2.6-devel