linux-next: manual merge of the device-mapper tree with the block tree

From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Alasdair G Kergon <agk@redhat.com>,
	Mike Snitzer <snitzer@kernel.org>, Jens Axboe <axboe@kernel.dk>
Cc: Christoph Hellwig <hch@lst.de>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the device-mapper tree with the block tree
Date: Thu, 31 Mar 2022 09:44:25 +1100	[thread overview]
Message-ID: <20220331094425.0a9e0b92@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 1535 bytes --]

Hi all,

Today's linux-next merge of the device-mapper tree got a conflict in:

  include/linux/bio.h

between commit:

  57c47b42f454 ("block: turn bio_kmalloc into a simple kmalloc wrapper")

from the block tree and commit:

  135eaaabd22a ("block: allow using the per-cpu bio cache from bio_alloc_bioset")

from the device-mapper tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc include/linux/bio.h
index ab77473c855b,8c42b67c41c7..000000000000

--- a/include/linux/bio.h
+++ b/include/linux/bio.h
@@@ -405,9 -408,7 +405,7 @@@ extern int bioset_init_from_src(struct 
  struct bio *bio_alloc_bioset(struct block_device *bdev, unsigned short nr_vecs,
  			     unsigned int opf, gfp_t gfp_mask,
  			     struct bio_set *bs);
- struct bio *bio_alloc_kiocb(struct kiocb *kiocb, struct block_device *bdev,
- 		unsigned short nr_vecs, unsigned int opf, struct bio_set *bs);
 -struct bio *bio_kmalloc(gfp_t gfp_mask, unsigned short nr_iovecs);
 +struct bio *bio_kmalloc(unsigned short nr_vecs, gfp_t gfp_mask);
  extern void bio_put(struct bio *);
  
  struct bio *bio_alloc_clone(struct block_device *bdev, struct bio *bio_src,

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
