From: Neil Brown <neilb@cse.unsw.edu.au>

With the current code in bio_add_page, if fail_segments is ever set, it
stays set, so bio_add_page will eventually fail having recounted the
segmentation once.

I don't think this is intended.  This patch changes the code to allow
success if the recounting the segments helps.

(Jens has acked this)

- non_fatal.c comment fix (Zwane Mwaikambo <zwane@linuxpower.ca>)

- s/elevator/io scheduler/ in ll_rw_blk.c (Jens)

- update KJ mailing list address ("Randy.Dunlap" <rddunlap@osdl.org>)

- unused var in riscom8.c (Adrian Bunk <bunk@fs.tum.de>)

- add help texts to two OSS drivers (Adrian Bunk <bunk@fs.tum.de>)

- "PCMCIA SCSI adapter support" requires CONFIG_MODULES (Adrian Bunk
  <bunk@fs.tum.de>)

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

This removes include/asm-arm/proc-armv entirely, merging the
contents into the relevant include files in include/asm-arm.
We also update various files in arch/arm which reference
definitions in the now non-existent directory.

Remove more of the redundant 26-bit ARM CPU support from the
32-bit ARM tree.

Here is the first part of ISDN bugfixes for 2.6.
It should make ISDN work again with most controllers.

More fixes follow after more testing.

into iguana.be:/home/wim/BitKeeper/projects/linux-2.5-watchdog

into iguana.be:/home/wim/BitKeeper/projects/linux-2.5-watchdog

remove module_param's for wdt_start and wdt_stop
fix timeout check in init procedure

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

as it uses the crc32 library.

The enclosed patch tries to clean the tulip de4x5 driver, and update
it to some of the 2.6 APIs :

- Use PCI and EISA probing APIs
- Use generic DMA API
- Fix DE425 init on the Jensen
- Remove de4x5 from Space.c

It's been tested on x86 and Alpha, with a DE425 (21040, EISA), a DE435
(21040, PCI) and a quad DLink (4*21143, PCI).

The major problem with this patch is that, because of the Space.c
removal, interfaces get potentially renumbered. This has been
discussed to death on lkml, without any obvious solution. IMHO, we'd
better remove as many drivers as we can from Space.c before
2.6.0-final ships...

forced into double negatives.

the compilation of cosa.c was already fixed in your BK tree, so we can
now remove the dependency on BROKEN.

This fixes the build of the via-pmu.c driver when CONFIG_PMAC_PBOOK is
not set.

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

This adds the Kconfig option for the PowerMac IDE driver "LED" feature
(using the laptop's front LED as a disk activity indicator).  It also
adds a small bit to ide-probe.c that was missing from Jens patch when he
added the activity function infrastructure.  He did add the hwif field,
but not the code to actually enable it.

From Daniela Engert <dani@ngrt.de>.

It was disabled to workaround a bug in a driver.  The orginal bug was
fixed but the workaround was not removed.

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

This has three main parts: (1) support for the 440GP and 440GX processors,
(2) support for the "Ebony" and "Ocotea" reference boards for those processors,
and (3) support for 64-bit physical addresses.  The 440GP and 440GX are "Book E"
processors, and this introduces a CONFIG_BOOKE and some definitions that apply
to all Book E processors.

Having 64-bit physical addresses means that PTEs are now 64 bits.  The PTE pages
stay at 4kB, and the pgdir expands to 8kB.

amiflop didn't init the queue before assigning it to disk->queue. the
error handling was also immensely screwed, I've cleaned that up too.

into hostme.bitkeeper.com:/repos/c/cifs/linux-2.5cifs

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

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

into kroah.com:/home/greg/linux/BK/gregkh-2.6

includes these changes from viro
* switched ethertap to dynamic allocation
* ethertap: embedded ->priv
* ethertap: fixed resource leaks on failure exits
and from me
* get it out of the static device list completely.
* add dependency on NETLINK_DEV
* not really obsolete yet
* configurable number of interfaces

into kroah.com:/home/greg/linux/BK/gregkh-2.6

This makes "allyesconfig" do a better job.

broken on SMP (due to expecting global irq locking).

AFAICT this is ready for your next merge with Linus.

Ben's ohci stuff was not cooked yet, seemed like the
pm stuff wasn't yet supporting the hook(s) he needed.
RMK had similar issues w.r.t. PM on ARM too.


This patch includes:

   - updates from Benjamin Herrenschmidt to make usbcore
     behave a bit better during PM suspend (setting and
     checking hcd state).

   - related updates from me, making more paths into hcds
     fail when the driver is suspended.

   - updates based on some feedback from Alan Stern,
     notably including getting rid of a state we don't
     really need (most of the patch, by volume).

   - an experiment that tries to give a warning in the
     sadly common case of ACPI or APIC (etc) settings
     that need to change before USB works.

Net effect is that some of the PM issues start to get
resolved, maybe IRQ problems will be diagnosed quicker,
and some overdue cleanup gets started.

Please merge this minor fix:

   - loosen constraints on buffer allocation

This is needed before Alan's file-backed storage
gadget driver will initialize using net2280.