into samba.org:/home/paulus/kernel/for-linus-ppc

into samba.org:/home/paulus/kernel/for-linus-ppc

The major changes here are:

(1) Combine the pmac and chrp directories into a single
`openfirmware' directory, since both use Open Firmware and the code
was very similar.

(2) Move the Open Firmware interfaces out to a `of1275' directory
and put them in separate files so we only include the ones we need.
This work is due to Leigh Brown.

(3) On PReP and embedded, get the memory size from the memory
controller.  Don't try to ask Open Firmware even on PRePs which
have it.

into samba.org:/home/paulus/kernel/for-linus-ppc

Art Haas did these.

cyclades.c doesn't compile cleanly: the problem is that older -dj
patches contained patches to both cyclades.c and cyclades.h but only the
former one went into your tree.  This syncs up the header file too.

  Here's a resend of C99 patches for the files in fs.

The old form of designated initializers are obsolete: we need to
replace them with the ISO C forms before 2.6.  Gcc has always supported
both forms anyway.

  I suck.  Lvalues continue to haunt me.  This works for me.

  BTW, I prefer to have bug reports cc'd to linux-kernel, so the
  results are archived.  Plus, public humiliation is good for the
  soul.

  This is a trivial patch already applied in the -ac tree for the 2.4.19 kernel.
  Patch for i2c-philips-par.c free() the memory in the case of problems loading
  the adapter.

   <linux/smp_lock.h> has the normal idempotent construction.

   The attached file removes the second #include.

  Here's a C99 designated initializer patch for fs/freevxfs. The
  patch is against 2.5.35.

into home.transmeta.com:/home/torvalds/v2.5/linux

Display the total slab memory in /proc/meminfo.  Handy while we play
with the slab pruning code.

This info is also available via /proc/slabinfo, but I think this
convenience is worth the extra few lines.

Patch from Christoph Hellwig.

Move the buffer_head-based IO functions out of ll_rw_blk.c and into
fs/buffer.c.  So the buffer IO functions are all in buffer.c, and
ll_rw_blk.c knows nothing about buffer_heads.

This patch has been acked by Jens.

From Anton Altaparmakov

The below bk patch against your current bk repository adds an export
for fs/buffer.c::unmap_underlying_metadata() to modules.

It is required to make ntfs compile as a module in the current kernel.

Note that NTFS doesn't currently dirty bufferheads of the underlying
blockdevice and as such could probably live without calling
unmap_underlying_metadata() but as soon as we enable writing to
compressed files it will do so and considering some of the
infrastructure code is already present I would rather not rip it out
now.

Patch by Christoph Hellwig.

This patch is cleanup of mmap.c with the side-effect of making the lock
order of mapping->i_shared_lock and mm->page_table_lock consistant.

__remove_shared_vm_struct is merged into its only caller,
remove_shared_vm_struct, which now also does the job of
{lock,unlock}_vma_mappings itself, to avoid duplicate checks.

Similarly, vma_link is updated to take and release i_shared_lock
itself, fixing the lock order.  split_vma is updated to use
insert_vm_struct instead of using __insert_vm_struct and taking
page_table_lock and i_shared_lock itself (wrongly).  __insert_vm_struct
is removed as it is unused now.

Patch from Christoph Hellwig.  250 lines of code go away.

The three syscalls madvice/mlock/mprotect all change attributes of
memory regions.  These attributes are stored in vm_area_structs (VMAs).

The current code for those syscalls does this by having four
subroutines each, for changing a whole VMA, one for just setting new
flags if a full VMA is affected, one that creates a new VMA in the
right part of the old one and sets the flags there, one for the left
part, and one that splits of both the left and the right part and sets
the new flags in the middle.

This patch makes those routines create new VMAs on the left and on te
right hand first and then always setting the flags in the old VMA.
Together with using a library function (split_vma) to to the split this
simplies the code and makes it more readable.  As a side affect it
fixes some VM accounting bugs observed by Hugh Dickins.

Patch from Christoph Hellwig moves the madvise implementation out of
filemap.c and into its own .c file.  No other changes are made.

into home.transmeta.com:/home/torvalds/v2.5/linux

into home.transmeta.com:/home/torvalds/v2.5/linux

Andrew removed a flush_dcache_page in his kmap_atomic generic_file_*
changes.

Doing that sort of corrupts data on some platforms.

into home.transmeta.com:/home/torvalds/v2.5/linux

Now that all archs use the same way to generate the link script, we can
handle it from the common top-level Makefile instead of the individual
arch/*/Makefile's.

Untested, but at least it should show how to adapt the mips arch.

Untested, but at least it should show how to adapt the cris arch.

This is an untested attempt to convert ARM to preprocessing vmlinux.lds.S
instead of running sed on it - This probably allows for further cleanup,
but I'll leave that to _rmk_.

For consistency reasons, generate 

	arch/$(ARCH)/vmlinux.lds.s

from 

 	arch/$(ARCH)/vmlinux.lds.S

on all archs, even those which do not need preprocessing (yet).

Sam Ravnborg:

Yep, "if_changed_dep" uses fixdep, so a dependency to scripts is needed.
Added echo_target as well, so the result file is printed as well.

into osdl.org:/home/mochel/src/kernel/devel/linux-2.5-cls

into home.transmeta.com:/home/torvalds/v2.5/linux

remove unused pdc202xx.h