Merge tag 'v4.13-rc7' into for-4.14/block-postmerge

Linux 4.13-rc7

Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --cc MAINTAINERS
Simple merge

diff --cc block/bfq-iosched.h
Simple merge

diff --cc block/bio-integrity.c
index 553d75e357b4a456fd7524edf46a23711f161a7c,9b1ea478577b033195f34b457c85ad16eb759c6a..5df32907ff3bf8f7219f7518edbfe05850f46ea1
--- 1/block/bio-integrity.c
--- 2/block/bio-integrity.c
+++ b/block/bio-integrity.c
@@@ -385,12 -387,11 +385,11 @@@ static void bio_integrity_verify_fn(str
   */
  bool __bio_integrity_endio(struct bio *bio)
  {
 -      struct blk_integrity *bi = bdev_get_integrity(bio->bi_bdev);
 +      struct blk_integrity *bi = blk_get_integrity(bio->bi_disk);
+       struct bio_integrity_payload *bip = bio_integrity(bio);
  
        if (bio_op(bio) == REQ_OP_READ && !bio->bi_status &&
-           bi->profile->verify_fn) {
-               struct bio_integrity_payload *bip = bio_integrity(bio);
- 
+           (bip->bip_flags & BIP_BLOCK_INTEGRITY) && bi->profile->verify_fn) {
                INIT_WORK(&bip->bip_work, bio_integrity_verify_fn);
                queue_work(kintegrityd_wq, &bip->bip_work);
                return false;

diff --cc block/blk-mq-debugfs.c
Simple merge

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

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

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

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

diff --cc drivers/block/xen-blkfront.c
Simple merge

diff --cc drivers/block/zram/zram_drv.c
Simple merge

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

diff --cc drivers/md/raid5-cache.c
Simple merge

diff --cc drivers/nvme/host/core.c
Simple merge

diff --cc fs/btrfs/disk-io.c
Simple merge

diff --cc fs/btrfs/raid56.c
Simple merge

diff --cc fs/btrfs/volumes.c
Simple merge

diff --cc fs/iomap.c
Simple merge

diff --cc include/linux/blkdev.h
Simple merge

diff --cc include/linux/fs.h
Simple merge

diff --cc kernel/cgroup/cgroup.c
Simple merge

diff --cc mm/page_io.c
index 9cf1bc751d790ab154332cf7de2af9007f56c7ef,5f61b54ee1f38e0bb7ae7bee3efe3257f8967a44..868e7a96bf8a39aa9cd4ad5606db1a0eb0f080d8
--- 1/mm/page_io.c
--- 2/mm/page_io.c
+++ b/mm/page_io.c
@@@ -378,7 -379,12 +380,12 @@@ int swap_readpage(struct page *page, bo
                ret = -ENOMEM;
                goto out;
        }
 -      bdev = bio->bi_bdev;
+       /*
+        * Keep this task valid during swap readpage because the oom killer may
+        * attempt to access it in the page fault retry time check.
+        */
+       get_task_struct(current);
 +      disk = bio->bi_disk;
        bio->bi_private = current;
        bio_set_op_attrs(bio, REQ_OP_READ, 0);
        count_vm_event(PSWPIN);