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

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

(Christoph Hellwig)

The copy_to/from_user fixes left some variables unused, which
the compiler warned about.

into tp1.ruhr-uni-bochum.de:/home/kai/kernel/v2.5/linux-2.5.isdn

- Include dcache.h/namei.h in fs/autofs/autofs_i.h not dirhash.c
- Include list.h and spinlock.h in dcache.h
- Include list.h in mount.h and namei.h

Removed lots of unneeded #includes from the tty style drivers.

addition of #include <linux/version.h> due to removal from <linux/usb.h>

fix compile time error, due to addition of jiffies.h

Here is an updated patch for the floppy driver which got broken in
2.5.13. "read block 0 on ->revalidate()" is now implemented through
the bio interface, following a suggestion by Christoph Hellwig.

I still cannot explain why block_dev.c's ->bd_block_size change
caused data corruption, but removing that code fixes the floppy
driver and doesn't seem to cause any problems on my test box.

into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux

into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux

If our command line contains an ';', we'd only print half of
it and execute the other half - not good.

This patch removes the quicklist support and updates m68k to the recent
page table and tlb interface changes.
It also includes some smaller cleanups:
- turn "extern inline" into "static inline"
- convert some macros into inline functions

into tp1.ruhr-uni-bochum.de:/home/kai/kernel/v2.5/linux-2.5.make-built-in

Removed the use of the next field due to the change in the urb structure.

Removed the use of the next field due to the change in the urb structure.

