lkml.org 
[lkml]   [2022]   [Feb]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the block tree with the fscrypt tree
On Mon, Feb 14, 2022 at 12:11:39PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the block tree got a conflict in:
>
> fs/iomap/direct-io.c
>
> between commit:
>
> 489734ef94f4 ("iomap: support direct I/O with fscrypt using blk-crypto")
>
> from the fscrypt tree and commit:
>
> 07888c665b40 ("block: pass a block_device and opf to bio_alloc")
>
> from the block tree.
>
> I fixed it up (I think - 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.
>

Looks fine to me, thanks.

- Eric

\
 
 \ /
  Last update: 2022-02-14 22:35    [W:0.049 / U:0.060 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site