From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by yocto-www.yoctoproject.org (Postfix, from userid 118) id BDE20E0056A; Thu, 10 Jul 2014 05:19:42 -0700 (PDT) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on yocto-www.yoctoproject.org X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 X-Spam-HAM-Report: * -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% * [score: 0.0000] * 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily * valid * -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature * -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low * trust * [209.85.219.45 listed in list.dnswl.org] Received: from mail-oa0-f45.google.com (mail-oa0-f45.google.com [209.85.219.45]) by yocto-www.yoctoproject.org (Postfix) with ESMTP id C8B8DE00559 for ; Thu, 10 Jul 2014 05:19:31 -0700 (PDT) Received: by mail-oa0-f45.google.com with SMTP id o6so9786424oag.18 for ; Thu, 10 Jul 2014 05:19:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date:message-id:subject :from:to:cc:content-type:content-transfer-encoding; bh=BMA3l5A8i4g5iboKnxvkhB88q0xqRJT01funD6PNhKQ=; b=d7vVVr2MZynm6MteCb1k8lIsvdOAUoUGpoz61ZNyaytV1SKUU9LayxAqp8xbd/JT3y TIJb4K3hInCuYOM0ktzCNAR34J+rFMwvYj6XtpEZiAlgOMpnCrA936Y+nEf3sLwqcgq7 pVpZ7Jn5PoI7DyEPc0MqTK2tNF4VN8ntuRIonS7Hr+gmvrrs6nYUQpRG5K/ddedmc2td /JzpyahNUBZ7HeIZszcKzuKFxBU/Z9yp9DyljGsebbl0dEpvX+4tZPs/IKI3dCA6ZuUe 0Hxi7G3DE9ZAwtIkij0EDBt+H0wprhJoY5VewyN6U1SlWeZT/sYP7PKYJ04yaepoYm0F kbnQ== MIME-Version: 1.0 X-Received: by 10.182.19.196 with SMTP id h4mr54736320obe.20.1404994770805; Thu, 10 Jul 2014 05:19:30 -0700 (PDT) Sender: otavio.salvador@gmail.com Received: by 10.182.50.135 with HTTP; Thu, 10 Jul 2014 05:19:30 -0700 (PDT) In-Reply-To: References: <1404893803-3879-1-git-send-email-ting.liu@freescale.com> Date: Thu, 10 Jul 2014 09:19:30 -0300 X-Google-Sender-Auth: lsAw8I1IlrzJbhQFYOODZIp_pFc Message-ID: From: Otavio Salvador To: "cristian.stoica@freescale.com" Cc: "meta-freescale@yoctoproject.org" , Richard Schmitt Subject: Re: [meta-fsl-ppc][PATCH 1/4] cryptodev-linux/module: use fsl maintained source X-BeenThere: meta-freescale@yoctoproject.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Usage and development list for the meta-fsl-* layers List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Jul 2014 12:19:42 -0000 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Hello Cristian, On Thu, Jul 10, 2014 at 4:15 AM, cristian.stoica@freescale.com wrote: >> 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 f= ixed. Please check commit ID c9baf0623bdc55e8adfc91bf675e8148826d57d1. > > We're currently working with Phil Sutter from cryptodev to upstream our p= atches. As the modifications involve some API changes, the process is relat= ively slow but steady. Our plan is to make minimum modifications to crypto= dev internals so the rest of patches are easy to integrate. Is it possible to "rebase" the patches and include them in the recipe? In case it is not and we do need a fork it is better to use cryptodev-linux-fsl-ppc and cryptodev-module-fsl-ppc recipes to make clear it is a fork. Either way works for me. Fully upstreamed code is of course the best alternative. --=20 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