lkml.org 
[lkml]   [2016]   [Feb]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: linux-next: manual merge of the tip tree with Linus' tree
From
Date
On Wed, 2016-02-03 at 11:09 +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> kernel/memremap.c
>
> between commit:
>
> eb7d78c9e7f6 ("devm_memremap_pages: fix vmem_altmap lifetime +
> alignment handling")
>
> from Linus' tree and commit:
>
> 1c29f25bf5d6 ("memremap: Change region_intersects() to take @flags and
> @desc")
>
> from the tip tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Looks good. Thanks for the marge.
-Toshi

\
 
 \ /
  Last update: 2016-02-03 01:41    [W:0.041 / U:0.528 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site