From: Randy Dunlap <rddunlap@osdl.org>
From: Michael Veeck <michael.veeck@gmx.net>

Removes unnecessary IDE_MIN()/IDE_MAX() macros
and changes calls to use kernel.h macros instead.

From: Randy Dunlap <rddunlap@osdl.org>
From: Michael Veeck <michael.veeck@gmx.net>

ide-cd.h: remove unnecessary MIN() macro
ide-cd.c: change MIN() calls to use kernel.h calls
ide-tape.c: use min_t()/max_t() instead of min()/max()

From: Daniel Drake <dsd@gentoo.org>

Adds Toshiba chips to the list supported by the generic PCI IDE driver.
The 2.4 tree already contained an entry for 0x1179:0x0102, this patch
adds that entry to 2.6 as well as two new ones (0x0103 and 0x0105).
This then allows DMA to be enabled on disks.

into ppc970.osdl.org:/home/torvalds/v2.6/linux

Patch from Deepak Saxena

Latest (and hopefully last :) patch for generic DMA buffer bouncing.

- Fixed SA1111 dma_needs_bounce
- Added check for out of bounds buffers.
- Made dmabounce.c directly implement dma_* API

Note that I didn't do the following:

#ifndef CONFIG_DMABOUNCE
inline implementations of all functions
#else
extern declarations
#endif

Instead I wrapped it individual in #ifndef/#else blocks to keep the
comments in the same area as function declarations.  IMHO this makes 
it easier for someone to go look at the comments if they need to know 
what a specific API does.

Patch from Nicolas Pitre

One case was found when the kernel is compiled with -O2 (instead of the 
default -Os).  However, all gcc-3.* versions seem to have a problem with 
this.  Instead of blacklisting them all unconditionally, better just abort
when a bad case occurs especially since this bad case doesn't seem to
appear with current default compiler flags.  Depends on patch #1824.

Patch from Nicolas Pitre

The recent discovery of a problem with gcc not always respecting register
assignment for local variables to be used with inline assembly is worrisome.
If unnoticed, such problems can cover bugs that might prove hard to find
especially when the code is right but silently ignored.  This patch adds a
test where needed to have the assembler confirm our register selection and
fail the kernel build if the wrong registers are allocated.

into ppc970.osdl.org:/home/torvalds/v2.6/linux

If a filesystem's ->writepage implementation repeatedly refuses to write the
page (it keeps on redirtying it instead) (reiserfs seems to do this) then the
writeback logic can get stuck repeately trying to write the same page.

Fix that up by correctly setting wbc->pages_skipped, to tell the writeback
logic that things aren't working out.

into ppc970.osdl.org:/home/torvalds/v2.6/linux

into ppc970.osdl.org:/home/torvalds/v2.6/linux

into nuts.davemloft.net:/disk1/BK/net-2.6

Since symlink.c uses "name" field of a kobj when it calculates the
length,  it gets a wrong value if the kobj's name  has more than 20
charathers.  A correct way to do that is to call kobject_name(kobj)
instead of using kobj->name directly.

into ppc970.osdl.org:/home/torvalds/v2.6/linux

this patch (2.4 & 2.6) fixes a bug about the timeout value. The formula
used to calculate jiffies from timeout is wrong.
The new formula is ok and takes care of integer computation/rounding.
There is the same bug in the tiglusb.c module which will be fixed by another
patch.

Handle some PL-2301/2302 devices better.

I just checked out the latest 2.6.6-rc1-mm1 to see that the ID patch for
ftdi has applied cleanly, but apparently someone was faster and in the
combined ID table our ID's were missing.
Most probably the patch program got confused and applied the hung at wrong
spot..

Attached is a patch that places that 2 lines in the correct spot.

Hi,

this patch (cumulative; 2.4 & 2.6) fixes another bug in the tiglusb
driver. The formula used to calculate jiffies from timeout is wrong.
The new formula is ok and takes care of integer computation/rounding.
This is the same kind of bug than in the tipar char driver.

