From: Bart Samwel <bart@samwel.tk>

The laptop mode control script incorrectly guesses XFS_HZ=1000.  This is
incorrect, since the patches that made XFS use USER_HZ went into 2.6.6 as
well.  This changes XFS_HZ to 100 and removes the warning from the doc about
checking XFS_HZ.

From: Deepak Saxena <dsaxena@plexity.net>

Following patch adds a driver for the watchdogs on the Intel IXP4xx family of
network processors (ARM).

From: Christian Groessler <cpg@aladdin.de>

Our AladdinCard also uses the oxsemi_840 chips and locks up when ecp mode
is enabled.

Fix some silliness in there.

From: Sau Dan Lee <danlee@informatik.uni-freiburg.de>

The script /etc/acpi/actions/battery.sh in the document doesn't run,
because of a wrong name.

From: Patrice Bouchand <PBouchand@cyberdeck.com>

The value written in the WDT_STOP register is not important.  As soon as
something is written, the watchdog timer stops.  But things will be cleaner
if we use the following patch.

From: Patrice Bouchand <PBouchand@cyberdeck.com>

ibwdt_ping(): we should write the current timeout's index into the holdoff
register, not the timeout's value in seconds.

From: Jens Axboe <axboe@suse.de>

Expose the blockdev's VM readahead in /sys/block/hda/queue/read_ahead_kbytes

This duplicates `blockdev --setra', but we're trying to get away from
ioctls.

It would be nice to have a readahead-setting mechanism which also allows,
say, NFS to be tuned.  But there is no common exposure point for
backing_dev_infos.  One option might be per-superblock:

	mount -o remount,read_ahead_kbytes=64

but the generic remount code also has no visibility of the backing_dev, so it
would need a new super_block operation.  One which doesn't accidentally modify
default_backing_dev_info.

From: "Randy.Dunlap" <rddunlap@osdl.org>

EFI-enabled kernels crash on non-EFI machines.  efivars_init() and
efivars_exit() need to check efi_enabled instead of assuming that the
system is using EFI.

From: Arjan van de Ven <arjanv@redhat.com>

the patch below adds a "make buildcheck" target which checks for the "uses
exit in init" bug using Keith Owen's script.  In the future other similar
sanity checks can be added to this target, but even just this one has been
quite useful already.  I use it in the kernel rpm build process for
example, and I'm sure the OSDL build testers can/want to use it too.

From: Keith Owens <kaos@ocs.com.au>

  They commented out the progress print statements, I prefer to have them
  present but no big deal.  The licence is missing.

From: Rusty Russell <rusty@rustcorp.com.au>

Kallsyms discards symbols with the same address, but these are sometimes
useful.  Skip this minor optimization and make kallsyms_lookup deal with
aliases

From: Rusty Russell <rusty@rustcorp.com.au>

The current code doesn't show the last symbol (usually _einittext) in
/proc/kallsyms.  The reason for this is subtle: s_start() returns an empty
string for position 0 (ignored by s_show()), and s_next() returns the first
symbol for position 1.

What should happen is that update_iter() for position 0 should fill in the
first symbol.  Unfortunately, the get_ksymbol_core() fills in the symbol
information, *and* updates the iterator: we have to split these functions,
which we do by making it return the length of the name offset.

Then we can call get_ksymbol_core() without moving the iterator, meaning
that we can call it at position 0 (ie.  s_start()).

From: Jens Axboe <axboe@suse.de>

Move both request_queue and io_context allocation to a slab cache.

This is mainly a space-saving exercise.  Some setups have a lot of disks
and the kmalloc rounding-up can consume significant amounts of memory.

From: Warren Togami <wtogami@redhat.com>

From: Markus Lidel <Markus.Lidel@shadowconnect.com>

The patch converts i2o_proc to seq_file, thereby fixing a bug in the
i2o_proc.c module, where the kernel panics, if you access /proc/i2o/iop0/lct
and read more then 1024 bytes of it.

From: James Simmons <jsimmons@infradead.org>

It ports this driver to sysfs api and fixes a colormap issue.

From: Fabrice Menard <menard.fabrice@wanadoo.fr>

Trying to solve my latin1 char problems with the framebuffer console, I
found that fbcon doesn't set a unicode map.

From: James Simmons <jsimmons@infradead.org>

This is the new asiliant framebuffer driver.

From: Geert Uytterhoeven <geert@linux-m68k.org>

On Sun, 25 Apr 2004, James Simmons wrote:
> This patch migrates the Vesa Framebuffer driver over to the
> framebuffer_alloc/framebuffer_release api. It also fixes the error
> handling paths. The mtrr issue that Geert brought up has been fixed.
> With your approval Geert, Ben please apply this patch.

> +	/* Set video size according to vram boot option */
> +	if (vram && vram * 1024 * 1024 != vesafb_fix.smem_len)
> +		vesafb_fix.smem_len = vram * 1024 * 1024;

The second part of the test can be removed. The rest looks OK to me.

From: James Simmons <jsimmons@infradead.org>

This patch migrates the Vesa Framebuffer driver over to the
framebuffer_alloc/framebuffer_release api.  It also fixes the error
handling paths.  The mtrr issue that Geert brought up has been fixed.

From: James Simmons <jsimmons@infradead.org>

This is attempt 2 at the virtual framebuffer patch.  It migrates the driver
to the framebuffer_release/framebuffer_alloc api.  It doesn't enable the
driver by default.

From: Jim Hague <jim.hague@acm.org>

It fixes the NULL pointer dereference and also a problem in pm2fb_blank().

From: James Simmons <jsimmons@infradead.org>

Set the default access_align variable.  This variable tells us how much data
the hardware can handle in a single read/write cycle.  For example the epson
chipset can handle only 16 bit reads and writes to the framebuffer.

From: James Simmons <jsimmons@infradead.org>

Remove extra variable. We use i instead of rc.

From: James Simmons <jsimmons@infradead.org>

This patch removes the redundent calculation of p->vrows.  This is done in
fbcon_resize.

From: James Simmons <jsimmons@infradead.org>

This make the logo handling code easier to read.  Merged the two code blocks
since they test for the exact same condition.

From: "Luiz Fernando N. Capitulino" <lcapitulino@prefeitura.sp.gov.br>

drivers/video/imsttfb.c:1089: warning: `imsttfb_load_cursor_image' defined but not used
drivers/video/imsttfb.c:1159: warning: `imstt_set_cursor' defined but not used

From: "Luiz Fernando N. Capitulino" <lcapitulino@prefeitura.sp.gov.br>

Fix this:

drivers/video/tdfxfb.c:1005: warning: `tdfxfb_cursor' defined but not used

