Skip to content
  • Linus Torvalds's avatar
    Merge branch 'for-3.17/core' of git://git.kernel.dk/linux-block · 4a319a49
    Linus Torvalds authored
    Pull block core bits from Jens Axboe:
     "Small round this time, after the massive blk-mq dump for 3.16.  This
      pull request contains:
    
       - Fixes for max_sectors overflow in ioctls from Akinoby Mita.
    
       - Partition off-by-one bug fix in aix partitions from Dan Carpenter.
    
       - Various small partition cleanups from Fabian Frederick.
    
       - Fix for the block integrity code sometimes returning the wrong
         vector count from Gu Zheng.
    
       - Cleanup an re-org of the blk-mq queue enter/exit percpu counters
         from Tejun.  Dependent on the percpu pull for 3.17 (which was in
         the block tree too), that you have already pulled in.
    
       - A blkcg oops fix, also from Tejun"
    
    * 'for-3.17/core' of git://git.kernel.dk/linux-block:
      partitions: aix.c: off by one bug
      blkcg: don't call into policy draining if root_blkg is already gone
      Revert "bio: modify __bio_add_page() to accept pages that don't start a new segment"
      bio: modify __bio_add_page() to accept pages that don't start a new segment
      block: fix SG_[GS]ET_RESERVED_SIZE ioctl when max_sectors is huge
      block: fix BLKSECTGET ioctl when max_sectors is greater than USHRT_MAX
      block/partitions/efi.c: kerneldoc fixing
      block/partitions/msdos.c: code clean-up
      block/partitions/amiga.c: replace nolevel printk by pr_err
      block/partitions/aix.c: replace count*size kzalloc by kcalloc
      bio-integrity: add "bip_max_vcnt" into struct bio_integrity_payload
      blk-mq: use percpu_ref for mq usage count
      blk-mq: collapse __blk_mq_drain_queue() into blk_mq_freeze_queue()
      blk-mq: decouble blk-mq freezing from generic bypassing
      block, blk-mq: draining can't be skipped even if bypass_depth was non-zero
      blk-mq: fix a memory ordering bug in blk_mq_queue_enter()
    4a319a49