On Mon, Jan 25, 2016 at 09:25:10AM +1100, Stephen Rothwell wrote:
>
> Today's linux-next merge of the mips tree got conflicts in:
>
> arch/mips/kvm/tlb.c
>
> between commit:
>
> ba049e93aef7 ("kvm: rename pfn_t to kvm_pfn_t")
>
> from Linus' tree and commit:
>
> cb1b447f0c36 ("MIPS: KVM: Convert EXPORT_SYMBOL to _GPL")
>
> from the mips tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Linus has pulled so I'm reseting my branch for you back to v4.5-rc1.
Thanks,
Ralf
