From: Bart Samwel <bart@samwel.tk>

The attached patch is the outcome of a discussion with Nathan.

When laptop mode is active, there is no need for XFS to wake up xfsbufd (the
daemon that flushes buffers that are too old) too often.  The default is once
every second, this patch makes laptop mode do it once every 30 seconds.

From: Bart Samwel <bart@samwel.tk>

XFS now uses
	/proc/sys/fs/xfs/xfssyncd_centisecs
	/proc/sys/fs/xfs/xfsbufd_centisecs
	/proc/sys/fs/xfs/age_buffer_centisecs

Here's a patch to support these values in the laptop mode control script.

From: Bjorn Helgaas <bjorn.helgaas@hp.com>

Now that everybody has acpi_gsi_to_irq(), we can nuke the deprecated
acpi_irq_to_vector().  No references remain.

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

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

floppy_debugt.patch: better use of the debugt functions.

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

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

Adds a better audit for floppy_init().  Fixes one real bug (in calling
blk_queue_max_sectors()).

From: <bart@samwel.tk>

XFS needs `laptop_mode'.

From: Paul Mundt <lethal@linux-sh.org>

The old drivers/char sh-sci driver is no long used by anyone, both sh and
h8300 are using the drivers/serial version at this point, so we can get rid
of the old one entirely.

From: Andi Kleen <ak@muc.de>

*** Warning: "memcmp" [drivers/atm/zatm.ko] undefined!

gcc 3.4 specific problem.  This patch should fix it.  Actually it would be
better to move all these EXPORT_SYMBOLs into lib/string.c, it is silly that
each arch has to duplicate all that.

From: Christoph Hellwig <hch@lst.de>

Someone blindly added sysfs support to the driver long time ago without
understanding the implications (and if they were understood the driver
would need half a rewrite for it).  Herber Xu recently noticed the problems
this causes on unload, so let's if 0 out all that code and get the driver
working again.

It's silly that writing to /proc/sysrq-trigger does nothing if you haven't
enabled /proc/sys/kernel/sysrq.  So provide a new __handle_sysrq() which
ignores the sysrq_enabled check.

The patch also withdraws __handle_sysrq_nolock() from the kernel API.  It had
no callers.

arch/x86_64/kernel/msr.c:1:10: warning: extra tokens at end of #ident directive

From: Adrian Bunk <bunk@fs.tum.de>

drivers/scsi/aic7xxx_old.c: In function `aic7xxx_release':
drivers/scsi/aic7xxx_old.c:10971: warning: implicit declaration of function `pci_release_regions'

From: Adrian Bunk <bunk@fs.tum.de>

drivers/net/tlan.c: In function `tlan_remove_one':
drivers/net/tlan.c:449: warning: implicit declaration of function `pci_release_regions'

From: Adrian Bunk <bunk@fs.tum.de>

drivers/char/cyclades.c: In function `cy_cleanup_module':
drivers/char/cyclades.c:5638: warning: implicit declaration of function `pci_release_regions'

From: Mathieu Chouquet-Stringer <mchouque@online.fr>

This patch makes the following code work again:

#ifdef STT_REGISTER
                if (info->hdr->e_machine == EM_SPARC ||
                    info->hdr->e_machine == EM_SPARCV9) {
                        /* Ignore register directives. */
                        if (ELF_ST_TYPE(sym->st_info) == STT_REGISTER)
                                break;
                }
#endif

This portion of code is sparc specific and nothing else in modpost.c uses
e_machine meaning cross-compiling for sparc on i386 (or any little endian
machine) is the only way to experience the bug.

Without it, e_machine has the wrong value and modpost then generates a lot
of "*** Warning: \"symbol\" [filename.ko] undefined" messages.

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

From: Arjan van de Ven <arjanv@redhat.com>,
      Rusty Russell <rusty@rustcorp.com.au>

The patch below resolves the "Not Yet Implemented" print_modules() thing.
This is a really useful feature for distros; it allows us to do statistical
analysis on which modules are present how often in oopses compared to how
often they are used normally.  In addition it helps to spot candidates for
certain bugs without having to go back to the customer asking for this
information.

From: Oleg Drokin <green@linuxhacker.ru>

Thanks to Standford guys, a case where reiserfs can dereference NULL
pointer if memory allocation fail during mount was identified.

From: Alan Cox <alan@redhat.com>

The block layer checks for -EINVAL from block layer driver ioctls.  This is
wrong - ENOTTY is unknown and some drivers correctly use this.  I suspect
for an internal ioctl 2.7 should change to -ENOIOCTLCMD and bitch about old
style returns

This is conservative fix for the 2.6 case, it keeps the bogus -EINVAL to
avoid breaking stuff

From: Alan Cox <alan@redhat.com>

From: Chris Wright <chrisw@osdl.org>

Remove confusing error message when loading as secondary module, and ditch
conditional MY_NAME macro.

From: Chris Wright <chrisw@osdl.org>

The build includes capability.c when CONFIG_SECURITY=n, yet the whole file is
ifdef'd out.  Remove unnecessary build step as well as superfluous ifdefs.

From: Pavel Roskin <proski@gnu.org>

I get a compile error when I define "DEBUG" in arch/i386/pci/pci.h.  Variable
rt is not defined in sis_router_probe(), file arch/i386/pci/irq.c.

From: Greg Edwards <edwardsg@sgi.com>

On ia64, EXEC_PAGESIZE (max page size) is 65536, but the default page size is
16k.  This results in NGROUPS_PER_BLOCK in include/linux/sched.h being
calculated incorrectly when the page size is anything other than 64k.  For
example, on a 16k page size kernel, a setgroups() call with a gidsetsize of
65536 will end up walking over memory since only 1/4 of the needed pages were
allocated for the blocks[] array in the group_info struct.

Patch below calculates NGROUPS_PER_BLOCK from PAGE_SIZE instead.

From: Jan Kara <jack@ucw.cz>

Fix a null-pointer-deref oops in the quota code.

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

From: <WHarms@bfs.de>(Walter Harms)

(acked by Gerd)

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>