linux-next: manual merge of the tty tree with Linus' tree

[Stephen Rothwell]

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).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgpsvvGaY4RZN.pgp
Description: PGP signature