commit 51bb296b09a83ee1aae025778db38f9d2cc7bb1a
Merge: dc79d2f 4b27e1b
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Tue Nov 3 18:16:21 2009 -0800

    Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
    
    * 'for-linus' of git://git.kernel.dk/linux-2.6-block:
      cfq-iosched: limit coop preemption
      cfq-iosched: fix bad return value cfq_should_preempt()
      backing-dev: bdi sb prune should be in the unregister path, not destroy
      Fix bio_alloc() and bio_kmalloc() documentation
      bio_put(): add bio_clone() to the list of functions in the comment

commit dc79d2f21a2dc19df26f0cb0b46be2d6241b627b
Merge: b419148 f38e35b
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Tue Nov 3 18:15:18 2009 -0800

    Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
    
    * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
      sata_via: Remove redundant device ID for VIA VT8261
      drivers/ata/libata: Move dereference after NULL test
      ahci: Enable SB600 64bit DMA on MSI K9A2 Platinum v2

commit f38e35b43f2924b3b4e51147b7193f32e9276db4
Author: JosephChan@via.com.tw <JosephChan@via.com.tw>
Date:   Mon Nov 2 19:36:08 2009 +0800

    sata_via: Remove redundant device ID for VIA VT8261
    
    Just remove redundant device ID for VIA VT8261.
    The device ID 0x9000 and 0x9040 are redundant (for VT8261).
    The 0x9040 is reserved for other usage.
    
    Signed-off-by: Joseph Chan <josephchan@via.com.tw>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit a1104016ce8f7750ecd8ca6129786bc549aa5c38
Author: Julia Lawall <julia@diku.dk>
Date:   Sat Oct 17 08:41:47 2009 +0200

    drivers/ata/libata: Move dereference after NULL test
    
    In each case, if the NULL test on qc is needed, then the derefernce
    should be after the NULL test.
    
    A simplified version of the semantic match that detects this problem is as
    follows (http://coccinelle.lip6.fr/):
    
    // <smpl>
    @match exists@
    expression x, E;
    identifier fld;
    @@
    
    * x->fld
      ... when != \(x = E\|&x\)
    * x == NULL
    // </smpl>
    
    Signed-off-by: Julia Lawall <julia@diku.dk>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit e65cc194f7628ecaa02462f22f42fb09b50dcd49
Author: Mark Nelson <mdnelson8@gmail.com>
Date:   Tue Nov 3 20:06:48 2009 +1100

    ahci: Enable SB600 64bit DMA on MSI K9A2 Platinum v2
    
    Like the Asus M2A-VM, MSI's K9A2 Platinum (MS-7376) can also support 64bit
    DMA. It is a new enough board that all the BIOS releases work correctly with
    64bit DMA enabled.
    
    Signed-off-by: Mark Nelson <mdnelson8@gmail.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit 4b27e1bb442e964903f8a3fa6bdf33a602dc0941
Author: Shaohua Li <shaohua.li@intel.com>
Date:   Tue Nov 3 20:25:02 2009 +0100

    cfq-iosched: limit coop preemption
    
    CFQ has an optimization for cooperated applications. if several
    io-context have close requests, they will get boost. But the
    optimization get abused. Considering thread a, b, which work on one
    file. a reads sectors s, s+2, s+4, ...; b reads sectors s+1, s+3, s
    +5, ... Both a and b are sequential read, so they can open idle window.
    a reads a sector s and goes to idle window and wakeup b. b reads sector
    s+1, since in current implementation, cfq_should_preempt() thinks a and
    b are cooperators, b will preempt a. b then reads sector s+1 and goes to
    idle window and wakeup a. for the same reason, a will preempt b and
    reads s+2. a and b will continue the circle. The circle will be very
    long, and a and b will occupy whole disk queue. Other applications will
    nearly have no chance to run.
    
    Fix this limiting coop preempt until a queue is scheduled normally
    again.
    
    Signed-off-by: Shaohua Li <shaohua.li@intel.com>
    Acked-by: Jeff Moyer <jmoyer@redhat.com>
    Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

commit e6ec4fe24572ee265723d895ec4159e5559c8266
Author: Jens Axboe <jens.axboe@oracle.com>
Date:   Tue Nov 3 20:21:35 2009 +0100

    cfq-iosched: fix bad return value cfq_should_preempt()
    
    Commit a6151c3a5c8e1ff5a28450bc8d6a99a2a0add0a7 inadvertently reversed
    a preempt condition check, potentially causing a performance regression.
    Make the meta check correct again.
    
    Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

commit 8c4db3355b0fcc9ad77431f15b955efa0645b5d0
Author: Jens Axboe <jens.axboe@oracle.com>
Date:   Tue Nov 3 20:18:44 2009 +0100

    backing-dev: bdi sb prune should be in the unregister path, not destroy
    
    Commit 592b09a42fc3ae6737a0f3ecf4fee42ecd0296f8 was different from
    the tested path, in that it moved the bdi super_block prune from
    unregister to destroy context. This doesn't fully fix the sync hang
    bug on unexpected device removal, as need to prune the bdi cache
    pointer before killing flusher thread.
    
    Tested-by: Artur Skawina <art.08.09@gmail.com>
    Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

commit 5f04eeb8a76521dec371ceb05e8263889a8af2bc
Author: Alberto Bertogli <albertito@blitiri.com.ar>
Date:   Mon Nov 2 11:39:42 2009 +0100

    Fix bio_alloc() and bio_kmalloc() documentation
    
    Commit 451a9ebf accidentally broke bio_alloc() and bio_kmalloc() comments by
    (almost) swapping them.
    
    This patch fixes that, by placing the comments in the right place.
    
    Signed-off-by: Alberto Bertogli <albertito@blitiri.com.ar>
    Acked-by: Tejun Heo <tj@kernel.org>
    Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

commit ad0bf11070ebb3c95f8ce82e6219dbd79c8e8b69
Author: Alberto Bertogli <albertito@blitiri.com.ar>
Date:   Mon Nov 2 11:39:22 2009 +0100

    bio_put(): add bio_clone() to the list of functions in the comment
    
    In bio_put()'s comment, add bio_clone() to the list of functions that can
    give you a bio reference.
    
    Signed-off-by: Alberto Bertogli <albertito@blitiri.com.ar>
    Signed-off-by: Jens Axboe <jens.axboe@oracle.com>