Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in
arch/arm/kvm/arm.c between commit 3414bbfff98b ("ARM: KVM: move exit
handler selection to a separate file") from the arm tree and commit
b23f7a09f935 ("treewide: Fix typo in printk and comments") from the
trivial tree.
The former removed the code that the latter fixed, so I did that and can
carry the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
pgpiIYhzG0HVR.pgp
Description: PGP signature
