Hi all,
Today's linux-next merge of the kvm-arm tree got a conflict in:
arch/arm64/kernel/head.S
between commits:
2ffac9e3fdbd ("arm64: head.S: cleanup SCTLR_ELx initialization")
d87a8e65b510 ("arm64: head.S: always initialize PSTATE")
from the arm64 tree and commit:
9c322020286c ("arm64: Extract parts of el2_setup into a macro")
from the kvm-arm tree.
I have no idea how to fix this up, so I just used the kvm-arm tree from
next-20201203 instead for today.
--
Cheers,
Stephen Rothwell
Attachment:
pgpZzjYOlcrwP.pgp
Description: OpenPGP digital signature
