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
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
