• Linus Torvalds's avatar
    Merge branch 'for-linus' of git://git.kernel.dk/linux-block · 3ec1e88b
    Linus Torvalds authored
    Says Jens:
    
     "Time to push off some of the pending items.  I really wanted to wait
      until we had the regression nailed, but alas it's not quite there yet.
      But I'm very confident that it's "just" a missing expire on exit, so
      fix from Tejun should be fairly trivial.  I'm headed out for a week on
      the slopes.
    
      - Killing the barrier part of mtip32xx.  It doesn't really support
        barriers, and it doesn't need them (writes are fully ordered).
    
      - A few fixes from Dan Carpenter, preventing overflows of integer
        multiplication.
    
      - A fixup for loop, fixing a previous commit that didn't quite solve
        the partial read problem from Dave Young.
    
      - A bio integer overflow fix from Kent Overstreet.
    
      - Improvement/fix of the door "keep locked" part of the cdrom shared
        code from Paolo Benzini.
    
      - A few cfq fixes from Shaohua Li.
    
      - A fix for bsg sysfs warning when removing a file it did not create
        from Stanislaw Gruszka.
    
      - Two fixes for floppy from Vivek, preventing a crash.
    
      - A few block core fixes from Tejun.  One killing the over-optimized
        ioc exit path, cleaning that up nicely.  Two others fixing an oops
        on elevator switch, due to calling into the scheduler merge check
        code without holding the queue lock."
    
    * 'for-linus' of git://git.kernel.dk/linux-block:
      block: fix lockdep warning on io_context release put_io_context()
      relay: prevent integer overflow in relay_open()
      loop: zero fill bio instead of return -EIO for partial read
      bio: don't overflow in bio_get_nr_vecs()
      floppy: Fix a crash during rmmod
      floppy: Cleanup disk->queue before caling put_disk() if add_disk() was never called
      cdrom: move shared static to cdrom_device_info
      bsg: fix sysfs link remove warning
      block: don't call elevator callbacks for plug merges
      block: separate out blk_rq_merge_ok() and blk_try_merge() from elevator functions
      mtip32xx: removed the irrelevant argument of mtip_hw_submit_io() and the unused member of struct driver_data
      block: strip out locking optimization in put_io_context()
      cdrom: use copy_to_user() without the underscores
      block: fix ioc locking warning
      block: fix NULL icq_cache reference
      block,cfq: change code order
    3ec1e88b
fork.c 42.6 KB