From: Chris Mason <mason@suse.com>

unlock_buffer() needs a barrier before the waitqueue_active() optimisation.

We need to subtract the number of freed slab pages from the number of pages
to free, not add it.

From: Marc Zyngier <mzyngier@freesurf.fr>

The following patch tries to fix a small bug that crept in at some
point during 2.5.

None of my 3c592 or 3c597 would work if I didn't force media
type. Instead, it would try to probe MII, looking for a suitable
transceiver, and finaly give up, because these cards really do not
have any sort of MII... :

  EISA: Probing bus 0 at Intel Corp. 82375EB
  EISA: Mainboard DEC5000 detected.
  EISA: slot 2 : ADP0001 detected.
  EISA: slot 3 : ADP7771 detected.
  EISA: slot 4 : DPTA401 detected.
  EISA: slot 5 : TCM5920 detected.
  3c59x: Donald Becker and others. www.scyld.com/network/vortex.html
  00:05: 3Com EISA 3c592 EISA 10Mbps Demon/Vortex at 0x5000. Vers LK1.1.19
    ***WARNING*** No MII transceivers found!
  EISA: Detected 4 cards.

With the enclosed patch, it just works, at least on my setup (3c592 on
Alpha, and 3c597 on x86). I haven't been able to test it didn't break
cards with MII, because I do not have such cards in my test boxes...

The patch also removes two useless EISA-only #define I introduced some
time ago.

From: Greg KH <greg@kroah.com>

Different architectures use different types for dev_t, so it is hard to
print dev_t variables out correctly.  Quite a lot of code is wrong now, and
will continue to be wrong when 64-bit dev_t is merged.

Greg's patch introduces a little wrapper function which can be used to
safely form a dev_t for printing.  I added the format_dev_t function as
well, which is needed for direct insertion in a printk statement.

Currently, all of the 3c59x power management code is disabled unless the
`enable_wol' module parameter is provided.  This was done because the PM
support was added quite late in the 2.4 cycle.

It was always intended that this conditionality be removed in 2.5.

From: Jeremy Fitzhardinge <jeremy@goop.org>

The 900MHz Pentium M has two spaces before the frequency:
"Intel(R) Pentium(R) M processor  900MHz"

This patch adds a 2nd CPU macro (_CPU) which also takes the
stringified speed so that extra spacing can be added.

We get a bug report about once per month wherein find_get_block_slow() spits
an error message.  For some reason we have buffers against a blockdev page
which have the incorrect b_size.

Probably, an earlier set_blcoksize() failed to invalidate all the apges for
some reason.  I just don't know.

The patch adds a bit of extra debug info to aid in diagnosing this.

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

The original pgd/pmd slabification patches had a critical bug on
non-PAE where both modifications of pgd entries to remove pagetables
attached for non-PSE mappings back to a PSE state and modifications of
pgd entries to attach pagetables to bring PSE mappings into a non-PSE
state were not propagated to cached pgd's. PAE was immune to it owing
to the shared kernel pmd.

The following patch vs. 2.5.69 restores the slabification done to cache
preconstructed pagetables with the proper propagation of conversions
to and from PSE mappings to cached pgd's for the non-PAE case.

This is an optimization to reduce the bitblitting overhead for spawning
small tasks (for larger ones, bottom-level pagetable copies dominate)
primarily on non-PAE; the PAE code change is largely to remove #ifdefs
and to treat the two cases uniformly, though some positive but small
performance improvement has been observed for PAE in one of mbligh's
posts. The non-PAE performance improvement has been observed on a box
running a script-heavy end-user workload as a large long-term profile
hit count reduction for pgd_alloc() and relatives thereof.

I would very much appreciate outside testers. Even though I've been
able to verify this boots and runs properly and survives several cycles
of restarting X on my non-PAE Thinkpad T21, that environment has never
been able to reproduce the bug. Those with the proper graphics hardware
to prod the affected codepaths into action are the ones best suited to
verify proper functionality. There is also some locking introduced; if
some performance verification on non-PAE SMP i386 targets (my SMP
targets unfortunately all require PAE due to arch code dependencies)
that also have the proper hardware could be done, that would help
determine whether alternative locking schemes that competed against
the one shown here are preferable (in particular, the ticket-based
scheme mentioned in the comments).

From Stephen Smalley <sds@epoch.ncsc.mil>

This has been in -mm for a few weeks and James Morris has been
regression testing each release.

- remove unneeded loglevel manipulation in journal_dirty_metadata()

- remove crud which was acidentally added to blkmtd.c

- remove unused vars in mxser.c (Vinay K Nallamothu <vinay-rc@naturesoft.net>)

- PF_LESS_THROTTLE was using the wrong bit (Joe Korty <joe.korty@ccur.com>)

- unused var in cyclades.c ("Krishnakumar. R" <krishnakumar@naturesoft.net>)

This patch notes that users should get nfs-utils 1.0.5 (1.0.4 had a
memory usage bug), and tells them where to get it.

Here's another MIPS update.  The patch is huge because it completly
folds mips64 into mips, thereby eleminating 41010 lines of code.

Only bug fixes and making it compile again and a few minor features.
Also one security fix that got lost earlier

- Document boot options
- Better cpu local data
- Emulate FIOQSIZE
- Fix return value of 32bit ipccall
- Various minor style fixes
- Save some memory in apic tables
- Merge with 2.6.0test2/i386
- Readd ioport fix
- Sort exception tables at boot time
- Add local.h
- Fix for_each_cpu on UP
- Add utimes and tgkill system calls for 64bit
- Update defconfig

devfs_mk_cdev now only takes 3 parameters (dev_t, umode_t, fmt..), so
update this driver to the new API.

Time to update my CREDITS entry...

This patch updates the PowerMac cpufreq driver so that
it builds & works in current 2.6

This adds proper registration of CPUs on ppc32, without this, accesses
to cpufreq will oops.

[V4L] - set debug verbosity to 0 for both Hexium drivers
[V4L] - declare all local functions and variables static

[DVB] - Hand off all processing of urb data to a tasklet

[DVB] - correctly read MAC from eeprom on Technotrend and KNC1 cards

[DVB] - show i2c read errors only for registered frontends

[DVB] - if there are multiple adapters, bend the tuning frequency only if the adapters differ

[V4L] - make sure saa7146 module gets build for Hexium drivers
[V4L] - make Hexium drivers depend on the i2c layer
[DVB] - fix typo which prevented the mt312 driver from being build (obi <=> obj)

OSF partitions are mostly found on alpha machines.  It's been reported
that the partition numbering changed between 2.4 and 2.6.

This makes 2.6 use the 2.4 numbering scheme.

build error and warning fix
blkdev location cleanup
typo fix

H8S architecture support
signal handling problem fix
gcc-3.3 support
vfork/clone return value fix
added show_stack
build error and warning fix
blkdev location cleanup

used common header files
build error and warning fix
add include/asm-h8300/local.h and include/asm-h8300/sections.h

interrupt management update
target-support file update
gcc-3.3 support
blkdev location cleanup

config script fix
defconfig update
Makefile update
add H8S archtecture support

From Lou Langholtz <ldl@aros.net>

The queue_wait field of struct request_queue is not used anymore, and
this gets rid of it.

From Lou Langholtz <ldl@aros.net>

This fixes the behavior of blk_start_queue() so that request queues
really do start up again after blk_start_queue() is called (on queues
that were previously stopped via blk_stop_queue).

Fix a typo during last module refcounting fix.

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

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

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

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

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