linux-next: build failure after merge of the block tree

[Stephen Rothwell]

Hi Jens,

After merging the block tree, today's linux-next build (x86_64
allmodconfig) failed like this:

block/bio-integrity.c: In function '__bio_integrity_endio':
block/bio-integrity.c:388:51: error: 'struct bio' has no member named 'bi_bdev'
  struct blk_integrity *bi = bdev_get_integrity(bio->bi_bdev);
                                                   ^

Caused by commit

  74d46992e0d9 ("block: replace bi_bdev with a gendisk pointer and partitions index")

interacting with commit

  c775d2098d35 ("bio-integrity: Fix regression if profile verify_fn is NULL")

from Linus' tree (before v4.13-rc5).

This should have been fixed up in commit

  3b8848b41130 ("Merge branch 'master' into for-next")

I have used the block tree from next-20170823 for today.

-- 
Cheers,
Stephen Rothwell