Warnings aren't terribly important in and of themselves, but there
isn't really much the warning tells us to do here, so it would appear
that caving in to the compiler is the thing to do for now.

Various build fixes:  64bit (Andrew Morton), static linking,
broken on big-endian, etc.

Tighten up the integration with the main "ether" driver, so
state transitions and host ethernet addresses are shared too.
Add missing spinlock calls around RNDIS command outcall,
fix GET_INTERFACE issue, host mustn't clobber netdev flags.

Minor code cleanups.

Cope better when PCI misbehaves badly and registers misbehave:

    - terminate some loops before they get to infinity
       * capability scan
       * port reset
    - after init failure, memory may already be cleaned up

Some systems have been reporting such problems after ACPI resume.

This replaces current_thread_info()->cpu in i386' init_IRQ() by the
equivalent smp_processor_id().

Reduces overhead on UP, and makes the code cleaner.

This simplifies the Pentium M quirk code in nmi.c, and eliminates an
unnecessary apic_read().

Local APIC accesses are not zero-cycle; let's not inflict more damage
than we must.

From: Benjamin Herrenschmidt <benh@kernel.crashing.org>

We need some alignement of those structs for proper operations especially
with FP and Altivec, or SLAB_DEBUG can break us.

From: Stephen Rothwell <sfr@canb.auug.org.au>

This patch just adds some proc entries for the virtual tape and cdrom
drivers to allow mapping between linux devices and OS/400 ones.  This is
expected by existing users and there is no other way to do this
translation.

From: "J. Bruce Fields" <bfields@fieldses.org>

Unregister svcauth_gss caches on exit from gss module; fixes an oops on
rmmod.

From: Benjamin Herrenschmidt <benh@kernel.crashing.org>

From: David Woodhouse <dwmw2@infradead.org>

Without this the task struct gets unaligned when using SLAB_DEBUG, causing
random problems with FP and Altivec.

From: Ralf Baechle <ralf@linux-mips.org>

MIPS now also uses the generic ioctl compat code.

From: Ralf Baechle <ralf@linux-mips.org>

MIPS never uses a.out

From: Ralf Baechle <ralf@linux-mips.org>

- Add HPC3 PS/2 driver bits for SGI IP22 aka Indy
- Add Mace PS/2 driver bits for SGI IP32 aka O2
- Add R4030 PS/2 driver bits for Jazz family
- Don't register I/O ports where we're using the I/O port memory window
   to access the i8042 registers

From: Ralf Baechle <ralf@linux-mips.org>

Add Pete to CREDITS for all the time he's invested into supporting the AMD
Alchemy of SOCs and eval boards.

From: Ralf Baechle <ralf@linux-mips.org>

All MIPS systems use the same PCI code now.

Fix the incorrect comment which caused the fb_ioctl confusion.

From: Matt Mackall <mpm@selenic.com>

Delete obsolete comment and kill test of obsolete define.

From: Matt Domsch <Matt_Domsch@dell.com>

The patch below from Michael E.  Brown properly sets the owner field of a
sysfs attribute.  Without this patch, it is possible to crash the kernel with
a simultaneous insmod/rmmod while reading files exported by the module.

From: Martin Schwidefsky <schwidefsky@de.ibm.com>

Add support for z990 crypto instructions to in-kernel crypto api.

From: Martin Schwidefsky <schwidefsky@de.ibm.com>

zfcp host adapter changes:
 - Fix error recovery stall in case of unavailable nameserver.
 - Reset host_scribble field to NULL in scsi_cmd.
 - Remove request debug code.

From: Martin Schwidefsky <schwidefsky@de.ibm.com>

dasd device driver changes:
 - Initialize open_count with -1 to account for blkdev_open in
   dasd_scan_partitions.
 - Introduce USE_ERP request flag to selectivly switch off error
   recovery for reserve, release & unconditional reserve ioctls.