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

Compile fix: add missing #include <linux/init.h>

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

Compile fixes for the Moxa serial drivers:

- Add missing #include <linux/init.h>

- Kill warning if CONFIG_PCI is not set

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

Fix compilation if CONFIG_PCI is not set

From: Junio C Hamano <junkio@cox.net>

Compiling neofb.c without MTRR results in two "unused variable" warnings.

We're using a 4-order allocation in there and it can fail.  Change it to just
keep reclaiming memory until something gives.

From: Martin Hicks <mort@wildopensource.com>

This patch removes kmalloc_percpu_init() from include/linux/percpu.h

It is unused and doesn't seem to be required.

From: Patrick Mansfield <patmans@us.ibm.com>

On NUMAQ, any module which calls __alloc_pages() needs cpu_2_node() (via
cpu_to_node()).

This patch exports cpu_2_node.

From: James Morris <jmorris@redhat.com>

It seems to me that this dentry assignment in open_namei is not needed per
the patch below.  On this path, dentry is not referenced.

From: Jens Axboe <axboe@suse.de>

2.6 imposes a 64 frame limit where 2.4 does not (just relies on kmalloc()
failing and limiting frames from that).  That breaks at least on guys app.
With MSF adressing, it's much simpler to be able to ask for a full second
at the time, so I think we should just allow that.  So bump the limit from
64 to CD_FRAMES (which is 75).

From: Jake Moilanen <moilanen@austin.ibm.com>

On a ppc64 logically partitioned system, there can be a setup where function
0 of a PCI-PCI bridge is assigned to one partition and (for example) function
2 is assigned to a second partition.  On the second partition, it would
appear that function 0 does not exist, but function 2 does.  If all the
functions are not scanned, everything under function 2 would not be detected.

This patch allows devices that don't respond to function 0, but do respond to
other functions to be marked with a quirk and have all of their functions
scanned.

From: Jack Steiner <steiner@sgi.com>

The cpu_vm_mask use to be close to the mmu_context_t field in the mm
struct.  Recently some large members were added between "cpu_vm_mask" and
"context".  I suspect that was an oversight.

Here is a patch that puts the fields close together.  This makes it likely
that both fields are in the same cache line.  Since both fields are likely
to be updated at the same time, this may improve performance.

From: Matt Mackall <mpm@selenic.com>

I've been fiddling with cleaning up some old code here and suggest the
following to make Lindent match actual practice more closely. This does:

a) (no -psl)

void *foo(void)
{

 instead of

void *
foo(void) {

b) (no -bs) "sizeof(foo)" rather than "sizeof (foo)"

c) (-ncs) "(void *)foo" rather than "(void *) foo"

From: Louis Zhuang <louis_zhuang@linux.co.intel.com>

enable  fast  symbol lookup via an inverted index.

From: Dave Olien <dmo@osdl.org>

acked by npiggin.

From: Nikita Danilov <Nikita@Namesys.COM>

shrink_list() checks PageSwapCache() before calling add_to_swap(), this
means that anonymous page that is going to be added to the swap right
now these checks return false and:

 (*) it will be unaccounted for in nr_mapped, and

 (*) it won't be written to the swap if gfp_flags include __GFP_IO but
     not __GFP_FS.

(Both will happen only on the next round of scanning.)

Patch below just moves may_enter_fs initialization down. I am not sure
about (*nr_mapped) increase though.

From: Andi Kleen <ak@suse.de>

When the user gave an address hint in mmap use it as starting point for the
search for !MAP_FIXED.

Currently it is only checked directly and when already used the free area
cache is used as starting point.  With this change you can use mmap(4096,
....) to e.g.  get the lowest free address in your address space, which is
sometimes useful.  For example on x86-64 glibc wants to preferably allocate
thread local data in the first 4GB but use higher addresses when this is
not possible.

This can be a bit more costly in CPU time because it may have to skip over
more VMAs, but gives better semantics for most cases.  Most programs pass
NULL as hint anyways so it won't make any difference for them.

I did it for the generic mmap and for x86-64 for now.  Also minor white
space fixes for x86-64.

From: Jes Sorensen <jes@trained-monkey.org>

nr_free_pages() is expensive, especially on large SMP machines.  The patch
changes the memory overcommit code so that it only calls nr_free_pages() is
we're about to fail the allocation attempt.

From: Jens Axboe <axboe@suse.de>

It's from Pascal Schmidt and adds write protect handling to ide-cd along
with support for non-2kb block sizes.

From: Maneesh Soni <maneesh@in.ibm.com>

The patch fixes locking in proc_check_root().  It brings is_subdir() call
under vfsmount_lock.  Holding vfsmount_lock will ensure mnt_mountpoint
dentry is intact and the dentry does not go away while it is being checked
in is_subdir().

From: Maneesh Soni <maneesh@in.ibm.com>

o The following patch fixes is_subdir() races with d_move. Due to concurrent
  d_move, in is_subdir() we can end up accessing freed d_parent pointer in
  case of pre-emptible kernel. To avoid this we can use rcu_read_lock() and
  rcu_read_unlock().

o This also fixes the seqlock uses in is_subdir() as we need to restart the
  the inner loop with the origianl new_dentry passed to the routine in case
  of any rename occured while we are traversing d_parent links.

