Signed-off-by: Christian Meder <chris@onestepahead.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

sched.h typo fix from Christian Meder.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

Add a warning that "idle=poll" is a performance hit on hyperthreaded CPUs.

From: Bart Samwel <bart@samwel.tk>

Currently the ACPI binding script in the Laptop Mode doc always says "20
seconds" and "2 hours" for the timeouts it uses.  This is incorrect if the
user changed the config values, so we print something more general.

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

PMD_SIZE is not a compile-time constant on sparc.  Use min() in there so
that the cluster size will be evaluated at runtime if the architecture
insists on doing that.

It's initialising slot 24 in two places.  Gerd Knorr <kraxel@bytesex.org> says
"This one should be 23.".

From: Andi Kleen <ak@muc.de>

The 32bit generic nops added with a previous patch to x86-64 alternative()
are not completely 64bit clean.  This caused crashes in some cases.  This
patch reverts this broken change.

From: David Sanders <linux@sandersweb.net>

Patch adds support for the emulated Soundblaster 16 in Virtual PC 2004.

From: FabF <fabian.frederick@skynet.be>

Signed-off-by: Christian Meder <chris@onestepahead.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

The following obviously correct patch from Christian Meder simplifies the
DELTA() define.

From: Andi Kleen <ak@muc.de>

Really enable the NUMA API system calls on x86-64.

Signed-off-by: Hugh Dickins <hugh@veritas.com>

sys_remap_file_pages is declared as asmlinkage in mm/fremap.c, but is the one
syscall declared without asmlinkage in include/linux/syscalls.h.

Signed-off-by: Hugh Dickins <hugh@veritas.com>

It seems eccentric to implement MAP_POPULATE only on PROT_NONE mappings:
do_mmap_pgoff is passing down prot, then sys_remap_file_pages verifies it's
not set.  I guess that's an oversight from when we realized that the prot arg
to sys_remap_file_pages was misdesigned.

There's another oddity whose heritage is harder for me to understand, so
please let me leave it to you: sys_remap_file_pages is declared as asmlinkage
in mm/fremap.c, but is the one syscall declared without asmlinkage in
include/linux/syscalls.h.

From: Jeff Mahoney <jeffm@suse.com>

The following is a patch to fix a locking problem in ACL/xattr code. It
manifests when a user attempts to set an xattr on a file which they do
not own, and on which an ACL is applied.

What happens is this:
reiserfs_setxattr [write lock inode xattr sem]
  ->xattr_set
    -> lookup
       -> __reiserfs_permission [if conditions above are met, and need_lock=
 is
          unset, read lock inode xattr sem] *lockup*

Since we already keep track of when to lock during permission calls, the
fix is simple: just make the locking conditional as it was before.

Credits to Andreas Gruenbacher <agruen@suse.de>

From: Ben Fennema <bfennema@falcon.csc.calpoly.edu>

The problem occured when files were stored on the disc in 16-bit per
character mode when all the upper bits were 0.  The fs module
converted the file name given by the user to a 8-bit per character
string to compare, so the comparison always failed.

The patch maps the file from disc into the current locale and then
compares it directly to the file name given by the user.

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

This one snuck through - Jeff prefers the bk:// addresses.

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

This information seems to be quite outdated.

From: Yoshinori Sato <ysato@users.sourceforge.jp>

- module support fix

From: Yoshinori Sato <ysato@users.sourceforge.jp>

- fix relocation
- define SYMBOL_PREFIX

From: Yury Umanets <torque@ukrpost.net>

Thanks to smatch I have found few memory leaks and other related issues.

From: Michael Hunold <hunold@convergence.de>

The attached patch changes my "Multimedia eXtension Board" (MXB)
Video4Linux-driver to use the standard saa7111 video decoder infrastructure
(to which I recently submitted changes through Ronald Bultje) instead of
some home-brewn direct-access stuff.

Nothing serious, but it removes code duplication and makes the code use the
video decoder api.

From: <viro@parcelfarce.linux.theplanet.co.uk>

init/initramfs.c::do_skip() has an off-by-one that leads to unpacking
failures for some gzipped cpio images.  We have

