into are.twiddle.net:/home/rth/BK/mod-2.5

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

This is just to make x86-64 boot with IOMMU and compiled in AGP driver
again.  Previously both AGP and the IOMMU code would set up an aperture,
with AGP being winner, messing up pci_map_*.

This is needed for the x86-64 update for 2.5.54 I sent earlier.

Actually using /dev/agpgart still corrupts memory unfortunately, haven't
tracked that down yet.

I also commented on some (usually 64bit, but at least one 32bit) bugs in
the driver too.

These changes should be all nops on i386.

 - Export amd k8 init function for x86-64.  It needs to be called early
   by the iommu code.  Add some comments to warn about about that (the
   upcoming VIA and SIS K8 chipsets will have the same problem)
 - Declare gatt table as u32 following the AGP spec.
 - Comment some bugs.

More x86-64 updates for 2.5.54.  Most noticeable change is that the
64bit X server works again.

This only changes x86-64 specific files.  It requires some AGP driver
changes I'm sending separately.

 - Some Makefile cleanups from Sam Ravnborg
 - Make sure extended registers in 32bit processes are zeroed and not
   accessible/changeable from ptrace.  This is to avoid potential
   security bugs with non 64bit clean 32bit emulation functions (they
   often are overflow prone etc.)
 - Some 32bit emulation cleanups from Stephen Rothwell
 - Make copy_*_user source const to fix warnings.
 - Set fs/gs to dummy values when the 64bit segment base is set to not
   confuse the context switch (Karsten Keil, me)
	* still one mysterious bug in this area unfortunately.
 - Make MAP_32BIT for 64bit processes only map in the first 31bit,
   because it is usually used to map small model code.  This fixes the X
   server crashes.  Some cleanups in this area.
 - Don't set O_LARGEFILE for 32bit open
 - Handle ptregs calls from 32bit syscall correctly.
 - Implement aio io_getevents for 32bit.
 - Remove buggy unused command handler in nfsd 32bit emulation.
 - Convert timespec in semtimedop (thanks to Anton for telling me about
   this)
 - Ignore long mode flag from 32bit modify_ldt.  This fixes Wine, which
   left it uninitialized (bug found by Karsten Keil)
 - Merge with i386
 - Handle new kallsyms
 - Remove some superfluous bootup printks

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

into raven.il.steeleye.com:/home/jejb/BK/scsi-for-linus-2.5

Wondering why my CD-writer did not have a name in sysfs, I saw
that when the name is longer than 50 bytes no name at all is used.
The (much smaller) code below constructs a truncated name instead.

This patch fixes the handling of IOPL when sysenter is used.

Currently when entering kernel mode, IOPL is not changed and it is not
presserved across context switches: thus, in the kernel, the IOPL value
is random.

This is not a problem when using iret, because it restores eflags, but
the sysexit code currently doesn't, which means that that IOPL becomes
random in user mode too which is of course not good.

This patch fixes the problem by saving eflags across context switches.

Also update zalon to C99 initialisers

The Zalon card is a GSC 53c720 based card.  This driver adopts
the ncr53c8xx driver for the purpose.

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

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

When separating out the duplicated xmit handling, we were lucky that
we could reuse BC_Send_Data for our purposes. Introduce a more
extensible "struct bc_l1_ops" instead, and initialize that in
the code that provides the functionality, not in the users.

Realize that *_empty_fifo() and *_fill_fifo() are always called
under the card lock, so no additional protection when reading/writing
fifos is needed.

Same thing which just happened to hscx_irq.c - Use the struct
bc_hw_ops instead of macros and inlining.

Each driver for HSCX based cards defined some hardware access macros
and #include'd hscx_irq.c. Instead, we now add the needed routines to
the corresponding bc_hw_ops and use regular function calls. It's a slight
bit less efficient, but shouldn't be noticable.

Using {isac,hscx}_{read,write} instead of the low-level
readreg/writereg simplifies the code a bit.

Preparing for un-inlining hscx_irq.c, we add operations needed
to access the B-Channel FIFO's, similar to what we already have
for the D-Channel.

Basically only a cosmetic patch, with much renaming and a little
rearranging of code.

mainly #include file shuffle

Just a simple search and replace, switch to the more commonly
used "u8" type.

In many cases, readreg()/writereg() users can be simplified by
passing struct IsdnCardState instead of individual register
addresses.

In 2.5 (the bug's been there since 2.5.42), rmmod:ing a
modular IDE subdriver like ide-cd or ide-scsi and then
rebooting causes an oops in device_shutdown(). This is because
the IDE layer doesn't reset the drive->gendev.driver pointer
that it previously set up to point to data structures in the
subdriver module. device_shutdown() sees a non-NULL ->driver,
dereferences it, and oopses.

The patch below for 2.5.54 fixes two generic bugs related to
unloading of modular IDE subdrivers, and one specific to ide-scsi:

1. ata_attach() needs to set drive->gendev.driver = NULL
   when no specific driver claims the drive. This prevents a
   drive previously owned by a subdriver module from keeping
   its ->gendev.driver pointing into that module.

2. ide_unregister_driver() needs to unregister &driver->gen_driver;
   this is to balance the corresponding register call in
   ide_register_driver(). [This part of the patch is originally
   by Patrick Mochel.]

3. ide-scsi.c abuses ide_driver_t's busy field as a counter
   while the field in fact is a single-bit boolean. This causes
   the busyness of the driver to be incorrect while the driver
   is active. (From my recent patch for 2.4.20-ac2/2.4.21-pre2.)

Add more netdev bus dependencies.  Patch by Arnd Bergmann.

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

We were using the virtual address for cache flushing in
update_mmu_cache, which is ok if the address is in the current mm,
but if it isn't we have to do something different, namely,
flush using the physical address.

options relating to 4xx-based boards there.

All the iSeries machines that can run Linux are 64-bit PowerPC
machines and are now supported by the ppc64 kernel.  Since no-one
is interested in maintaining the iSeries support in the ppc32
kernel, I am removing it.

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