Hello Daiane, Please merge v2 patch and ignore some patches has [rocko] on subject.
Thanks Chunrong -----Original Message----- From: angol...@gmail.com [mailto:angol...@gmail.com] On Behalf Of Daiane Angolini Sent: 2019年1月11日 22:43 To: C.r. Guo <chunrong....@nxp.com>; Otavio Salvador <ota...@ossystems.com.br> Cc: meta-freescale@yoctoproject.org Subject: Re: [meta-freescale] [PATCH 01/41] fmc: update to c7576ab On Thu, Jan 10, 2019 at 1:50 PM Daiane Angolini <daiane.l...@gmail.com> wrote: > > On Thu, Jan 10, 2019 at 12:50 PM C.r. Guo <chunrong....@nxp.com> wrote: > > > > From: Chunrong Guo <chunrong....@nxp.com> > > > > *update to lsdk 1812 tag > > include the following changes: > > c7576ab - Resolved compile warning on ubuntu with > > aarch64-linux-gnu-g++ v7.3 > > Would you, please, rebase your patchset and send it again? > > I have faced conflicts at least on patch 6 and 11. Hi Chunrong Guo, I have created a PR with your v2. Could you, please take a look on this? https://emea01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2FFreescale%2Fmeta-freescale%2Fpull%2F34%2Fcommits&data=02%7C01%7Cchunrong.guo%40nxp.com%7C8b41fdbc4f7741ee4eb408d677d31f23%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%7C1%7C636828145981154261&sdata=9NPU9%2BViDnJx%2B0WnyhptGj8c%2FasAvWOQtga4oN%2BbpXo%3D&reserved=0 I saw some patches has [rocko] on subject, could you, please elaborate what does it mean? Would it be a cherry pick to be backported to rocko? Thanks a lot, Daiane > > Thanks in advance, > Daiane > > > > Signed-off-by: Chunrong Guo <chunrong....@nxp.com> > > --- > > dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc_git.bb | 2 > > +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git > > a/dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc_git.bb > > b/dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc_git.bb > > index 4812ca3..cbf8e24 100644 > > --- a/dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc_git.bb > > +++ b/dynamic-layers/openembedded-layer/recipes-dpaa/fmc/fmc_git.bb > > @@ -7,7 +7,7 @@ PR = "r2" > > DEPENDS = "libxml2 fmlib tclap" > > > > SRC_URI = > > "git://source.codeaurora.org/external/qoriq/qoriq-components/fmc;nobranch=1" > > -SRCREV = "09a497fe92aa6cf784140b9084bccf4aaaa97700" > > +SRCREV = "c7576ab7fb6fb09b68ebc40531e5452fc89e5cd5" > > > > S = "${WORKDIR}/git" > > > > -- > > 2.7.4 > > > > -- > > _______________________________________________ > > meta-freescale mailing list > > meta-freescale@yoctoproject.org > > https://emea01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fl > > ists.yoctoproject.org%2Flistinfo%2Fmeta-freescale&data=02%7C01%7 > > Cchunrong.guo%40nxp.com%7C8b41fdbc4f7741ee4eb408d677d31f23%7C686ea1d > > 3bc2b4c6fa92cd99c5c301635%7C0%7C1%7C636828145981154261&sdata=v6F > > hJ5qdNfbZZP4DBXZy3LbxPhRS21NfyzGX14sZ4Gg%3D&reserved=0 -- _______________________________________________ meta-freescale mailing list meta-freescale@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-freescale