static int __init do_skip(void)
{
        if (this_header + count <= next_header) {
                eat(count);
                return 1;
        } else {
                eat(next_header - this_header);
                state = next_state;
                return 0;
        }
}

and that <= should actually be <.  It almost never matters, since if we hit
the boundary case (header ending exactly on the gunzip window end) the
current variant will simply end up doing extra call of do_skip() when we
get to the next window and that will finish the work (assign state).  The
only exception is when we hit that in the last window.  That is, if there's
nothing after the final header (trailer).  Then we miss the final state
transition (Skip -> Reset) and get "junk in archive" panic.  Normally
cpio(1) pads the image to multiple of 512, so we actually have a bunch of
zeroes after the trailer.  And that almost always saves our butts - trailer
is followed by zeroes, so we get to Reset state just fine.

So we never see that on small in-kernel image (it's less than 512 bytes, so
it gets a lot of padding) and we almost never see that on external ones
(1:127 odds of hitting the bug).

From: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>

- use fat_fs_panic() instead of BUG() if it read a corrupted inode.

- add missing "\n".

From: Pavel Machek <pavel@suse.cz>

swsusp contained rather nasty bug where it killed machine when intel-agp or
anything else split kernel 4MB mapping.  Herbert Xu diagnosed this.  Fixed by
switching to "known good" mapping for during suspend/resume.

From: Bart Samwel <bart@samwel.tk>

We don't want to use "cut" in the laptop mode control script, because that
is in /usr.  This patch is from Jasper Spaans.

Signed-off-by: Petr Vandrovec <vandrove@vc.cvut.cz>

Some people expressed interest in having possibility to set CRTC <->
outputs mapping at boot time, without having to use 'matroxset' later after
kernel boots.

This patch adds option 'video=matroxfb:outputs:XYZ', where X sets which
CRTC will connect to primary output, Y sets secondary output and Z sets DVI
output.

In addition to that I also added missing memset() into maven, which was
broken since i2c was kobjectified.

From: Andi Kleen <ak@muc.de>

When start_transaction() detects an error it already calls ext3_std_error. 
No need to do it again in the caller.

From: Christoph Hellwig <hch@lst.de>

From: Debian kernel package, author probably Herbert Xu

Include asm/io.h and asm/scatterlist.h in include/asm-i386/dma-mapping.h to
make it useable standalone, which is already true for most architectures.

From: "Sergey S. Kostyliov" <rathamahata@php4.ru>

Fix a typo in an error message.

From: Christoph Hellwig <hch@lst.de>

From: Debian kernel package, author probably Herbert Xu

From: Christoph Hellwig <hch@lst.de>

* Include linux/root_dev.h for ROOT_DEV in drivers/mtd/maps/uclinux.c

From: Christoph Hellwig <hch@lst.de>

again needed by most non-x86 arches.

 * Include linux/init.h for __init

From: Christoph Hellwig <hch@lst.de>

From: Mattia Monga via Debian kernel package

Add support for nm256xl+ in sound/oss/nm256_audio.c

From: Christoph Hellwig <hch@lst.de>

From: Debian kernel package, author is probably Herbert Xu

 * Do not get seqno since we will not use it in fs/isofs/inode.c

From: Christoph Hellwig <hch@lst.de>

From: Debian kernel package, author probably Herbert Xu.

 * Fixed bashism in Makefile

From: "Sergey S. Kostyliov" <rathamahata@php4.ru>

Fix nls support for character sets with character width large than 1.

From: Roman Zippel <zippel@linux-m68k.org>

Update dir ctime/mtime when adding/removing an entry.

From: Roman Zippel <zippel@linux-m68k.org>

When releasing a page don't try to release not existing nodes.

From: Roman Zippel <zippel@linux-m68k.org>

If the inserting of the file or dir record failed, remove the previously
inserted thread record.

From: Roman Zippel <zippel@linux-m68k.org>

Call hfsplus_delete_inode() to delete an inode when adding it to the
filesystem failed, so superblock info is correctly updated.

From: Roman Zippel <zippel@linux-m68k.org>

Initialize d_fsdata field also for dir dentries, use hfsplus_instantiate
helper function for this.