> -----Original Message----- > From: Stoica Cristian-B18196 > Sent: Thursday, July 10, 2014 3:16 PM > To: Liu Ting-B28495; Otavio Salvador; Schmitt Richard-B43082 > Cc: [email protected] > Subject: RE: [meta-freescale] [meta-fsl-ppc][PATCH 1/4] > cryptodev-linux/module: > use fsl maintained source > > Hi Ting, > > > I tried to rebase our internal cryptodev-linux and openssl onto > > upstream but met lots of merge failures. > > Could you please help to identify what is still pending to be > > upstreamed, as Otavio said. > > [CS] cryptodev-linux from sdk-v1.6 tree has the merge conflicts already fixed. > Please check commit ID c9baf0623bdc55e8adfc91bf675e8148826d57d1.
Yes, I used this commit. But what I want is the pending patches (upstream base + these patches = released codes in sdk 1.6). I just send out v2 patches, please help to review. > > We're currently working with Phil Sutter from cryptodev to upstream our > patches. As the modifications involve some API changes, the process is > relatively slow but steady. Our plan is to make minimum modifications to > cryptodev internals so the rest of patches are easy to integrate. > > Cristian S. -- _______________________________________________ meta-freescale mailing list [email protected] https://lists.yoctoproject.org/listinfo/meta-freescale
