The kbuild infrastructure in 2.5.21 uses the filename to generate a
dependency file, which is passed into gcc using -Wp,-MD,filename.
Unfortunately, the ',' in the filename is interpreted by GCC as an
argument separator for the preprocessor.  So, with a filename
foo,bar.c gcc ends up passing the three arguments "-MD", "foo" and
"bar.c" to cpp, which promptly complains.

We therefore rename these files to use an underscore instead of a
comma.

into flint.arm.linux.org.uk:/usr/src/linux-bk-2.5/linux-2.5-rmk

fs/nfs/dir.c:

   - Call nfs_renew_times() when we deliberately create a negative dentry.
     or rename a file.

fs/nfs/inode.c:
  - Ensure that we initialize NFS_MTIME_UPDATE(inode).

  - If a directory's mtime changed due to some action on our part
    (file creation/deletion/...) don't force a dcache revalidation by
    changing NFS_MTIME_UPDATE(inode).

Fourth and last part of the s/390 update. Docu stuff.

Third patch of the s/390 update. Everything from drivers/s390. This patch
contains the main bunch of changes. Major changes are: 1) the restructured
dasd driver, 2) the new tape driver, 3) the start of the common io layer
rework, 4) the gpl'ed lcs driver and 5) the gpl'ed qdio layer

Second patch of the s/390 update. Contains all the include file changes in
include/asm-{s390,s390x}.

This first patch contains the changes to arch/{s390,s390x}

resume_kernel uses CPU_IDX but never uses GET_CPU_IDX to get the index.

  This is an issue when smp and preemption are both enabled.  I also
removed the unused GET_CURRENT_CPU_IDX.

James introduced bad bug which causes NULL pointer dereference as soon
as you'll try to use secondary head because of screen_base is not
initialized (it is initialized on wrong head).

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

Mike Kravetz pointed out that the set_cpus_allowed optimization he
suggested has a small but possible race condition wherein the system
could still be operating in the context of the task but it is not
running.  On top of this, the runqueue lock can be dropped in
load_balance and thus we can race and set task->cpu at a very unpleasant
time.

My solution is to just remove the optimization.

Apparently my understanding of C brace rules was blurred and there is a
thinko in kernel/capability.c - what we want is what the indention
reflects but what we get is an unconditional return of -EINVAL.

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

Define the for_each_lock macro and start replacing ugly special for loops
with it.  Rejig the interface between sys_flock and flock_lock_file to
always pass a struct file_lock rather than a command.  Eliminate some
gotos by simplifying the logic.  Remove some redundant initialisation.

Fixes for include file cleanups

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

This removes <linux/mm.h> from <linux/vmalloc.h>.

This then goes and fixes all of the files (x86 and PPC) which relied on
implicit includes which don't happen anymore.  This also takes
<linux/kdev_t.h> out of fs/mpage.c and puts it into include/linux/bio.h
where it belongs since <linux/bio.h> references 'kdev_t' directly.

A quick summary of the of the added includes:
arch/i386/kernel/microcode.c: needs extern for num_physpages, in linux/mm.h
include/linux/spinlock.h: local_irq* is defined in <asm/system.h> but
this was never directly included.

This moves the vmalloc wrappers from <linux/vmalloc.h> into mm/vmalloc.c.

Doing this will later allow us to remove <linux/mm.h> from <linux/vmalloc.h>,
along with some other #include fixups.

This patch removes the MSNFS defines.  These locks have a wider purpose
than emulating Microsoft NFS semantics.

This patch removes the annoying and confusing `wait' argument from
many places.  The only change in behaviour is that we now yield once
when unblocking other BSD-style flocks instead of once for each lock.

This slightly improves the semantics for userspace.  Before, when we
had two tasks waiting on a lock, the first one would receive the lock.
Now, the one with the highest priority receives the lock.

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

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

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

This adds SA-1111 support for ohci-hcd and fixes usb-ohci too.

thanks to suggestions from David Brownell I modified
pwc driver to compile and work under 2.5.18.
Also it fixes mas ISO transfer sizes which could
potentionaly affect older kernels too.
With these changes it works - I'll test stability and
post results later.

This patch removes the use of urb->next in usbvideo.c and resubmits
the URB in the completion handler.

This patch removes the use of urb->next in konicawc.c and resubmits
the URB in the completion handler.

into flint.arm.linux.org.uk:/usr/src/linux-bk-2.5/linux-2.5-rmk

He has added significant content to these files.

The code in xtLog assumes that the structures xdlistlock_t and
maplock_t are the same size, as they are overlaid.  On 64-bit
machines, this was not the case.

Ensure that the xdlistlock_t is 16 bytes in length regardless of
the size of a pointer.

Thanks to Andrey Panin <pazke@orbita1.ru> for pointing these out to me.

removed a lot of bizzare polling locking logic, causing the driver to not sleep
for 2 seconds with some locks held.  This improves userspace interaction by
a few orders of magnitude :)

Implement many of the hcd cleanups that David Brownell had previously submitted.