From: Andrew Zabolotny <zap@homelink.ru>

ac97_unregister_driver() is nulling out the ->driver field for all codecs.
It should only null the codecs which are using this driver.

From: Pratik Solanki <pratik.solanki@timesys.com>

I came across this C standards issue while cross-compiling the Linux kernel
with gcc on Solaris.  The file gen_crc32table.c uses the non-standard type
u_int32_t.  It's possible that the host machine's sys/types.h does not
define u_int32_t.  The attached patch replaces u_int32_t with the POSIX
standard uint32_t and includes POSIX inttypes.h instead of sys/types.h.

From: Bjorn Helgaas <bjorn.helgaas@hp.com>
      Anders Gustafsson <andersg@0x63.nu>
      Roman Zippel <zippel@linux-m68k.org>

This patch fixes menuconfig so it can display help text for individual
choice group config entries.

Previously it would only display the help text attached to the "choice"
item.  There was no way to display the help attached to individual config
entries inside the choice group.  Typically, the "choice" item has no help
text, and all the useful help is attached to the individual entries, so
this was a bit of a problem.

From: George Anzinger <george@mvista.com>,
      Petri Kaukasoina <kaukasoi@elektroni.ee.tut.fi>

btime in /proc/stat does not stay constant but decreases at a rate of 15
secs/day, because we're assuming that HZ is exactly 100.  Use the correct
adjustments to fix that up.

From: George Anzinger <george@mvista.com>

The time conversion code is erroring on the side of a bit too small.  The
attached patch forces any error to be on the high side.  The current code will
convert 1 nanosecond to zero jiffies (standard says that should be 1).  It also
is around 1 nanosecond late on each roll to the next jiffie.

I have done some error checks with this patch applied and get the following
errors in PPB ( Parts Per Billion):

HZ     nano sec conversion     microsecond conversion
1000    315                      45
1024    227                      40
100     28                       317

In all cases the error is on the high side, which means that the final shift
will, most likely, eliminate the error bits.

From: GOTO Masanori <gotom@debian.or.jp>

Teach ufs_fill_super() to honour the `silent' parameter.

reiserfs places its superblock in weird places which can result in false
positives and various printks when other filesystems probe a resierfs
filesystem.

From: Mike Waychison <Michael.Waychison@Sun.COM>

The attached patch ensures that we grab vfsmount_lock when grabbing a
reference to mnt_parent in follow_up and follow_dotdot.

We also don't need to access ->mnt_parent in follow_mount and
__follow_down to mntput because we already the parent pointer on the stack.

From: Mike Waychison <Michael.Waychison@Sun.COM>

- protect vfsmount->mnt_parent by taking vfsmount_lock in __d_path

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

Patch inserts missing iounmap() on error.

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

From: Leann Ogasawara <ogasawara@osdl.org>

Patch inserts missing iounmap's on error and also removes unnecessary
iounmap's.

From: Marcus Alanen <maalanen@ra.abo.fi>

The copy_tree() function can return NULL, so this checks for it.

From: Philippe Elie <phil.el@wanadoo.fr>

Unless I miss something this look like a typo, one user reported to get
error from the daemon: 'Unknown event for counter 1' (alpha ev6) and the
behavior was better but not completly sane after trying this patch: he get
spurious event for counter 1 when enabling only counter 0 but rarely now.
No alpha box to test this.

From: Philippe Elie <phil.el@wanadoo.fr>

In a ring buffer controlled by a read and write positions we can't use
buffer_size but only buffer_size - 1 entry, the last free entry act as a
guard to avoid write pos overrun.  This bug was hidden because the writer,
oprofile_add_sample(), request one more entry than really needed.

From: Sam Ravnborg <sam@ravnborg.org>,
      Ben Collins <bcollins@debian.org>

Fix up the console makefiles and logo generation.

1) To make output look like the rest of the kernel build.

2) To avoid make utilising chained rules, and therefore issuing a 'rm
   drivers/video/logo/linux_logo.c ...' during the build.

I have previously submitted a few patches for logo/Makefile, but this is the
first one that actually address the problems I have seen in a proper way.

And no, I did not like such a simple thing to look that complicated, the
other option was to list too many files or to use other types of kbuild/make
magic.

From: "Randy.Dunlap" <rddunlap@osdl.org>,
      "Maciej Soltysiak" <solt@dns.toxicfilms.tv>

C99 initializers for linux/sound.

From: "Randy.Dunlap" <rddunlap@osdl.org>,
      Domen Puncer <domen@coderock.org>

From: "Randy.Dunlap" <rddunlap@osdl.org>,
      Domen Puncer <domen@coderock.org>

Noone tested that code to see if it really works?

From: Jamie Lokier <jamie@shareable.org>

One of the tests in unqueue_me() is redundant.  If we acquire the spinlock,
the futex must be queued.

From: James Morris <jmorris@redhat.com>

Here's a patch which zeroes the last byte of the mount option data copied
from userspace during mount(2).

For filesystems which parse mount options as strings (the majority), lack
of a zero terminator could cause the page to be overrun.  The source code
comments specify that the maximum size of the mount data is PAGE_SIZE-1, so
this patch will not affect any valid binary-formatted mount data.