[meta-freescale] Merge of 3.14.52 GA into master and jethro

Otavio Salvador otavio.salvador at ossystems.com.br
Tue Feb 23 17:01:22 PST 2016


Hello Matt,

On Tue, Feb 23, 2016 at 12:23 PM, Matt Madison <matt at madison.systems> wrote:
> On Sat, Feb 20, 2016 at 5:38 AM, Otavio Salvador
> <otavio.salvador at ossystems.com.br> wrote:
>> Hello folks,
>>
>> I finally got the time slot to finish the 3.14.52 review and merge. I
>> have merged them, complete, on master-next and jethro-next.
>>
>> Please give the jethro-next a good test so we avoid bad surprises. I
>> intend to merge jethro-next on Feb 26th.
>
> Otavio,
>
> I ran into an issue building the 3.14-1.1.x-imx kernel using my custom
> kernel configuration - duplicate symbols linking the kernel image.
>
> The source of the conflict is having both of these patches in place:
>
> 3241216e250430a27b30eaf7f7df3e5e006acfb5 MGS-577 ARM: Export the cache
> management symbols when !MULTI_CACHE
> 6325d57e9677b417552ac76ada0ee91fa4c98566 arm: Export cache flush
> management symbols when !MULTI_CACHE
>
> and building for just ARMv7 CPUs.  Reverting one or the other of them
> fixes the issue.  I think that 3241216e is probably the better patch.

Thanks for your report and detailed analysis. I fixed jethro-next and
master-next, please check.

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750


More information about the meta-freescale mailing list