Observe that 
defined(MODVERSIONS) == defined(CONFIG_MODVERSIONS) && defined(MODULE)
and from there I step by step simplified the logic in
include/linux/module.h - staying logically equivalent, but it is much 
more understandable now, IMO.

Still added a huge comment trying to help other people understand
what kind of magic happens here.

There's no good reason why we would generate
include/linux/modversions.h from the top-level Makefile when
CONFIG_MODVERSION=y and from Rules.make otherwise.

Nor is there a good reason to call the target to do so
"update-modverfile" - "include/linux/modversions.h" makes
much more sense.

o A rule which makes the include/asm symlink should have the target
  "include/asm", not "symlinks". Likewise for ".hdepend". 
  (include/linux/modversions.h yet to follow)

  Apart from being cleaner, this additionally gives us protection
  when a command fails or the user interrupts execution:
 
  E.g. for the case of "make dep", if the user interrupts at
  some point, make will delete the target (now ".hdepend") for us,
  so that at the next run, make knows that it needs to make the
  dependencies again, while otherwise it would just use the
  half-finished file.

o We don't need the include/asm symlink for the configuration targets,
  we only need it before generating dependencies.

  (The setup of having /usr/include/{linux,asm} symlinked to your
  current kernel source is already broken in 2.5, so this change
  doesn't break anything which wasn't broken before.)

o Add .hdepend to "prepare", i.e. what needs to be done before
  we can start the recursive build. That means we can get rid of
  the gross (and not always working) hack which made "make"
  run "make dep" when .hdepend didn't exist yet.

o Mark the *config targets phony and improve some comments.

Be explicit about what we need to do before we can start the recursive 
build, it's now listed in the "prepare" rule.

We would rebuild vmlinux if the command line to do so changed since
the last build. Unfortunately, we forgot to read the old command line,
so we always rebuilt it.

 - Get rid of SELECT_DRIVE macro. Start to move all direct hardware access
   functions in to one place.

 - Get rid of SELECT_MASK macro. Realize that the mask is always equal 0.
   Simplify the maskproc therefore.

 - Get rid of GET_STAT and OK_STAT macros as well.

 - hpt366 cleanups by Andrej Panin.

 - Artop driver update by Franz Sirl.

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

folks, and the ARM people didn't mind.

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

* support latest wireless extensions
* update locking to use semaphores

into mandrakesoft.com:/home/jgarzik/repo/net-drivers-2.5

Here's my last and final patch to the maintainer of USB Scanner Driver.  Brian
Beattie <beattie@beattie-home.net> is now going to assume this role (thanks
Brian!).  Brian brings some kernel level programming so I'm sure he'll be able
to conttribute to this list w/o any problems.  I want to thank you all for your
support and help.  A couple of you sent some personal msgs regarding my
departure - thank you.

* 0.4.8  5/30/2002
 *    - Added Mustek BearPaw 2400 TA.  Thanks to Sergey
 *      Vlasov <vsu@mivlgu.murom.ru>.
 *    - Added Mustek 1200UB Plus and Mustek BearPaw 1200 CU ID's.  These use
 *      the Grandtech GT-6801 chip. Thanks to Henning
 *      Meier-Geinitz <henning@meier-geinitz.de>.
 *    - Increased Epson timeout to 60 secs as requested from
 *      Karl Heinz Kremer <khk@khk.net>.
 *    - Changed maintainership from David E. Nelson to Brian
 *      Beattie <beattie@beattie-home.net>.

I just noticed a debug message will generate a needless warning
when debugging is disabled.

updated the kernel-api documentation USB files due to file reorg.

The patch below adds first round of AGP support for the Intel 460
chipset

This won't actually build at the moment, but I think you prefer to
merge things piecemeal, and this portion of the patch is almost
guaranteed to be safe (affects only ia64).

GCC3.1 apparently gets confused about uninitialized sections

Hi Linus,

Are you willing to change the interfaces of clear_user_page() and
copy_user_page() so that they can receive the relevant page pointer as
a separate argument?  I need this on ia64 to implement the lazy-cache
flushing scheme.

I believe PPC would also benefit from this.

	--david

On ia64 MP machines, we use the cycle counter register of each CPU to
obtain fine-grained time-stamps.  At boot-time, we synchronize the
counters as close as possible (similar to x86, though with a different
algorithm).  But even with this synchronization, there is still a
small (really: tiny) chance that a process bouncing from one CPU to
another could observe time going backwards.  To guard against this, I
maintain a global variable called "last_time_offset" which keeps track
of the largest time-interpolation value returned so far.  Most of this
is in platform-specific code (arch/ia64/kernel/time.c), but there are
a handful of places in platform-independent code where this variable
needs to be cleared to zero.  This is what the patch below does.  I
didn't put it inside CONFIG_IA64 because I think this can be useful
for other platforms, too.  I suppose I could put it inside CONFIG_SMP
though this would make the code uglier.  If you think it's OK, please
apply, otherwise, I'd appreciate your feedback.

This makes it possible to run the ia64 kernel both on platforms with the
legacy keyboard controller and those without (as is the case for the hp
zx1 platform, for example).  The new code is inside #ifdef CONFIG_IA64,
though it would probably be a good idea to enable it unconditionally.
The patch is by Alex Williamson.

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

stuff.

awful code with loops

into samba.org:/scratch/anton/linux-2.5_ppc64

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

into samba.org:/scratch/anton/linux-2.5_hvc_console

  The following patch fixes a few compiler warnings, as well as provides
blk_init_queue() with the appropriate arguments. Please review for
inclusion. Thanks to Jens Axboe for fixing the casting hack in
the previous version of this patch.

Don't know what exactly happened, but somehow, the ZX1 support is
in your tree twice. This patch drops one of them, and also adds
in Intel i845 support to make up for it 8-)