It should be unconditional.

When I converted journal_write_metadata_buffer() to kmap_atomic() I screwed
up the handling of the copyout buffers - we're currently writing four zeroes
into the user's page rather than into the data which is to be written to the
journal (oops).

Net effect: any block which starts with 0xC03B3998 gets scribbled on in
data=journal mode.

ide_ioreg_t is deprecated and hasn't been used by IDE driver for some time.
Use unsigned long directly on alpha, arm26, arm, mips, parisc, ppc64 and sh.

asm-ia64/ide.h (ide_ioreg_t is unsigned short) and asm-m68knommu/ide.h
(broken - ide_ioreg_t is not defined) are the only users of ide_ioreg_t left.

Use it on all archs which define ide_ioreg_t to unsigned long.

Disable code doing outb() without any locking in /proc handler.
Otherwise 'cat /proc/ide/hpt366' crashes if done during I/O.

Noticed by John Stoffel <stoffel@lucent.com>.

From: Geert Uytterhoeven <geert@linux-m68k.org>

Apparently some IDE drives (e.g. a pile of 80 GB ST380020ACE drives I have
access to) advertise to support LBA48, but don't, causing kernels that support
LBA48 (i.e. anything newer than 2.4.18, including 2.4.25 and 2.6.4) to fail on
them.  Older kernels (including 2.2.20 on the Debian woody CDs) work fine.

Check for id->lba_capacity_2 being non-zero in idedisk_supports_lba48().

The driver was copied from the very-buggy r8169 (pre-Francois),
and is for hardware that isn't even out of the lab yet.

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

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

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

The irq handler must not return 1 when the status register is null
during the firt iteration.

If the pcnet32 interface is not up, running the loopback test may hang or
crash the system.  This patch provided by Jim Lewis fixes that problem.
Tested on ia32 and ppc systems.

Some LOM implementation of our controllers pass IEEE tests (Tx 
distortion/Symmetry) while operating in Class A mode rather than in
class AB mode.

Adding this caused the adapter to fail while operating at 10 mbps, half
duplex. Hence the fix is not complete. We are still investigating a more
complete fix for the polarity reversal issue.

A Bug in e1000_spi_eeprom_ready where the Chip Select bit wasn't being 
toggled after every status register read (if the eeprom wasn't ready after 
the first status register read). The call to e1000_standby_eeprom manages 
the CS bit correctly

From: Anton Blanchard <anton@samba.org>

We have to restore r13 when entering unrecoverable_exception.

From: Paul Mackerras <paulus@samba.org>

This patch changes PCI_DMA_TODEVICE to DMA_TO_DEVICE in a couple of
places in drivers/net/ibmveth.c, since it doesn't compile without this
change and it does compile with it.  It also reformats a couple of
over-long lines in the vicinity of the other changes.

From: Niraj Kumar <niraj17@iitbombay.org>

This is in continuation of the ufs2 read-only code that went into 2.6.5.

This patch fixes a bug where wrong content was being read off the disk
after around 4 MB mark.

From: Anton Blanchard <anton@samba.org>

It's been there since the kernel was first imported into bk.  We see no
reason for this.

From: Arjan van de Ven <arjanv@redhat.com>

root_nfs_name is called one in single threaded environment; can use static.

From: Jeff Mahoney <jeffm@suse.com>

This patch fixes a problem with the serial conversion to tiocm[sg]et.

The paste from rs_ioctl included the command sanity checking, but there's no
command for tiocm[sg]et.  The compile ends up failing.

From: "Luiz Fernando N. Capitulino" <lcapitulino@prefeitura.sp.gov.br>,
      me

drivers/pcmcia/rsrc_mgr.c: In function `find_io_region':
drivers/pcmcia/rsrc_mgr.c:604: warning: large integer implicitly truncated to unsigned type

We don't really know what underlying type an ioaddr_t has, so just use an
integer here and let the compiler promote it appropriately.

From: Samium Gromoff <deepfire@sic-elvis.zel.ru>

Without this one it fails to build, too.