Merge remote-tracking branch 'block/for-next'

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

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

diff --cc block/cfq-iosched.c
Simple merge

diff --cc drivers/block/loop.c
Simple merge

diff --cc drivers/md/bcache/btree.c
index f9764e61978b5749487862b5ab88eb73b13f18ba,117a12a1f5fd0d9ef8afca9f184982399341e543..1ccb702c84d5c3b61b6bb8e11463304f707fb28d
--- 1/drivers/md/bcache/btree.c
--- 2/drivers/md/bcache/btree.c
+++ b/drivers/md/bcache/btree.c
@@@ -603,16 -676,22 +677,16 @@@ static unsigned long bch_mca_scan(struc
        struct cache_set *c = container_of(shrink, struct cache_set, shrink);
        struct btree *b, *t;
        unsigned long i, nr = sc->nr_to_scan;
 +      unsigned long freed = 0;
  
        if (c->shrinker_disabled)
 -              return 0;
 +              return SHRINK_STOP;
  
        if (c->try_harder)
 -              return 0;
 -
 -      /*
 -       * If nr == 0, we're supposed to return the number of items we have
 -       * cached. Not allowed to return -1.
 -       */
 -      if (!nr)
 -              return mca_can_free(c) * c->btree_pages;
 +              return SHRINK_STOP;
  
        /* Return -1 if we can't do anything right now */
-       if (sc->gfp_mask & __GFP_WAIT)
+       if (sc->gfp_mask & __GFP_IO)
                mutex_lock(&c->bucket_lock);
        else if (!mutex_trylock(&c->bucket_lock))
                return -1;
@@@ -633,10 -712,10 +707,10 @@@
                        break;
  
                if (++i > 3 &&
-                   !mca_reap(b, NULL, 0)) {
+                   !mca_reap(b, 0, false)) {
                        mca_data_free(b);
                        rw_unlock(true, b);
 -                      --nr;
 +                      freed++;
                }
        }
  

diff --cc drivers/md/bcache/sysfs.c
Simple merge

diff --cc fs/bio-integrity.c
Simple merge