and make the acceleration function selectable (like hgafb and tridentfb)

Geert says:

 tdfxfb_cursor() was not used before, causing a compiler warning. 
 tdfxfb_cursor() may work, but we don't know, so we didn't dare to enable it
 by default.  Now the user (he who has the hardware) can enable it, and tell
 us whether it works or not.

From: "Luiz Fernando N. Capitulino" <lcapitulino@prefeitura.sp.gov.br>

Make HGA acceleration functions selectable in kernel config, fix these
warnings:

drivers/video/hgafb.c:452: warning: `hgafb_fillrect' defined but not used
drivers/video/hgafb.c:472: warning: `hgafb_copyarea' defined but not used
drivers/video/hgafb.c:502: warning: `hgafb_imageblit' defined but not used

From: "Luiz Fernando N. Capitulino" <lcapitulino@prefeitura.sp.gov.br>

Speaking with frame buffer people, we agree with this patch to fix the
warning:

drivers/video/tridentfb.c:455: warning: `tridentfb_fillrect' defined but not used
drivers/video/tridentfb.c:473: warning: `tridentfb_copyarea' defined but not used

From: James Simmons <jsimmons@infradead.org>

Here is a updated driver for the neomagic.

From: Benjamin Herrenschmidt <benh@kernel.crashing.org>

> My screen is still a bit garbeld after booting.
> Still like http://zodiac.dnsalias.org/images/garbage.jpg

Yes, usual boot-time x86 garbage. Well, let's imagine it's as simple
as clearing the framebuffer during boot :) Try this patch and let me
know. If that doesn't help, then the problem is definitely in fbcon.

From: <raven@themaw.net>

These are the ioctls that need to be added to the compatibility layer.

They are all esentially the same as the AUTOFS_IOC_PROTOVER in their 
requirements and so should be fine.

From: Ian Kent <raven@themaw.net>

The case where two process similtaneously trigger a mount in autofs4 can
cause multiple requests to the daemon for the same mount.  The daemon
handles this OK but it's possible an incorrect error to be returned.  For
this reason I believe it is better to change the spin lock to a semaphore
in waitq.c.  This makes the second and subsequent request wait on the q as
ther supposed to.

From: Ian Kent <raven@themaw.net>

Needed for support coming development plans.

From: Ian Kent <raven@themaw.net>

Add ioctl to find out if autofs mount can be umounted.  When the daemon
discovers this it's past the point of no return.

From: <raven@themaw.net>

Pushed changes in sys_chdir and sys_chroot into the revalidate/lookup by
using nameidata hint.

From: Ian Kent <raven@themaw.net>

a. Implement readdir and friends for directory lookup for late mounting.
   This is done largely by replacing a catch all condition in
   try_to_fill_dentry with appropriate cases.

b. Add path calc.  function in waitq.c to get extended path to return to
   daemon (for direct mounts).

c. Add revalidate calls to sys_chdir and sys_chroot so that pwd lookups
   work correctly.

d. Add ioctl to retrieve minor version for automount daemon (and me) to
   recognise module fix level.  Bumped minor version to 5.

From: Hugh Dickins <hugh@veritas.com>

  After chdir (or chroot) to non-existent directory on 2.6.5-mm5, you can no
  longer unmount filesystem holding working directory (or root).

From: <raven@themaw.net>

Patch to sync 2.6.6-rc2-mm2 with the result of my discussion with 
Christoph Hellwig.

Difference is that Christoph realised that merging may_umount_tree and
may_umount was not worth it. They are now seperate functions.

From: Ian Kent <raven@themaw.net>

This patch is the result of an e-mail discussion with Soni Maneesh.  He felt
that the use of reference counts in the expire module is unreliable (in the
presence of rcu) and suggested it should use standard VFS calls where
possible.  This has been done.  Once the boundary in autofs is reached we
have no choice but to resort using reference counts (but under the
vfsmount_lock).


After review by hch:

- renamed autofs4_may_umount to __may_umount_tree, made it static and moved
  it to namespace.c.

- added stub function may_umount_tree with description

- altered may_umount to use above stub function and added little description

- added may_umount_tree prototype to fs.h

- removed the EXPORT_SYMBOL for vfsmount_lock

- updated expire.c to suit