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

as intended.

This implements ptes-in-highmem for PPC, removes the quicklist
and zero-page stuff.  PTEs in highmem on SMP turned out to need
some significant changes to avoid deadlocks on the hash_table_lock
(now renamed to mmu_hash_lock).  The PMDs now contain the physical
address of the PTE page rather than the virtual address.
Anything that takes the mmu_hash_lock now operates with the DMMU
off to avoid MMU hash-table misses.

into samba.org:/home/paulus/kernel/for-linus-ppc

These are all in the 2.4.19-pre2.

"Jahn Veach" <V64@V64.net>: [PATCH 2.5.4] Typo corrections.

Pavel Machek <pavel@ucw.cz>: Whitespace PCI cleanups (fwd).

quinlan@transmeta.com: [PATCH] take COPYING into new century:
	These mods are directly from the FSF version.

	This set of one-liners are the ones which have already gone
into 2.2.19-pre2.

Andrey Panin <pazke@orbita1.ru>: [PATCH] arch_i386_kernel_smpboot.c missing __init:
  this patch adds missing __init directive for div64() function
  in arch/i386/kernel/smpboot.c. div64() is only used
  synchronize_tsc_bp() function which is marked __init.

Andrey Panin <pazke@orbita1.ru>: [PATCH] remove annoying ISAPNP message:
  This patch removes useless messages like:
  "isapnp: Calling quirk for 02:00".

John Fremlin <john@fremlin.de>: Patch to fix off by one in ide-scsi:
  Patch to fix off by one in ide-scsi

  To see it is correct compare with ide-cd behaviour

René Scharfe <l.s.r@web.de>: [PATCH] compiler warnings in scripts_tkgen.c:
  this patch fixes two compiler warnings during make xconfig which
  turn up if one uses -Wshadow

From: Dave Jones <davej@suse.de>
  kernel builds and boots with patch (with CONFIG_BLK_DEV_INITRD disabled).

(Trivial because CONFIG_BLK_DEV_RAM is Y if CONFIG_BLK_DEV_INITRD is Y)

	New helper:
path_lookup(name, flags, nd)
{
	int err = 0;
	if (path_init(name, flags, nd))
		err = path_walk(name, nd);
	return err;
}

Places doing that by hand converted to calling it.

Actually, quite a few of them were doing equivalent of __user_walk()
(getname() and if it was successful - call path_lookup() and putname()).
Converted to calling __user_walk().

	LOOKUP_POSITIVE is not needed anymore.  All callers of path_walk()
treat -ENOENT and negative dentry the same way.  If you want a proof of
correctness - I'll send it, but it's a couple of pages of induction, basically
boiling down to "let's show that for any N we can replace the
               if (lookup_flags & (LOOKUP_POSITIVE|LOOKUP_DIRECTORY))
                       break;
in link_path_walk() with
               if ((lookup_flags & (LOOKUP_POSITIVE|LOOKUP_DIRECTORY)) ||
		   current->link_count <= N)
                       break;
without changing behaviour of the system".  Pretty straightforward for
N = 0, then we look for places that can lead to call link_path_walk()
with current->link_count equal to N and show that if result of the test
changes, behaviour of callers doesn't.  Since the depth of recursion is
limited, we had shown that test in question can be replaced with if (1).
And that's the only place in tree the ever checks for LOOKUP_POSITIVE.

	The real reason behind that is very simple - indeed, suppose
we get a negative dentry out of path_walk().  What the hell could we
do with it?  Its parent isn't locked, so both the name and parent can
change at any moment (could have changed already).  There used to be
places that tried to play "let's get a negative dentry, lock its parent
and start doing something".  All of them racy and all of them fixed
in 2.3.  Fixed by switching to LOOKUP_PARENT...

	More cleanups (getblk() use, etc.) in reiserfs (again, cleaning
up after merge).

into mulgrave.(none):/home/jejb/BK/scsi-2.5

Tidy up and eliminate remaining references to old error handler.

SCSI reservation/reset handling

- Make both the old and the new error handlers respond correctly
  to reservation conflicts (i.e. return an I/O error).

- Add a scsi_reset_provider() function for use by the sg driver
  SCSI reset facility.

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

drivers/telephony/Config.help.  The text was obtained from
Eric Raymond's Configure.help v2.97.

  Cleanup - remove version and changelog.
  These don't belong in Linus' kernel.

longer count the idle thread in "nr_threads", so we should
not discount it when returning sysinfo() information.

This patch updates my entries in CREDITS + MAINTAINERS.

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

	* stat() variants on ppc64 converted to use of vfs_stat() and its ilk.
	* missing LFS checks added.

* minor cleanup in jffs (passing superblock instead of ->[si]_dev).

* in intermezzo a bunch of places where we are comparing ->s_dev
  are replaced with comparing pointers to superblocks.

* in reiserfs: a new caller of getblk() converted to sb_getblk() +
  a bunch of places converted to use of ->s_id.

* write_some_buffers(), write_unlocked_buffers(), wait_for_buffers(),
  wait_for_locked_buffers() and wait_for_some_buffers() converted
  from kdev_t to struct block_device *.

* sync_buffers() split in two functions (sync_buffers() and
  sync_all_buffers()).  Callers of sync_buffers(NODEV) are
  using the latter, those who actually pass a device - the former.
