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

by Sam Ravnborg

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

Tracking dependencies for .ver files isn't really different from
the dependency tracking for the other .[ois] targets we do,
so just use the normal $(call if_changed_dep) framework. That makes
speeds up re-running "make dep" a lot.

Up to now, we generated module versions for all objects which
were listed in $(export-objs).

This had one advantage: A changed .config will not affect which
.ver files are built, thus saving recompiles.

However, it is fundamentally broken. To build .ver files, we preprocess
the exporting sources - and the result can obviously depend on
the current .config. Even worse, some files generate errors when
preprocessed with the wrong .config - it doesn't matter a lot that
drivers/sbus/* will generate errors on x86, since it won't be used anyway,
but e.g. kernel/suspend.c cannot be preprocessed unless 
CONFIG_SOFTWARE_SUSPEND is set. - Up to now, we just silently ignore
these errors.

Actually, the whole point behind CONFIG_MODVERSIONS is to make sure
we don't insert modules into a kernel which was configured differently,
and as such the generation of symbols can only work when .config is
known.

So we now only generate symbols for objects which will actually be
compiled - which means less work, and enforce the kernel to be configured
before "make dep".

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

 - Add ARM version for asm/suspend.h
 - Use inline in atomic.h rather than __inline__
 - Fix up a missed superblock conversion in fs/adfs/map.c
   (hadn't been converted to use ADFS_SB())

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

Keep track of possible targets while we add rules - Later, only
include the command lines / dependencies as needed.

E.g., when defining how to build multi-part objects listed in
$(multi-used-y) and $(multi-used-m), add $(multi-used-y,m) to 
the variable targets. At the end of Rules.make, we then include
the saved command lines for these targets (if they exist), needed
to check whether the command changed and we hence need to rebuild.

Previously, we always had put the .cmd/.d files into the local subdir
- now we put them into the directory where the target lives, like

	some/dir/target.o <-> some/dir/.target.o.cmd

It does not yet make a difference, since we always only generated
targets in the local directory anyway, but that will change with
tracking dependencies for .ver files.

We use A/CFLAGS_KERNEL by default anyway, so no need to set them
explicitly for built-in objects.

This patch doesn't change anything but the order (and some comments) in
Rules.make. The reason for that is that we use Rules.make for three
different purposes, fastdep, modules_install and the actual building.

As an example, we don't need all the dependencies and saved command lines
when installing modules, so it'll speed up this pass to only include the
rules which will actually get used.

So far, we had been lazy and not generated dependencies for 
debugging-only targets, like some/dir/foo.[is]. It actually
cleans up Rules.make to handle them by the same mechanism, though.

Additionally, make use of $(call if_changed) and $(call if_changed_dep)
more consistent, the only difference now is post-processing of
gcc -MD output, which is done for if_changed_dep but not for if_changed.

cpp -MD guesses the target name from the source file name, but not
always correctly, e.g. when compiling fixdep, it generates prequisites
for fixdep.o instead of fixdep.
 
fixdep now fixes up the -MD generated output to contain the right target,
which is the one we pass on the command line.

o When using "make -j<n>", the order in modversions.h could change,
  thus causing unnecessary rebuilds.
o Move a comment in Rules.make which I forgot when I moved the
  associated code.
o When descending into init/ during the final vmlinux link,
  add a '+' do tell make to use its normal "-j" jobserver handling.
o It'd be nice to get the logic between make clean and make mrproper
  clearer. I think make clean should remove all targets used in the
  actual build,
  make mrproper should remove the rest, build-specific files, like
  e.g. the .*.cmd files used to save dependencies and command lines
  and other temporary files.
  A real small step in the direction: Remove .tmpversion/.tmp-export-objs
  at mrproper time.

Since namespace.h needs the contents of dcache, task struct and
semaphores, it seems sensible to include these two files into
namespace.h.

For the future: If the task_struct in sched.h is split into its own
include file, namespace.h could include this file, but namespace.h
will also need asm/semaphore.h

Since I have been looking in to the lcoking issues recently
the following rather trivial gabrage code collection became
obvious...

 - Remove "not yet used" code from 1995 in asm/locks.h. It's garbage.

 - Remove useless DEBUG_SPINLOCK code from generic spinlock.h code. Just
   compiling for SMP does the trick already.

 - Replace all usages of SPINLOCK_DEBUG with the now global
   CONFIG_DEBUG_SPINLOCK.

Most importantly this makes ide-scsi work again, which I broke
IDE 85. And we are starting to be serious about locking issues.
However the locking issues will take some patches until they stabilize.

 - Add spin locks in ata_special_intr.

 - Add Server Works CSB6 handling by Matt Domsch.

 - Atari updates by Geert Uytterhoeven:
   * irq_lock is used in more than one file, so make it global and rename it
     to ide_irq_lock
   * `hwgroup' is dead, use `channel' instead
   * ide_irq_lock depends on ATA_ARCH_LOCK, not on m68k or APUS

 - Small janitorial tidbits by Angus Sawyer.

 - PIIX driver updates by Vojtech Pavlik:

   * Removes the CONFIG_BLK_DEV_PIIX_TRY133 option. I've got an official
     statement from Intel saying that the controller definitely isn't intended
     to operate at this speed and doing so may cause severe trouble.

   * Fixes a bug in ata-timing.c, where EIDE timing data was discarded by
     accident.

   * Fixed a couple bugs in the Artop driver (UDMA clocks, active/recovery
     timing), 8-bit timing merging.

   * Removes an unused variable from piix.c

 - Move locking out from ide_set_handler(). There are places where it incurred
   too frequent lock grab and release or where we did miss to lock against
   concurrent hardware access.

   Generally the locking appears to be too fine grained and inconsistent at many
   places. This is the first cut. We will deal with it step by step.

 - Make sure message string is initialized even if FANCY_STATUS_DUMPS is
   disabled.

 - Don't lock directly inside udma_init and implementations of this method.

 - Guard against REQ_SPECIAL issued by the SCSI layer on us. Use REQ_PC in
   ide-scsi.c instead.

This fixes a large batch of warnings that popped up with the new stricter
bitops.h that recently was introduced.  We actually didn't have 64-bit
bug, but we had built our own *_flags_t typedef's that were just struct
wrappers around an unsigned long.  We used to pass their addresses directly
to set_bit() and friends but now that causes an error.  The typedef's really
didn't serve much purpose so the cleanest fix is to just eliminate them and
use "unsigned long" directly.

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