From: "Paul E. McKenney" <paulmck@us.ibm.com>

The vmtruncate() function shifts down by PAGE_CACHE_SHIFT, then calls
vmtruncate_list(), which deals in terms of PAGE_SHIFT instead.  Currently,
no harm done, since PAGE_CACHE_SHIFT and PAGE_SHIFT are identical.  Some
day they might not be, hence this patch.

I also took the liberty of modifying a hand-coded "if" that seems to
optimize for files that are not mapped to instead use unlikely().

From: mikpe@csd.uu.se

Here is a patch to fix CONFIG_APM=m in 2.5.69-bk11.  My patch to have APM
restore the systenter MSRs failed to handle the modular case, which fails
with unresolved symbols.

Since suspend.o is used from both APM (module or built-in) and ACPI sleep
(built-in), I made suspend.o built-in and dependent on CONFIG_PM.

From: Oleg Drokin <green@namesys.com>

With the current 'one block at a time' algorithm, writes past the end of a
file are slow because each new file block is separately added into the tree
causing shifting of other items which is CPU expensive.

With this new implementation if you write into file with big enough chunks,
it uses half as much CPU.  Also this version is more SMP friendly than the
current one.

There are some known-bad applications that break with this patch (ie.  start
to work very slow or even hang).

This is because the filesystem returns a large value in the stat.st_blocksize
hint (128k instead of 4k).  This tickles a small number of application bugs.
One is KDE's kmail 3.04 (fixed by upgrading to 3.1+) and the other is
sleepycat's database from before 1997.

If you hit a slowdown problem that you believe is related to the increased
"recommended i/o size" value, try to mount your fs with nolargeio=1 mount
option (remount should work too).

This patch exports block_commit_write(), generic_osync_inode() and
remove_suid() to modules.

I've had these reiserfs patches in -mm for many months.  We've been
undecided because they trigger bugs in a couple of apps.  But those apps
are now fixed, so it's best to get these speedups in.


From: Oleg Drokin <green@namesys.com>

This patch allows insertion of more than one "indirect" block pointer into
the tree in reiserfs.  (with all the necessary balancing code changes).
The first user of that feature is hole-creation code that is now ~1000
times more cpu-efficient for the case of large holes.

Apparently boomerang_interrupt() is generating lots of "nobody cared"
warnings - one per packet it seems.  Frankly, I don't have a clue why.

These are ancient cards and the driver is otherwise stable, so just
change it to return IRQ_HANDLED and move on...

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