Rusty Russell <rusty@rustcorp.com.au>: Trivial ALPHA patch to remove minmax macros:
  Change over to standard max and ALIGN macros.

Rusty Russell <rusty@rustcorp.com.au>: Finally squish those chrp_start.c warnings:
  They finally irritated me enough to patch.  2.5, should apply against 2.4.

Peter Chubb <peter@chubb.wattle.id.au>: Fix compilation warning in do_mounts.c:

  	change_floppy() is unused if you don't have the floppy device
  compiled into the kernel --- so why not #ifdef it out?

Rusty Russell <rusty@rustcorp.com.au>: 2.5.17 Warning removal for ppc:
  test_and_set_bit now expect an "unsigned long", so we want
  &spinlock->lock rather than &spinlock (even though they are
  equivalent).

  Rusty.

(Included in 2.4)
Pavel Machek <pavel@ucw.cz>: trivial: vmscan extra {}s:
  Hi!

  Extra { } look ugly, too, they are not consistant with rest of code and I introduced them :-(

(Included in 2.2)
Pavel Machek <pavel@ucw.cz>: CREDITS not sorted properly:
  Hi!

  Please apply,
  									Pavel

Dan Aloni <da-x@gmx.net>: fs_dcache.c - typo:

Christopher Yeoh <cyeoh@samba.org>: (Made -p1 compliant by rusty) SUSv2 semctl compliance:

  The semctl call with SETVAL currently does not set sempid (at the
  moment sempid is only set during a successful semop call). An
  explanation from Geoff Clare of the Open Group regarding why sempid
  should be set during the semctl call:

  "The spec isn't very clear, but there is a statement on the semget()
  page which I think justifies the assumption made by the test.  It says
  that upon creation, the data structure associated with each semaphore
  in the set is not initialised, and that the semctl() function with
  SETVAL or SETALL can be used to initialise each semaphore.

  Therefore semctl() with SETVAL has to set sempid to *something*, and
  since sempid contains the "process ID of the last operation", setting
  it to anything other than the pid of the calling process would mean
  that sempid contained misleading information.  It could be argued that
  setting it to zero would not be misleading, but zero cannot be the
  process ID of a process, and so is not a valid value for sempid anyway."

  The following patch changes semctl so when called with SETVAL
  sempid is set to the pid of the calling process:

Alexander.Riesen@synopsys.com: xconfig for tulip subsection:
  fixes broken xconfig for tulip drivers.

  P.S. Why the double quotes in comment break it?

Anton Blanchard <anton@samba.org>: Fix autofs on ppc64:

  Define autofs_wqt_t to be an int on ppc64, just like the other mixed
  32/64 bit archs do.

 - Rewritten Artop host chip driver by Vojtech Pavlik. His log entries are:

   Cleanup whitespace.

   Remove superfluous chip entries in chip table.  Remove global variables to
   allow more than one controller.  Remove other forgotten stuff.

   This is a new driver for the Artop (Acard) controllers. It's completely
   untested, as I have never seen the hardware. However, I suspect it is much
   less broken than the previous one ...

   UDMA33 controller cannot detect 80-wire cable.

 - Separate ioctl handling out from ide.c. It's big enough.

 - Move atapi_read and atapi_write to the new atapi module.  Fix the declaration
   of those functions. The data buffer did have the void * type!

 - Separate module handling code out from actual transfer handling code in to a
   new module called main.c. Slowly we are at the stage where the code indeed
   has to be organized logically and not just "sporadically" as was the case
   before.

 - Apply patch by Adam Richter for the ide-scsi.c attach method implementation.
   This particular driver is still broken due to generic SCSI layer issues.

 - Apply true modularization patch for qd65xx.c by Samuel Thibault. Here
   are his notes about it:

   Then, patch-modularize-2.[45] is a proposal for modularizing qd65xx.o. As a
   single module, one can choose to insmod it before being able to do some
   hdparm -p /dev/hd[a-d]. But one can't remove it while tuned, since selectproc
   may be needed.

   I am sorry I wasn't able to test it under 2.5 series, lacking a functionning
   kernel for my test computer, but it seemed to work perfectly under 2.4
   series, and patches are almost the same.

 - Move PCI device id's to where they belong. Patch by Vojtech Pavlik.

 - Don't use BH_Lock in ide-tape.c - somehow this driver scares me sometimes.

o Add 'tag' to request.txt doc
o Add bio design etc discussions

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

They're always the same, so no point in using function pointers.

We rather keep it simple, everything we need is in struct
capi_ctr.

The hardware driver needs to alloc mem anyway, and now can
fill in fields before registering with the CAPI layer.

Basically the same way struct net_device is handled.

In case a driver really wants to put some useful info into
/proc/capi/driver, it could create the proc entry directly.

o Move /proc handling to a file of its own 
o Use <linux/seq_file.h>

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

	- Remove SCO compatibility trick in rio_fw_ioctl, i.e., riocontrol was returning non
          negative errors, now it is, so no need to turn it negative in rio_fw_ioctl. Thanks
          to Rogier Wolff for pointing this out.

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

So I missed at least one file which still relied on implicitly exporting
symbols. Now fixed.

The following allows the ramdisk to work on 2.5.18; maybe we need a
comment in do_open() ?

If d_splice_alias() doesn't find the alias dentry, it returns NULL.
Then, msdos_lookup() dereference the NULL, and Oopses. Fixed here.

The vfat_lookup() part is cleanup only.

FORCE is the de-facto standard name for a prequisite to force
recompilation, so instead of using a mix of 'dummy','FORCE' and
'FORCE_RECOMPILE' use 'FORCE' everywhere.

Also, move figuring out the path relative to the top level dir
into Rules.make, instead of calling an external script. 

It's possible to say "make <subdir>", to descend into that subdir
and recursively build things there. This patch provides this
facility generally without the arch Makefiles needing to duplicate
it for arch/$(ARCH)/somedir.

We now have the information which objects are being built
modular / built-in in Rules.make, so use this information instead
of passing flags to the sub makes.

into tiger.hpl.hp.com:/data1/bk/lia64/to-linus-2.5

ia64_switch_mode().

Didn't get the net/ conversion quite right, and apparently overlooked
one subdir in sound/. Now fixed.