On Mon, May 05, 2014 at 03:41:03PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the tty tree got a conflict in
> arch/arm64/kernel/early_printk.c between commit f774b7d10e21 ("arm64:
> fixmap: fix missing sub-page offset for earlyprintk") from the tree and
> commit 8ef0ed95ee04 ("arm64: remove arch specific earlyprintk") from the
> tty tree.
>
> I fixed it up (I removed the file) and can carry the fix as necessary (no
> action is required).
That sounds fine to me, thanks.
greg k-h
--
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
