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

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

This fixes two buts that the glibc NPTL verification tests found, one
new and one old.

The new bug is that "offset" has been declared as an alternative in
the union, instead of as an element in the structures comprising it,
effectively eliminating it from the key: keys match which should not.

The old bug is that if futex_requeue were called with identical
key1 and key2 (sensible? tended to happen given the first bug),
it was liable to loop for a long time holding futex_lock: guard
against that, still respecting the semantics of futex_requeue.

While here, please let's also fix the get_futex_key VM_NONLINEAR
case, which was returning the 1 from get_user_pages, taken as an
error by its callers.  And save a few bytes and improve debuggability
by uninlining the top-level futex_wake, futex_requeue, futex_wait.

Noticed by Tejun Huh <tejun@aratech.co.kr>.

This patch fixes a race condition between the pcmcia socket initial
insert processing, ds.c and cardmgr.  This allowed cardmgr to believe
that a card was inserted while the card is still in the process of
resetting itself, and it therefore tried to read the CIS while it
was unavailable.

We change the meaning of SOCKET_PRESENT slightly - it now means that
a card is present _and we have completed its initialisation_.  We
introduce SOCKET_INUSE to indicate that we have a reference count
against the module.

We also take the skt_sem to prevent clients from registering while
we're handling an insert/remove/suspend/resume.

socket references are pointers, not integers.

		<Patch from Rusty Russell>
	o [FEATURE] Add module aliases to dongle drivers

		<Patch from Guennadi Liakhovetski>
	o [FEATURE] Don't leak stuff in various failure paths
	o [FEATURE] Properly initialise self->max_header_size in IrIAP

	o [CRITICA] In case of connect watchdog, drop reference to the LAP
	o [CORRECT] Prevent dumping LSAP after connect watchdog
	o [CRITICA] Prevent dumping TSAP if dumping LSAP did fail
	o [CORRECT] Only set connected bit on response if LSAP state is correct

	o [CRITICA] Fix a race condition when closing the LAP
		prevent the stack to open new LSAPs while we are killing them.

	o [FEATURE] Finish removing traces of old irtty driver

		<Patch from Jan Frey>
	o [CORRECT] Make NSC 3839x probe and init *really* work
		The new 3839x code was totally broken.
		Won't affect code for regular 38108/38338 chips.

	o [FEATURE] Finish removing traces of old module refcount stuff

into kroah.com:/home/linux/BK/gregkh-2.6

Hereby you may find my patch for a Medion digital camera along with the
/proc/bus/usb/devices output.

Original patch from oliverthered@oliverthered.com ... this
updates it:

  - usb_epnum_to_ep_desc() only looks at the active altsetting
  - docs clarified

It's possible some user mode drivers will have relied on the
previous buggy behavior, since usbfs uses this call.  The fix
will be for them to set the appropriate altsetting.

into osdl.org:/home/mochel/src/kernel/linux-2.5-core

From Randy Dunlap.

From Dominik Brodowski: 

A few missing exports -- even though the cpu_sysdev_class isn't strictly
needed now, I need it for a few ACPI-related patches I'll send out in a
minute.

into osdl.org:/home/mochel/src/kernel/linux-2.5-core

into kernel.bkbits.net:/home/mochel/linux-2.5-core

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

A recent change to the 2.6.0 kernel has changed the behavior of opening a
block device with the O_EXCL flag.  This can cause fsck.jfs to fail to
replay the journal when a file system is mounted read-only.

The JFS utilities have been fixed, and it is recommended that any users of
JFS update the utilities to version 1.1.3.

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

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

Add template for Nehemiah.

This also fixes the bug with MAP_SEM being potentially
interpreted as VM_SHARED.

This moves the mapping of PROT_* bits to VM_* bits from mmap.c to the
common header file <linux/mman.h>.  The mapping is needed for mprotect
too.

	old_decode_dev()/old_encode_dev() added where needed in other
filesystems.  Parts in different filesystems are independent, but IMO
it's not worse splitting into a dozen of half-kilobyte patches.

	nfs_fattr->rdev switched to dev_t; code that unpacks on-the-wire
attributes does explicit conversion now.

	HPFS code that uses EAs for storing i_rdev/i_mode/i_uid/i_gid
sanitized.

	Similar fix for UFS; touching device node (and they have 32bit
dev_t) ends up killing upper 16 bits, which makes for very unhappy
*BSD, since that turns /dev/ad0s1 into alias of /dev/ad0.  Again, for
now we store on-disk value in private part of inode and use it instead
of ->i_rdev in ->write_inode().

	Fix for JFS handling of device nodes; it has 32bit on-disk device
numbers, shoves them into 16bit (->i_rdev) when inode is read and writes
them back truncated when inode is written to disk.  For now (and 2.4 will
have to do the same permanently) we store the original value in private
part of inode and use it instead of ->i_rdev in ->write_inode(); mknod()
sets it at the same time as ->i_rdev.  It will become unnecessary when
dev_t becomes wider than 16 bits, but for now we need it.

	Fix for endianness bug in UDF: it writes major and minor as 32bit
host-endian and reads them as 32bit little-endian; obviously a bad idea
on big-endian boxen ;-)  Needed both for 2.4 and 2.6.

beginning of fs side work:
	* new helpers - old_valid_dev(), old_encode_dev() and old_decode_dev()
	* old_valid_dev() checks if dev_t value is OK for old filesystems
(i.e. both major and minor are below 256).
	* old_valid_dev() calls are added in ->mknod() instances that care
about dev_t values (disk-backed and network ones).
	* old_encode_dev() and old_decode_dev() convert dev_t -> u16
and u16 -> dev_t resp; currently these are no-ops, places that use current
formar (minor in bits 0--7, major in bits 8--15) will switch to these before
we widen dev_t.

	kdev_t, to_kdev_t(), etc. are gone - there is no more objects
of that type and no remaining callers of these functions.