On Tue, Mar 22, 2016 at 10:15:49AM +1100, Stephen Rothwell wrote:
> Today's linux-next merge of the arm64 tree got a conflict in:
>
> arch/arm64/mm/init.c
>
> between commit:
>
> dfd55ad85e4a ("arm64: vmemmap: use virtual projection of linear region")
>
> from Linus' tree and commit:
>
> f09f1bacfe2b ("arm64: Split pr_notice("Virtual kernel memory layout...") into multiple pr_cont()")
>
> from the arm64 tree.
The fix looks fine. Thanks.
--
Catalin
--
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
