Merge branch 'for-3.15/core' of git://git.kernel.dk/linux-block

Pull core block layer updates from Jens Axboe:
 "This is the pull request for the core block IO bits for the 3.15
  kernel.  It's a smaller round this time, it contains:

   - Various little blk-mq fixes and additions from Christoph and
     myself.

   - Cleanup of the IPI usage from the block layer, and associated
     helper code.  From Frederic Weisbecker and Jan Kara.

   - Duplicate code cleanup in bio-integrity from Gu Zheng.  This will
     give you a merge conflict, but that should be easy to resolve.

   - blk-mq notify spinlock fix for RT from Mike Galbraith.

   - A blktrace partial accounting bug fix from Roman Pen.

   - Missing REQ_SYNC detection fix for blk-mq from Shaohua Li"

* 'for-3.15/core' of git://git.kernel.dk/linux-block: (25 commits)
  blk-mq: add REQ_SYNC early
  rt,blk,mq: Make blk_mq_cpu_notify_lock a raw spinlock
  blk-mq: support partial I/O completions
  blk-mq: merge blk_mq_insert_request and blk_mq_run_request
  blk-mq: remove blk_mq_alloc_rq
  blk-mq: don't dump CPU -> hw queue map on driver load
  blk-mq: fix wrong usage of hctx->state vs hctx->flags
  blk-mq: allow blk_mq_init_commands() to return failure
  block: remove old blk_iopoll_enabled variable
  blktrace: fix accounting of partially completed requests
  smp: Rename __smp_call_function_single() to smp_call_function_single_async()
  smp: Remove wait argument from __smp_call_function_single()
  watchdog: Simplify a little the IPI call
  smp: Move __smp_call_function_single() below its safe version
  smp: Consolidate the various smp_call_function_single() declensions
  smp: Teach __smp_call_function_single() to check for offline cpus
  smp: Remove unused list_head from csd
  smp: Iterate functions through llist_for_each_entry_safe()
  block: Stop abusing rq->csd.list in blk-softirq
  block: Remove useless IPI struct initialization
  ...

diff --cc block/blk-core.c
Simple merge

diff --cc drivers/scsi/be2iscsi/be_main.c
Simple merge

diff --cc drivers/scsi/ipr.c
Simple merge

diff --cc fs/bio-integrity.c
index 4f70f383132cc9dfe143c570fbb9759967fefc6f,413312f2b2950af13d2875fac1ab136491ebd986..29696b78d1f49f105914dca5ce0a981fafb63a9c
--- 1/fs/bio-integrity.c
--- 2/fs/bio-integrity.c
+++ b/fs/bio-integrity.c
@@@ -315,11 -311,16 +311,15 @@@ static int bio_integrity_generate_verif
        struct blk_integrity_exchg bix;
        struct bio_vec bv;
        struct bvec_iter iter;
-       sector_t sector = bio->bi_iter.bi_sector;
-       unsigned int sectors, total;
+       sector_t sector;
 -      unsigned int sectors, total, ret;
++      unsigned int sectors, ret = 0;
        void *prot_buf = bio->bi_integrity->bip_buf;
  
-       total = 0;
+       if (operate)
+               sector = bio->bi_iter.bi_sector;
+       else
+               sector = bio->bi_integrity->bip_iter.bi_sector;
+ 
 -      total = ret = 0;
        bix.disk_name = bio->bi_bdev->bd_disk->disk_name;
        bix.sector_size = bi->sector_size;
  
@@@ -335,8 -344,8 +343,6 @@@
                sectors = bv.bv_len / bi->sector_size;
                sector += sectors;
                prot_buf += sectors * bi->tuple_size;
--              total += sectors * bi->tuple_size;
--              BUG_ON(total > bio->bi_integrity->bip_iter.bi_size);
  
                kunmap_atomic(kaddr);
        }

diff --cc include/linux/blk-mq.h
Simple merge

diff --cc kernel/sched/core.c
Simple merge

diff --cc kernel/sysctl.c
Simple merge

diff --cc net/core/dev.c
Simple merge