From: Ravikiran G Thirumalai <kiran@in.ibm.com>

The routine disk_round_stats showed up considerably under oprofile for high
disk io load (four processes doing dd to the same disk (different
partitions) on a 4 way).

This is because the counter in_flight which is per-cpu right now gets read
every time disk_round_stats gets called.  Per cpu counters like disk
statistics improve write speed, but reads are slow (since all cpus' local
counter values have to be read and summed up).  Considering the fact that
in_flight counter is modified post disk_round_stats (which reads the
in_flight counter) it is better not to per-cpu this counter.

Following patch does just that.  Below is the profile comparison before and
after the change.  This was on a 4 way PIII Xeon, 1G ram, 2.6.0-test4-mm2. 

Before:
c010aa60 2910109  92.2249     poll_idle
c0275340 23208    0.73549     __copy_to_user_ll
c02753b0 11191    0.354657    __copy_from_user_ll
c0114aa0 7168     0.227163    mark_offset_tsc
c011ad10 6767     0.214455    schedule
c011a2b0 6741     0.213631    load_balance
c0138890 6710     0.212648    __generic_file_aio_write_nolock
c011d302 4683     0.14841     .text.lock.sched
c02e4b50 4533     0.143656    ahc_linux_isr
c029cec0 3582     0.113518    disk_round_stats
c0119b40 3509     0.111205    try_to_wake_up
c029d320 3306     0.104771    __make_request
c01567d0 3300     0.104581    __block_write_full_page
c0156c00 3299     0.104549    __block_prepare_write

After:
c010aa60 2777940  92.1302     poll_idle
c0275340 23479    0.778679    __copy_to_user_ll
c02753b0 10943    0.362924    __copy_from_user_ll
c0114aa0 7022     0.232884    mark_offset_tsc
c0138890 6988     0.231757    __generic_file_aio_write_nolock
c011ad10 6607     0.219121    schedule
c011d302 5771     0.191395    .text.lock.sched
c02e4a60 4458     0.147849    ahc_linux_isr
c011a2b0 3921     0.13004     load_balance
c01567d0 3569     0.118366    __block_write_full_page
c029d2a0 3540     0.117404    __make_request
...
c029ceb0 311      0.0103143   disk_round_stats
c011d5b0 299      0.00991631  remove_wait_queue

From: Rusty Russell <rusty@rustcorp.com.au>

Previously, default aliases were hardwired into modutils.  Now they should
be inside the modules, using MODULE_ALIAS() (they will be overridden by any
user alias).

From: Rusty Russell <rusty@rustcorp.com.au>

Previously, default aliases were hardwired into modutils.  Now they should
be inside the modules, using MODULE_ALIAS() (they will be overridden by any
user alias).

From: Mitchell Blank Jr <mitch@sfgoth.com>

This patch makes the following improvements to might_sleep():

 o Add a "might_sleep_if()" macro for when we might sleep only if some
   condition is met.  It's a bit tidier, and has an unlikely() in it.

 o Add might_sleep checks to skb_share_check() and skb_unshare() which
   sometimes need to allocate memory.

 o Make all architectures call might_sleep() in both down() and
   down_interruptible().  Before only ppc, ppc64, and i386 did this check.
   (sh did the check on down() but not down_interruptible())

Add checks for kfree() of a page which was allocated with __alloc_pages(),
and for free_pages() of a page which was allocated with kmalloc().

fs/proc/proc_misc.c: In function `show_stat':
fs/proc/proc_misc.c:423: `irq_desc' undeclared (first use in this function)

From: Dmitry Torokhov <dtor_core@ameritech.net>

8250_acpi module does not have MODULE_LICENSE specified.  8250_gsc does not
have it either but as I can't compile it I did not touch it.

From: Nick Piggin <piggin@cyberone.com.au>

This fixes a bug in deadline and AS that causes insert_here to be ignored on
blk_fs_requests. This has been causing problems with SCSI requeueing code.
It makes elevator insertion more correct as advertised wrt insert_here and
REQ_SOFTBARRIER.

It also fixes a buglet in the as_requeue code where the request wasn't being
put into the front of the list (in rare cases).

From: Andrey Panin <pazke@donpac.ru>

Add a config option which allows ioport/mmio selection for QLA1280 SCSI
driver.

With this patch applied QLA1280 can be used on Visws again.

The new HPET RTC emulation code uses a function in rtc.c, get_rtc_time().

So that function was made non-static.  Problem is, the same function name is
used elsewhere by some architectures, so there will be linkage problems.

And rtc_get_time() is used too, so I renamed it to rtc_get_rtc_time().

Also, the HPET code was setting CONFIG_HPET_EMULATE_RTC by hand in a header
file.  Fix it to use the Kconfig system properly.

From: "Randy.Dunlap" <rddunlap@osdl.org>

Anton needs this for ppc64.  Things overflow with a huge number of CPUs.

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