* sync_buffers() switched from kdev_t to struct block_device *.

* all remaining callers of sync_inodes() and sync_supers() pass
  NODEV as an argument, so we can make them void(void).  Dead
  code removed.

* new function - fsync_bdev() (analog of fsync_dev(), but takes
  struct block_device * instead of kdev_t.  Callers of fsync_dev()
  that have struct block_device in question are using fsync_bdev()
  now.
* old code for fsync_dev(NODEV) had been moved to sys_sync().
  Other callers of fsync_dev(NODEV) are calling sys_sync() now.
* fsync_dev() became a wrapper fro fsync_bdev().
* sync_dev() (not used anywhere in the tree) is gone.
* i2oblock.c had fsync_dev() called in ->release().  Removed.
* s390/block/xparm.c was doing fsync_dev() on its devices in
  cleanup_module().  Removed.

This patch adds some necessary PCI card hooks.  Patch originally from
VScom IIRC.

2001-11-14  Tim Waugh  <twaugh@redhat.com> [sent 2001-11-27]

	* drivers/parport/parport_pc.c,
	drivers/parport/parport_serial.c: PCI card hooks.
	* drivers/parport/ChangeLog: Updated.

This patch makes lp and ppdev do the Right Thing regarding O_NONBLOCK.

2002-01-04  Tim Waugh  <twaugh@redhat.com>

	* include/linux/parport.h: Define a special inactivity timeout
	meaning 'caller wants to use O_NONBLOCK'.
	* drivers/char/lp.c: Support O_NONBLOCK properly.
	* drivers/char/ppdev.c: Likewise.
	* drivers/parport/parport_pc.c: Likewise.
	* drivers/parport/ChangeLog: Updated.

This patch makes lp quieter in the common case that a printer does
_not_ speak ECP. (People have been writing to me worried that the
message means something bad.)

2002-02-26  Tim Waugh  <twaugh@redhat.com>

	* drivers/char/lp.c: Be quiet.

This patch fixes a problem with parport that shows up when interrupts
are specified.  I sent this to Marcelo for 2.4.19-pre2 a short time
ago.

2002-02-25  Tim Waugh  <twaugh@redhat.com>

	* drivers/parport/parport_pc.c: Fix a bug spotted by Mikael
	Pettersson.
	* drivers/parport/ChangeLog: Updated.

Most importantly this patch is making ide.c use the
new automagic for module initialization lists and further
preparing the rest of the code in question here for proper
module separation. Despite this the CMOS probe has been removed
as well... *Iff*, which I don't expect, this breaks anything
it can be reintroduced easely. During this effort an actual bug
in the initialization of the main module has been uncovered as well.
a quite serious BUG has been tagged in ide-scsi.c as well, but
as far as now I just didn't get along to actually fixing it.
(The patch is big enough as it is).

Details follow:

- Kill *unused* ide_media_verbose() funciton.

- Remove the unnecessary media and supports_dma fields from
    ide_driver_t.

- Remove the global name field from ide_driver_t struct by pushing it
    down to the places where it's actually used.

- Remove the unused hwif_data field from ide_hwif_t.

- Push the supports_dsc_overlap condition up to the level where it
    belongs: disk type as well.

- Make the initialization of ide main ide.c work with the new module
    initialization auto-magic instead of calling it explicitly in
    ll_rw_block.c This prevents the ide_init() from being called twice. We
    have BTW. renamed it to ata_module_init(), since  ata is more adequate
    then ide and xxx_module_init corresponds better to the naming
    conventions used elsewhere throughout the kernel.

    This BUG was there before any ide-clean.  It was worked around by a
    magic variable preventing the second call to succeed.  We have removed
    this variable in one of the previous patches and thus uncovered it.

- Kill proc_ide_read_driver() and proc_ide_write_driver(). The drivers
    already report on syslog which drives they have taken care of.  (Or
    at least they should). In esp. the proc_ide_write_driver() was just
    too offending for me.  Beleve it or not the purpose of it was to
    *request a particular* driver for a device, by echoing some magic
    values to a magic file...
    More importantly this "back door" was getting in the way of a properly
    done modularization of the IDE stuff.

- Made some not externally used functions static or not EXPORT-ed.

- Provide the start of a proper modularization between the main module
    and drivers for particular device types. Changing the name-space
    polluting DRIVER() macro to ata_ops() showed how inconsistently the
    busy (read: module  busy!) field from ide_driver_t
    is currently used across the    different device type modules.
    This has to be fixed soon.

- Make the ide code use the similar device type ID numbers as the SCSI
    code :-).  This is just tedious, but it will help in a distant
    feature. It helps reading the code anyway.

- Mark repettitive code with /* ATA-PATTERN */ comments for later
    consolidation at places where we did came across it.

- Various comments and notes added where some explanations was missing.

This is finally moving the ide-pci.c file into a shape where
the host chip detection lists can finally be moved to where they
belong - into the particular chipset specific files.

This is accomplished, by a rather obivous removal of macro magic,
which was just making entries to the global device type
list nonfunctional, instead of making them conditional on the
corresponding CONFIG_BLHA options.

The second thing was to add a flag field to the device recognition
list, which made it possible to compress many of the
multi || chip id conditionals go away.

The only other file affected is ide.h - here is the change in the size
of the name field, which apparently slipped through ide-clean-12...