lkml.org 
[lkml]   [2019]   [Apr]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: linux-next: manual merge of the block tree with Linus' tree
From
Date
On 4/14/19 9:06 PM, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the block tree got a conflict in:
>
> include/linux/bvec.h
>
> between commit:
>
> 1200e07f3ad4 ("block: don't use for-inside-for in bio_for_each_segment_all")
>
> from Linus' tree and commit:
>
> 52d52d1c98a9 ("block: only allow contiguous page structs in a bio_vec")
>
> from the block 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.

Looks fine Stephen - but due to this and the BFQ one, I've merged in
5.1-rc5 and resolved them as well. Tomorrow's branch should merge
cleanly for you.

--
Jens Axboe

\
 
 \ /
  Last update: 2019-04-15 16:17    [W:0.027 / U:2.744 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site