From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by yocto-www.yoctoproject.org (Postfix, from userid 118) id 752ECE009DF; Wed, 17 Jun 2015 08:01:31 -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=-1.0 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, FREEMAIL_FROM,NML_ADSP_CUSTOM_MED autolearn=no version=3.3.1 X-Spam-HAM-Report: * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider * (samoht.yrag[at]gmail.com) * 0.0 DKIM_ADSP_CUSTOM_MED No valid author signature, adsp_override is * CUSTOM_MED * -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% * [score: 0.0000] * 0.9 NML_ADSP_CUSTOM_MED ADSP custom_med hit, and not from a mailing list Received: from mail.chez-thomas.org (mail.mlbassoc.com [65.100.170.105]) by yocto-www.yoctoproject.org (Postfix) with ESMTP id 37738E00992 for ; Wed, 17 Jun 2015 08:01:27 -0700 (PDT) Received: by mail.chez-thomas.org (Postfix, from userid 1998) id 85973F811D7; Wed, 17 Jun 2015 09:01:27 -0600 (MDT) Received: from [192.168.1.114] (zeus [192.168.1.114]) by mail.chez-thomas.org (Postfix) with ESMTP id 9BEDEF811D8; Wed, 17 Jun 2015 09:01:26 -0600 (MDT) Message-ID: <55818BDB.8050305@gmail.com> Date: Wed, 17 Jun 2015 09:01:47 -0600 From: Gary Thomas User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: meta-freescale@yoctoproject.org References: <1434460691-3458-1-git-send-email-gary@mlbassoc.com> <55818341.7000103@mlbassoc.com> <55818841.6050204@mlbassoc.com> In-Reply-To: Subject: Re: [PATCH] imx-gpu-viv: Avoid duplicate values in PROVIDES 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: Wed, 17 Jun 2015 15:01:31 -0000 Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit On 2015-06-17 08:56, Fabio Estevam wrote: > On Wed, Jun 17, 2015 at 11:46 AM, Gary Thomas wrote: > >> I'm still confused - it applies just fine for me: >> >> gthomas@Zeus:/tmp$ git clone git://git.yoctoproject.org/meta-fsl-arm >> Cloning into 'meta-fsl-arm'... >> remote: Counting objects: 10025, done. >> remote: Compressing objects: 100% (3426/3426), done. >> remote: Total 10025 (delta 6192), reused 10014 (delta 6181) >> Receiving objects: 100% (10025/10025), 37.81 MiB | 1.39 MiB/s, done. >> Resolving deltas: 100% (6192/6192), done. >> Checking connectivity... done. >> gthomas@Zeus:/tmp$ cd meta-fsl-arm >> gthomas@Zeus:/tmp/meta-fsl-arm$ git am >> > Applying: imx-gpu-viv: Avoid duplicate values in PROVIDES >> >> What am I doing differently from you? > > I think you missed to change the branch to master. The checkout defaults to master: gthomas@Zeus:/tmp/meta-fsl-arm$ git branch -a * master remotes/origin/1.4_M3 remotes/origin/1.4_M5 remotes/origin/HEAD -> origin/master remotes/origin/daisy remotes/origin/danny remotes/origin/danny-next remotes/origin/denzil remotes/origin/dizzy remotes/origin/dizzy-next remotes/origin/dora remotes/origin/dora-next remotes/origin/dylan remotes/origin/dylan-next remotes/origin/fido remotes/origin/master remotes/origin/master-next > Your patch also fails for me when I try to apply it. There's something strange going on here... Is your tree the same as mine (I checked it out directly - I don't use the BSP setup scripts/repo) git://git.yoctoproject.org/meta-fsl-arm