Use the just introduced Rules.make extension to clean up 
drivers/net/*/Makefile.

New-style Makefiles have a nice way of declaring objects
which need to be built either built-in or as modules:

        obj-$(CONFIG_EEPRO100) += eepro100.o

However, handling objects in subdirectories, which need to be
built and linked is not as nice:

        subdir-$(CONFIG_E100) += e100

        ifeq ($(CONFIG_E100),y)
          obj-y += e100/built-in.o
        endif

This means we descend into the subdirectory when building
vmlinux / modules, depending on CONFIG_XXX. When we are building
vmlinux we also need to link whatever has been built in the
subdirectory, so we add it to $(obj-y) at the appropriate place
(link order is important).

Now, the extension below allows to rewrite the second case into

         obj-$(CONFIG_E100) += e100/

which looks much nicer ;-) Existing behavior is not changed, and the
only prerequisite to using the extension above is that the O_TARGET in
the subdir is named "built-in.o".

	Removes dev_unit() and messing with kdev_t in match_dev_unit()

	... is finally done.

Trivial patch update against 2.5.17:
johnpol@2ka.mipt.ru: 23) request_region check, 21-30:
  here is one more trivial check.

  So please test and apply.

  	Evgeniy Polyakov ( s0mbre )

Trivial patch update against 2.5.17:
johnpol@2ka.mipt.ru: Re: 47) request_region check, 41-50:

Trivial patch update against 2.5.17:
johnpol@2ka.mipt.ru: 21) request_region check, 21-30:
  here is one more trivial check.

  So please test and apply.

  	Evgeniy Polyakov ( s0mbre )

johnpol@2ka.mipt.ru: 18) request_region check, 11-20:
  here is one more trivial check.

  So please test and apply.

  	Evgeniy Polyakov ( s0mbre )

(Included in 2.4)
johnpol@2ka.mipt.ru: 1) request_region:
  > 	Send them one at a time.  Last time I had to write a script to
  > mail them one at a time to myself.

  Ooops, sorry... I've got a gluk...

  > Thanks!
  > Rusty.
  > --
  >   Anyone who quotes me in their sig is an idiot. -- Rusty Russell.


  	Evgeniy Polyakov ( s0mbre )

Trivial patch update against 2.5.17:
Tim Schmielau <tim@physik3.uni-rostock.de>: move jiffies from sched.h to it's own jiffies.h:
  Move 'jiffies' from sched.h to their own header.
  Then pull the sched.h dependency from 67 files that include sched.h for
  no apparent reason other than the jiffies declaration.

  Move the time_[before,after}{_eq}() macros from timer.h to jiffies.h,
  since there are *no* files using them that don't also use jiffies.

  Many more sched.h dependencies can be killed after capable(),
  request_irq(), and free_irq() are moved out of <linux/sched.h>.


  Tim Schmielau <tim@physik3.uni-rostock.de>

Trivial patch update against 2.5.17:
dipankar@in.ibm.com: smp_call_function change:
  My earlier patch fixed only i386. As per Dave Miller's suggestion,
  I have fixed smp_call_function for other smp architectures too.

  Description
  -----------
  Going by the documentation and use of _bh version of spin_lock(),
  smp_call_function() is allowed to be called from BH context,
  We can run into a deadlock with some locks if we do so.
  This because reader-writer locks can sometimes be used optimally
  by not disabling irqs while taking the reader side if only the
  reader side of the lock is taken from irq context.

        CPU #0                                CPU #1

        read_lock(&tasklist_lock)
                                         write_lock_irq(&tasklist_lock)
                                         [spins with interrupt disabled]
        [Interrupted by BH]
        smp_call_function() for BH
             handler
                                         [ doesn't take the IPI]

  So, cpu #1 doesn't take the IPI and cpu #0 spinwaits
  for the IPI handler to start, resulting in a deadlock.

  The last time I looked, I couldn't see smp_call_function() being
  called from BH context anywhere. So, there is no immediate problem.
  However it seems right to correct the documentation and also not
  disable BH while taking the call lock since it isn't necessary.
  This patch does exactly that.

  Thanks
  --
  Dipankar Sarma  <dipankar@in.ibm.com> http://lse.sourceforge.net
  Linux Technology Center, IBM Software Lab, Bangalore, India.

  smp_call_func-2.5.14-1.patch
  ----------------------------

(Included in 2.4)

Stephen Rothwell <sfr@canb.auug.org.au>: small typo in signal code for cris, mips and mips64:
  Hi Linus,

  This looks very obvious to me but I may be mistaken.

  I haven't even attempted to build this as I don't have machines
  of any of the affected archs.

  --
  Cheers,
  Stephen Rothwell                    sfr@canb.auug.org.au
  http://www.canb.auug.org.au/~sfr/

(It's ttyS in every other message in the driver).

Zwane Mwaikambo <zwane@linux.realnet.co.sz>: serial unload message:

Stephen Rothwell <sfr@canb.auug.org.au>: small typo in signal code for cris, mips and mips64:
  Hi Linus,

  This looks very obvious to me but I may be mistaken.

  I haven't even attempted to build this as I don't have machines
  of any of the affected archs.


(Included in 2.4)

Stephen Rothwell <sfr@canb.auug.org.au>: fix for sigio delivery:
  Hi Linus,

  This patch means that we keep the upper 16 bits of the si_code
  field of the siginfo structure that is delivered with and SIGIOs.
  We need this so that the code that actually copies the siginfo_t
  out to user mode knows which part of the union to copy.  We currently
  get away with out this information because we always copy at least
  two ints worth of the union, but this s an ugly hack and I would
  like to tidy it up.

  Comments?

Rusty Russell <rusty@rustcorp.com.au>: Trivial patch to remove minmax macros:
  Hi Harald,
  	The MIN & MAX etc. macros aren't used anywhere, and kernel.h
  has the new min & max anyway, which should be used.

  Cheers,
  Rusty.

(Once again, Ralf said straight to you).

Rusty Russell <rusty@rustcorp.com.au>: Trivial MIPS gt64120-pci patch to remove minmax macros:
  Also changes over to standard ALIGN macro:

(Ralf said to send this straight to you)

Rusty Russell <rusty@rustcorp.com.au>: Trivial MIPS baget patch to remove minmax macros:
  In favour of kernel.h one:

Roger Luethi <rl@hellgate.ch>: DMA-mapping.txt: sg_dma_length() -> sg_dma_len():

[UTS_MACHINE is now defined in the (generated) compile.h]

David Gibson <david@gibson.dropbear.id.au>: [TRIVIAL PATCH] Fix order of #includes in init_version.c:
  Linus, please apply.  compile.h must be #included before uts.h, or
  uts.h will define UTS_MACHINE (incorrectly) which is then redefined in
  compile.h.