This is an old bug that often confuses people, rightfully.

For some laptop and server type cdroms, the drives advertise themselves
as tray loading even if they are caddy-like or slot-in loaders.  This
means they cannot insert the media on their own, and this generates a
5/24/00 error to START_STOP_UNIT.

This prevents the logging of such a failure, and also fixes the
generation of such a bad command in case the mech type was correctly set
by the drive.

Fix race conditions of ISDN CAPI's internal ncci list handling by using
a per capidev semaphore.

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

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

 - [V4L] follow changes in saa7146 driver: mxb, dpc7146, hexium_orion,
   hexium_gemini

 - [DVB] ttusb-dec:
   - Add a parameter to dvb_filter_pes2ts function to specify whether
     the packet is a payload unit start or not
   - Use the hotplug firmware loader for 2.6 kernels instead of
     compiling the firmware into the module. 
   - Correct the USB id of the DEC3000-s, add basic support

 - [DVB] ttusb-budget:
    - Remove spurious discontinuity message when starting streaming

 - [DVB] follow changes in dvb-core for frontend drivers (ves1x93,
   ves1820, nxt6000, sp887x, tda1004x, stv0299, mt312, alps_tdlb7,
   alps_tdmb7, at76c651, cx24110, dst, dvb_dummy_fe, grundig_29504-401,
   grundig_29504-491)
 - [DVB] tda1004x: updated timeout to 800ms, implemented FE_SLEEP
 - [DVB] cx24110: add FE_CAN_RECOVER to reduce kdvb-fe CPU load
 - [DVB] grundig_29504-401: added 200ms delay after first FE_INIT,
   Implemented FE_GET_FRONTEND
 - [DVB] alps_tdlb7, alps_tdmb7: upped tuning delays to fix tuning

 - [DVB] av7110 update:
   - speed up firmware loading
   - follow internal API changes in saa7146 driver
   - introduced some symbolic constants for a/v dec cmds
   - change default for hw_sections to 0 to enable crc checks

 - [DVB] remove superflous memset() which caused section data to be
   overwritten when a) there are two sections in one TS packet, and b)
   the first section was smaller than 18 bytes; thanks to Jean-Claude
   Repetto for tracking this down
 - [DVB] starting a ts filter on a running section filter's pid did
   break the section filter; fixed. 
 - [DVB] integrate ULE Decapsulation code, thanks to gcs - Global
   Communication & Services GmbH.  and Institute for Computer Sciences
   Salzburg University.  Hilmar Linder <hlinder@cosy.sbg.ac.at> and
   Wolfram Stering <wstering@cosy.sbg.ac.at>
 - [DVB] fix the module use count bugs, thanks to Hernan A.Perez Masci
   for his initial work on this problem
 - [DVB] if dvb_frontend_internal_ioctl() returns an error code, be sure
   to deliver it to the calling application, don't ignore it (fixes the
   bug that the frontend0 doesn't respond properly to unknown ioctls...)
 - [DVB] major frontend code clean up, rewritten core tuning loop.
   Thanks to Andrew de Quincey.
 - [DVB] follow changes in dvb-core in skystar2, dvb-bt8xx

 - [DVB] add generic functions for EN50221 CAM interfaces

 - [DVB] budget-av: patch by Kenneth Aafløy to add support for Typhoon
   DVB-S budget card
 - [DVB] budget.c: support for Fujitsu-Siemens Activy Card
 - [DVB] budget-ci: add preliminary CI support

 - [DVB] misc. documentation updates, KConfig help file updates
 - [DVB] make Twinhan driver depend on bt8xx

 - [DVB] saa7146 driver updates:
   - remove bogus v_calc and h_calc parameters, which can be easily
     retrieved from other values
   - add class parameter to i2c initialization
   - let resource handling provide more useful informations
   - sanitize overlay/capture locking

into redhat.com:/spare/repo/net-drivers-2.6

into redhat.com:/spare/repo/net-drivers-2.6

into redhat.com:/spare/repo/net-drivers-2.6

The attached patch fixes an "oops" in tulip driver when a live interface
is deactivated (i.e. PC Card ejected or module unloaded) without being
brought down first.

into kernel.bkbits.net:/home/davem/net-2.6

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

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

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

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

It is unsafe thing to do (no locking, no reference counting etc).
Just remove module_exit() as it was done for IDE PCI drivers.

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.

* Need to carry forward this workaround from old e100 driver to
  avoid a Tx hang on ICH systems linked at 10/Half.  Workaround
  adds a stall before each Tx command queued by issuing a NOP
  command followed by 1us delay.  Yuck!  Otherwise HW locks hard.
  (Probably needed for eepro100 also ;-).

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.

return of d_splice_alias() and acting accordingly rather than just
ignoring the returned dentry.