into home.transmeta.com:/home/torvalds/v2.5/linux

into home.transmeta.com:/home/torvalds/v2.5/linux

Patch from Andreas Gruenbacher <agruen@suse.de>

This patch fixes an unbalanced lock_kernel()/unlock_kernel() path in the ext3
extended attributes code.  Instead of fixing this in fs/ext3/xattr_user.c,
the locking code is moved to fs/ext3/xattr.c, since most other types of
extended attributes will need the exact same functionality.

Growing i_size in hugetlbfs_prefault() isn't right - if we run out of pages,
do_mmap_pgoff() will chop the partially-instantiated pages off again.

So update i_size in hugetlbfs_file_mmap() if the whole mmap attempt was
successful.

Patch from john stultz <johnstul@us.ibm.com>

        This patch simply enables the existing timer_cyclone code for
Summit/x440 systems.

Patch from: john stultz <johnstul@us.ibm.com>

        This patch "fixes" the timer_cyclone code by having it
initialize fast_gettimeoffset_quotient and cpu_khz in the same manner as
timer_tsc. This is required for enabling the timer_cyclone code on the
x440.

Ideally fast_gettimeoffset_quotient would not be used outside timer_tsc
and cpu_khz would be initialized generically outside the timer
subsystem. I have patches to do this, but they touch quite a bit of
generic code, and I'd rather not make the timer_cyclone enablement
(patch to follow) depend on these larger changes.

Patch from: john stultz <johnstul@us.ibm.com>

This cleanup patch makes fast_gettimeoffset_quotient (a timer_tsc specific
variable) static, and replaces its usage with cpu_khz, making it timer_opt
independent.

Patch from: Rusty Lynch <rusty@linux.co.intel.com>

Attempting to cat a sysfs file that returns an error will result in an
endless dump of garbage to the screen because the result of the specific show
operation was being saved to a size_t (unsigned) and then later checked for a
negative value.

Here is a trivial patch to fix the error.

- hugetlbfs_forget_inode() should be using ||

Patch from: Ingo Oeser <ingo.oeser@informatik.tu-chemnitz.de>

Cure imm.c of the recent scsi core damage.

Patch from Neil Brown <neilb@cse.unsw.edu.au>

Initialise the queue's unplug_timer inside blk_queue_make_request.  This
makes the new auto-unplugging more accessable by other clients of
blk_queue_make_request - e.g.  raid5, umem.

This simplifies it and makes it more generic.

        o [FEATURE] Properly inline in wrapper Tx path
        o [FEATURE] Rewrite/simplify/optimise wrapper Rx path
                Lower CPU overhead *and* kernel image size
        o [FEATURE] Add ZeroCopy in wrapper Rx path for drivers that support it
                I'll update drivers later on...

        o [CORRECT] fix the secondary function to send RR and frames without
                the poll bit when it detect packet losses

                <Patch from Jan Kiszka>

struct arlan_private clearly needs to be a pointer.

Fixed by David Miller, spotted by Manish Lachwani.

Fixes bugzilla bug #311.

Fixes broken node address check, and bugzilla bug #312.

Fixes bugzilla bug #323.

into kernel.bkbits.net:/home/vojtech/input

	- work around an undocumented firmware bug
	- fix handling of LED brightness

  the odd addresses for access.

	- relax requirements on devices, joydev now allows joysticks
	  without buttons to work with throttles and pedals, mousedev
	  allows a separate mouse wheel
	- remove a stray semicolon in joydev

	- Fix a bad #define for HID_QUIRK_BADPAD
	- Set absfuzz and absflat for joysticks/gamepads only
	- Add TangTop quirk

	value all the way from an interrupt handler to keyboard.c
	that can display it.

	is a real key and not just a button or something.

from drivers/char/misc.c

	- Fix a possible deadlock with 0xfe resend command (atkbd)
	- Make ->ack variables volatile (they're updated from irq)
	- Fix the GETID one/two byte command to avoid any races
	- Fix Logitech PS2++ extended packet detection
	- Use RESET_BAT on reboot to make notebooks happy

My printf manpage says:

       z      A  following  integer  conversion  corresponds to a
              size_t or ssize_t argument. (Linux libc5 has Z with
              this meaning. Don't use it.)

And the opengroup spec says

z Specifies that a following d , i , o , u , x , or X conversion specifier
  applies to a size_t or the corresponding signed integer type argument; or
  that a following n conversion specifier applies to a pointer to a signed
  integer type corresponding to a size_t argument.


yet our vsnprintf implementation has

				/* 'z' support added 23/7/1999 S.H.    */
				/* 'z' changed to 'Z' --davidm 1/25/99 */


I guess the path of least surprise is to support both.  gcc-3.2.1 doesn't
  seem to care.

The return type of sizeof() is size_t.  On many architectrues size_t is
unsigned long, and may not be printed with %d.  Use %Zu instead.

Need to reenable interrupts around the call to scsi_register(), which blocks.

An anonymous fixed mmap with CONFIG_HUGETLB_PAGE=y will dereference NULL.  We
recur into the pagefault handler with mmap_sem held and lock up.