This usb driver needs ide_fix_driveid from drivers/ide/ide-ops.c, which
needs BLK_DEV_IDE ("Enhanced IDE/MFM/RLL disk/cdrom/tape/floppy
support") to get built.

Without this patch, you can configure an un-linkable kernel by doing make
allnoconfig, make menuconfig, and setting CONFIG_PCI, CONFIG_USB,
CONFIG_USB_STORAGE, and CONFIG_USB_STORAGE_ISD200 only.

I've got a new toy. This obviously correct 4 liner patches
the two files:

This resolves a bug in osdl bugtraq (#1261) by making
some more driver names match their module names.  Such
mismatches are bad because scripts often need to add
special cases, handling multiple names for drivers.

usually this would be too trivial, but is so obviously stupid that
people might think that there's some hidden trick in there.

We should not check for NULL _after_ following a pointer.
Consider it a small tiny step towards cleaning up this code.

In drivers/usb/core/hcd-pci.c, the code forgets to set hcd->state to
USB_STATE_SUSPENDED on suspend.  The effect is that on resume, the
code refuses to wake the HCD up, and instead prints a message saying
the interface hasn't been suspended.

The patch below fixes this.  It is against 2.6.0-test6.  With this
patch I can suspend and resume my Apple PowerBook G4, and the USB
works after resuming.

Module names in Kconfig help texts should match those in Makefiles. Please apply.

This holds minor net2280 cleanups:

  - Cleaner handling for cases where dma_alloc_coherent() must be
    used instead of kmalloc().  (Kmalloc is more memory-efficient
    for the "small buffers" case.)   Both MIPS cases should work,
    as well as others.

  - Prefetch cachelines on PIO paths.

The first of those gets rid of one <linux/version.h> usage, no
longer useful now that 2.4 and 2.6 versions have forked.

This fixes some problems with timing calculations (primarily for ia64)
and adds an operation to send panic strings to the IPMI event log on a
panic.

Since 2.6.0-test6, ftape can't be configured as a built-in driver.
test6 changed ftape-init.c to call ftape_proc_destroy() also in
the non-MODULE case; however, ftape_proc_destroy() is only defined
when the driver is built as a module. The result is a linkage error.

This fixes this by deleting the #if MODULE around ftape_proc_destroy()'s
definition.

on lots of PCI-only setups that have no ISA anywhere.

 - add vbi device handling for dvb-c cards with analog module
 - fix error handling upon device initialization
 - fix DD1_INIT handling of DVB-C w/ analog module installed.  (Jon
   Burgess)

 - fixed some return values in device attach functions
 - allow private data to be associated with frontend devices here, too
 - misc bugfixes and performance improvements (endianess, function split up)

 - applied latest changes by Juergen Peitz (great work!)
  o as a workaround for the lockup problem the data valid signal is
    checked after every channel switch.  If it is not set FEC parameters
    are set again.
  o disabled autoprobing if FEC settings are known (from sp887x). 
  o added support for FE_READ_UNCORRECTED_BLOCKS (from sp887x).
  o added support for FE_SLEEP (from sp887x).
  o bit error rate is now not only read from register 0xC07 but also
    from 0xC08 (from sp887x). 
  o I2C feedthrough to the tuner is now only enabled when needed (from
    sp887x).
  o Added FE_CAN_QAM_AUTO and FE_CAN_HIERARCHY_AUTO to
    dvb_frontend_info.
  o Removed obsolete setting of default frontend parameters in
    sp8870_init.
  o Removed obsolete module parameter 'loadcode' because changes in the
    saa7146 driver made firmware loading very fast.

 - simplify and sanitize add/del handling for dvb net devices

 - allow private data to be associated with dvb frontend devices
   (Andreas Oberritter)
 - fixed fe_count countint in nxt6000 frontend driver (Andreas
   Oberritter)

 - add some debug and safety checks for video/vbi capture buffer
   handling
 - add new flag SAA7146_USE_PORT_B_FOR_VBI, so we can distinguish on
   which video port to apply the vbi workaround
 - add del_timer(...) for vbi capture queue and vbi_read timers,
   prevents oopses on vbi usage

 - replace alps_bsrv2 driver by generic ves1893 & ves1993 driver
   (Andreas Oberritter)

Fix another 64bit bug, this time in the trident frame buffer driver

When storing the ioremap_nocache() return in a integer the variable must be
long not int.

Paul McKenney convinced me that there's no *guarantee* that all archs
will refuse the speculate the atomic ops above the state test, eg:

CPU0 (stopref_set_state)		CPU1 (stopref)

 atomic_set(&ack, 0);			if (state == XXX)
 wmb();						atomic_inc(&ack);
 state = XXX;

Certainly Alpha needs a rmb() inside stopref to guarantee it sees
the same ordering.

The range that the iptables limit extension can specify depends on HZ.
This means that rules which worked i386 2.4 (100 HZ) won't work on
2.6.

The solution is to adjust the precision based on the HZ value (keeping
the range of possible values the same).  For extra geek cred, this is
done by calculating a power-of-two constant below the maximum
multiplication factor, which gcc then turns into a simple shift.

From:  Stephen Hemminger <shemminger@osdl.org>

  Compile errors in the pcmcia/tcic driver if PCMCIA_DEBUG is defined.
  Looks like simple debug code bitrot, this fixes it.

into home.osdl.org:/home/torvalds/v2.5/linux

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

At the moment the aty128fb and matroxfb frame buffer drivers don't
compile on PPC.  In both cases the error is pretty trivial.  This
patch is the minimum change to fix the problems.

The _IOR() type problem fix in aty128fb.c depends on the fact that the
size of a pointer is the same as "size_t", so we don't have to use
_IOR_BAD() to keep the ioctl number the same.

Noted by Al Viro: if no handler exists (and we have IRQ_INPROGRESS set
because of an earlier irq that got through), synchronize_irq() will
end up waiting forever.

This fixes two serious bugs in the futex code.

One is a race condition which results in list corruption when
FUTEX_REQUEUE is used.  It is due to the split locks change introduced
in 2.6.0-test6, and oopses when triggered.

The other is a security hole.  A program can use FUTEX_FD to create
futexes on mms or inodes which don't reference them, and when those
structures are reused by a different mm or inode, the addresses match.
The effect is that a malicious or flawed program can steal wakeups from
completely unrelated tasks, causing them to block (or worse if they are
counting on the token passing property).

These are the specific changes:

    1. Each futex_q retains a reference to its key mm or inode.

    2. The condition for a futex_q to indicate that it's woken can usually
       be interrogated lock-free.

    3. futex_wait calls the hash function once instead of three times,
       and usually takes the per-bucket lock once too.

    4. When a futex is woken, the per-bucket lock is not usually taken,
       so that's one less cache line transfer during heavy SMP futex use.

    5. The wait condition and barriers in futex_wait are simpler.

    5. FUTEX_REQUEUE is fixed.  The per-bucket lock juggling is done
       in such a way that there are no race conditions against the tests
       for whether a futex is woken.


This patch is an combination of patches previously sent to the list.  An
equivalent patch has been in Andrew Morton's tree for a while, with no
failure reports.  Also I have been running it on my own SMP box for a
while.  Conversely, we have received an oops report for the 2.6.0-test6
code, so the fix is needed.

1. send_sigio() sends to a specific thread, _not_ a process.
   (It can also send to a process group, but that's not relevant here).
   This is useful, and should stay as it is.

   Therefore it makes _no sense_ to call f_setown() with current->tgid.
   Presently the kernel is inconsistent about it, with some places using
   current->pid and some others using current->tgid.

   This patch changes f_setown() calls to use current->pid.

2. In some places, f_setown() is called not at the user's direct request,
   but as a side effect of another function.  Specifically: dnotify and
   file leases.

   It is good to allow a program the flexibility to specify a different
   pid than the default, using F_SETOWN.  Presently they can do this after
   the dnotify or lease call, but there is a small time window when it
   will be temporarily set to current->tgid (which as pointed out above,
   is not always right).

   The window is avoidable if the program can use F_SETOWN prior to the
   dnotify or lease call.  This is exactly what the "force" argument to
   f_setown() is for, and this patch changes it to zero in those callers.

   This change is not likely to affect any existing programs.

Enable NFS_DIRECTIO support now that it has been fixed...

  - Support synchronous directio only. Defer asynchronous directio until
    it can be made safe.
  - If read/write exits due to an error, return number of bytes read/written
    prior to occurrence of the error.
  - Make sure we mark read pages as dirty in case we're doing zero-copy tricks.
    Export set_page_dirty_lock() for use by NFS directio.
  - Ensure we revalidate stale attribute info.

Add support for synchronous calls to the NFSv3/v4 COMMIT functions.

It is in any case no longer needed.

  - Use correct credentials in the NFSv4 synchronous read/write code.
  - Return correct number of read bytes in the NFSv4 synchronous read code.
  - SunRPC XDR fix: NFSv4 reads when caller requests a non-word aligned
    number of bytes was broken.

into home.osdl.org:/home/torvalds/v2.5/linux

into home.osdl.org:/home/torvalds/v2.5/linux

This just disables some drivers which are clearly not 64bit clean from
the configuration for CONFIG_64BIT hosts.

Partly from Arnd Bergmann.

From Arnd Bergmann.

Various APIC/ACPI fixes for x86-64. This brings us closer to working
out of the box on the now popular VIA and NVidia Nforce3 based Athlon64
and Opteron boards. To be really good we would need more ACPI changes
(still waiting for that to be all merged through the usual channels).

With this we mostly work with acpi=off at least.

Also it syncs us up with bugfixes done in 2.4.

 - Disable IO-APIC by default on non SMP VIA/NVidia boards.  This is a
   bit of a hack, but needed to work around ACPI bugs.  Can be
   overwriten with "apic". 
 - Add acpi=ht, meaning run ACPI boot setup, but do not enable the
   interpreter.  Same as i386.
 - Stop MADT parsing early when local APIC or IO-APIC are disabled
 - Add more option parsing early enough to actually change the boot
   process
 - Update documentation for command line options