Discussion:
[meta-freescale] linux-fslc merge 'v4.9.105' into imx_4.9.x_2.0.0_ga
Johannes Pointner
2018-09-10 13:28:21 UTC
Permalink
Hello,

I just noticed that something went wrong during the merge of tag
'v4.9.105' into imx_4.9.x_2.0.0_ga (commit id
83174b99b192ce8b1f1bef0dcfd700c6f6b1a1b9).
If you take a look a the file arch/arm/include/asm/kvm_mmu.h it has
after the merge the same content as arch/arm64/include/asm/kvm_mmu.h
--
Otavio Salvador
2018-09-10 14:04:39 UTC
Permalink
On Mon, Sep 10, 2018 at 10:29 AM Johannes Pointner
Post by Johannes Pointner
I just noticed that something went wrong during the merge of tag
'v4.9.105' into imx_4.9.x_2.0.0_ga (commit id
83174b99b192ce8b1f1bef0dcfd700c6f6b1a1b9).
If you take a look a the file arch/arm/include/asm/kvm_mmu.h it has
after the merge the same content as arch/arm64/include/asm/kvm_mmu.h
Oh ... is it possible for you to prepare a PR fixing it?
--
Otavio Salvador O.S. Systems
http://www.ossystems.com.br http://code.ossystems.com.br
Mobile: +55 (53) 9 9981-7854 Mobile: +1 (347) 903-9750
--
Loading...