• Linus Torvalds's avatar
    Merge branch 'for-3.14/drivers' of git://git.kernel.dk/linux-block · 53d8ab29
    Linus Torvalds authored
    Pull block IO driver changes from Jens Axboe:
    
     - bcache update from Kent Overstreet.
    
     - two bcache fixes from Nicholas Swenson.
    
     - cciss pci init error fix from Andrew.
    
     - underflow fix in the parallel IDE pg_write code from Dan Carpenter.
       I'm sure the 1 (or 0) users of that are now happy.
    
     - two PCI related fixes for sx8 from Jingoo Han.
    
     - floppy init fix for first block read from Jiri Kosina.
    
     - pktcdvd error return miss fix from Julia Lawall.
    
     - removal of IRQF_SHARED from the SEGA Dreamcast CD-ROM code from
       Michael Opdenacker.
    
     - comment typo fix for the loop driver from Olaf Hering.
    
     - potential oops fix for null_blk from Raghavendra K T.
    
     - two fixes from Sam Bradshaw (Micron) for the mtip32xx driver, fixing
       an OOM problem and a problem with handling security locked conditions
    
    * 'for-3.14/drivers' of git://git.kernel.dk/linux-block: (47 commits)
      mg_disk: Spelling s/finised/finished/
      null_blk: Null pointer deference problem in alloc_page_buffers
      mtip32xx: Correctly handle security locked condition
      mtip32xx: Make SGL container per-command to eliminate high order dma allocation
      drivers/block/loop.c: fix comment typo in loop_config_discard
      drivers/block/cciss.c:cciss_init_one(): use proper errnos
      drivers/block/paride/pg.c: underflow bug in pg_write()
      drivers/block/sx8.c: remove unnecessary pci_set_drvdata()
      drivers/block/sx8.c: use module_pci_driver()
      floppy: bail out in open() if drive is not responding to block0 read
      bcache: Fix auxiliary search trees for key size > cacheline size
      bcache: Don't return -EINTR when insert finished
      bcache: Improve bucket_prio() calculation
      bcache: Add bch_bkey_equal_header()
      bcache: update bch_bkey_try_merge
      bcache: Move insert_fixup() to btree_keys_ops
      bcache: Convert sorting to btree_keys
      bcache: Convert debug code to btree_keys
      bcache: Convert btree_iter to struct btree_keys
      bcache: Refactor bset_tree sysfs stats
      ...
    53d8ab29
null_blk.c 14.4 KB