From: William Lee Irwin III <wli@holomorphy.com>

I was just looking over this and noticed 2.4.x makes u64 dma_addr_t
conditional on CONFIG_HIGHMEM64G where 2.5.x uses CONFIG_HIGHMEM.  It's
clearly not necessary on CONFIG_HIGHMEM4G, hence this obvious patch.

 - generic_file_open() comment fix (Bill Irwin)

 - kerneldoc fix in truncate.c (Aniruddha M Marathe)

 - remove truncate debug check.

 - page_lock comment fix (Robert Love)

 - remove unused device mapper label.

 - 3c509 docco fix ("Mark Tranchant" <mark@tranchant.freeserve.co.uk>)

--

 Documentation/networking/3c509.txt |    2 +-
 drivers/md/dm-ioctl.c              |    1 -
 fs/open.c                          |    2 +-
 include/linux/fs.h                 |    2 +-
 mm/truncate.c                      |    8 +++-----
 5 files changed, 6 insertions(+), 9 deletions(-)

Fix an accidentally negated comparison.

From: Martin Bligh

Change the defn of cpu_callout_map for voyager to volatile to match other
stuff.

From: Martin Bligh

Add cpu_mask_to_apicid to generic arch to fit with Keith's changes.

From: john stultz <johnstul@us.ibm.com>

This patch fixes a circular dependency (a function in mach_apic.h requires
hard_smp_processor_id() and hard_smp_processor_id() requires macros from
mach_apic.h) that has been in the subarch code for a bit, but was hacked
around with some #ifdefs.

With the inclusion of the generic-subarch the hack was dropped and bigsmp
and summit promptly broke.  So this makes things compile again.

It is incorrectly precalculating the string's length.

This is what a lot of the callers really wanted.

Reiserfs emits a warning about strchr being defined but not used.  I
finally tracked down the reason for this.  gcc - when seeing strstr(x,
"%") recognized that the second parameter is a char, and therefore uses
strchr instead of strstr.  The workaround to avoid the warning is to
replace the call to strstr with strchr - which is OK.

This hides the warning, and brings us down to 6 warnings for a make
defconfig bzImage.

This always set ->sense for blk_pc_requests(), even if the actual user
doesn't care about the sense results.  This is a lot nicer than then
having to have conditional checks for it all over the place in the low-
level drivers.

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

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

codepath.

The bug was that the NMI stack fixup triggered even if the
debug exception had _not_ happened on the exact sysenter
entrypoint. The new version should be more robust.

into nuts.ninka.net:/home/davem/src/BK/net-2.5

Also use kernel-doc for struct cycx_hw

. remove whitespaces
. use tabs instead of sequences of 8 spaces
. remove the wrappers for write{b,w} & friends
. align case entries with corresponding switch statement

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

into nuts.ninka.net:/home/davem/src/BK/net-2.5

into nuts.ninka.net:/home/davem/src/BK/net-2.5

into nuts.ninka.net:/home/davem/src/BK/net-2.5

into nuts.ninka.net:/home/davem/src/BK/net-2.5