From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.windriver.com (mail.windriver.com [147.11.1.11]) by mail.openembedded.org (Postfix) with ESMTP id 5DC7678481 for ; Mon, 14 Aug 2017 19:24:58 +0000 (UTC) Received: from ALA-HCB.corp.ad.wrs.com (ala-hcb.corp.ad.wrs.com [147.11.189.41]) by mail.windriver.com (8.15.2/8.15.1) with ESMTPS id v7EJOxWd011083 (version=TLSv1 cipher=AES128-SHA bits=128 verify=FAIL) for ; Mon, 14 Aug 2017 12:24:59 -0700 (PDT) Received: from ALA-MBD.corp.ad.wrs.com ([169.254.3.209]) by ALA-HCB.corp.ad.wrs.com ([147.11.189.41]) with mapi id 14.03.0361.001; Mon, 14 Aug 2017 12:24:58 -0700 From: "Slater, Joseph" To: "openembedded-core@lists.openembedded.org" Thread-Topic: master-next Thread-Index: AdMVMLzpcr68IJEkQ36KCOkIRTl5Zw== Date: Mon, 14 Aug 2017 19:24:57 +0000 Message-ID: <007BD92917A2324FA403BCF9A464CF84CF3D645F@ALA-MBD.corp.ad.wrs.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [147.11.157.209] MIME-Version: 1.0 Subject: master-next X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Aug 2017 19:24:59 -0000 Content-Language: en-US Content-Type: multipart/alternative; boundary="_000_007BD92917A2324FA403BCF9A464CF84CF3D645FALAMBDcorpadwrs_" --_000_007BD92917A2324FA403BCF9A464CF84CF3D645FALAMBDcorpadwrs_ Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Is there something "different" about this branch? I find that if I have a = local master and master-next, and am on master, when I do a pull master-nex= t will wind up both ahead and behind origin/master-next. If I switch to ma= ster-next and rebase, it might fail, or it might leave me with one or more = "local" commits that are not mine. For the case I tried today, it is comm= it 3d4f241 which seems to only be on my local master-next, but came from Ma= rk Horn/Ross Burton on August 2. Can anyone explain this? Joe --_000_007BD92917A2324FA403BCF9A464CF84CF3D645FALAMBDcorpadwrs_ Content-Type: text/html; charset="us-ascii" Content-Transfer-Encoding: quoted-printable

Is there something “different” about thi= s branch?  I find that if I have a local master and master-next, and a= m on master, when I do a pull master-next will wind up both ahead and behin= d origin/master-next.  If I switch to master-next and rebase, it might fail, or it might leave me with one or more “local&= #8221; commits that are not mine.   For the case I tried today, i= t is commit 3d4f241 which seems to only be on my local master-next, but cam= e from Mark Horn/Ross Burton on August 2.

 

Can anyone explain this?

 

Joe

 

--_000_007BD92917A2324FA403BCF9A464CF84CF3D645FALAMBDcorpadwrs_-- From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mail.openembedded.org (Postfix) with ESMTP id A538C78470 for ; Mon, 14 Aug 2017 20:08:49 +0000 (UTC) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 14 Aug 2017 13:08:50 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.41,374,1498546800"; d="scan'208";a="1162545525" Received: from lsandov1-mobl2.zpn.intel.com ([10.219.128.134]) by orsmga001.jf.intel.com with ESMTP; 14 Aug 2017 13:08:50 -0700 Message-ID: <1502741856.28941.25.camel@linux.intel.com> From: Leonardo Sandoval To: "Slater, Joseph" Date: Mon, 14 Aug 2017 15:17:36 -0500 In-Reply-To: <007BD92917A2324FA403BCF9A464CF84CF3D645F@ALA-MBD.corp.ad.wrs.com> References: <007BD92917A2324FA403BCF9A464CF84CF3D645F@ALA-MBD.corp.ad.wrs.com> X-Mailer: Evolution 3.12.9-1+b1 Mime-Version: 1.0 Cc: "openembedded-core@lists.openembedded.org" Subject: Re: master-next X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Aug 2017 20:08:49 -0000 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit On Mon, 2017-08-14 at 19:24 +0000, Slater, Joseph wrote: > Is there something “different” about this branch? this branch is the what at some point will be landed to master, pretty dynamic and only created/used by key maintainers (RP, Ross) and consumed by the auto-builder. > I find that if I have a local master and master-next, and am on > master, when I do a pull master-next will wind up both ahead and > behind origin/master-next. use 'git fetch' instead. This will just update your branches but wont try any merge/rebase. > If I switch to master-next and rebase, it might fail, or it might > leave me with one or more “local” commits that are not mine. For the > case I tried today, it is commit 3d4f241 which seems to only be on my > local master-next, but came from Mark Horn/Ross Burton on August 2. > > > > Can anyone explain this? > > > > Joe > > > > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dan.rpsys.net (5751f4a1.skybroadband.com [87.81.244.161]) by mail.openembedded.org (Postfix) with ESMTP id 9B16778369 for ; Mon, 14 Aug 2017 21:44:16 +0000 (UTC) Received: from hex ([192.168.3.34]) (authenticated bits=0) by dan.rpsys.net (8.15.2/8.15.2/Debian-3) with ESMTPSA id v7ELiGpC023599 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Mon, 14 Aug 2017 22:44:17 +0100 Message-ID: <1502747056.13978.40.camel@linuxfoundation.org> From: Richard Purdie To: "Slater, Joseph" , "openembedded-core@lists.openembedded.org" Date: Mon, 14 Aug 2017 22:44:16 +0100 In-Reply-To: <007BD92917A2324FA403BCF9A464CF84CF3D645F@ALA-MBD.corp.ad.wrs.com> References: <007BD92917A2324FA403BCF9A464CF84CF3D645F@ALA-MBD.corp.ad.wrs.com> X-Mailer: Evolution 3.18.5.2-0ubuntu3.2 Mime-Version: 1.0 X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.5.11 (dan.rpsys.net [192.168.3.1]); Mon, 14 Aug 2017 22:44:17 +0100 (BST) X-Virus-Scanned: clamav-milter 0.99.2 at dan X-Virus-Status: Clean Subject: Re: master-next X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Aug 2017 21:44:18 -0000 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit On Mon, 2017-08-14 at 19:24 +0000, Slater, Joseph wrote: > Is there something “different” about this branch?  I find that if I > have a local master and master-next, and am on master, when I do a > pull master-next will wind up both ahead and behind origin/master- > next.  If I switch to master-next and rebase, it might fail, or it > might leave me with one or more “local” commits that are not mine.   > For the case I tried today, it is commit 3d4f241 which seems to only > be on my local master-next, but came from Mark Horn/Ross Burton on > August 2. >   > Can anyone explain this? master-next rebases. The patch in question was in master-next, it failed tests and I booted it out until it gets fixed. master never rebases by comparison. Cheers, Richard From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pg0-f50.google.com (mail-pg0-f50.google.com [74.125.83.50]) by mail.openembedded.org (Postfix) with ESMTP id 7F0FE719AF for ; Mon, 14 Aug 2017 21:54:05 +0000 (UTC) Received: by mail-pg0-f50.google.com with SMTP id u5so55168514pgn.0 for ; Mon, 14 Aug 2017 14:54:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=S56XwUweIj7c9BA8qPsmdgfPWxRN81NEkyUZ0PYoRyA=; b=apo/v1RNB32C0dVQqbk4/oGOGUFVMDt3lWKJ3zlj5sfC1VdXPunlrL3PL9e6PuLKoy B2PDVbA1l+zW8ZLMXaEy3gVS/qixK3FApr2q7a4yyqM31jaAlay/RHx6jAHutk5qbBZ7 11NI+v1DIcVXgh+l/qX2nJl/pOSXFxH7LFXo7Xi8gIXvS878i8qe6n6CbQ6KoPtQgrGv RE3xXXJajUHHs7E0V8B+AgOMlLTfo/2oEkvbWVN0Ul+a/8aNLr2TlfyLsPm9XuaoCHI5 k1sd0Qbi+w8X10iBHVgR1UaS9oj0NqnODWoxlAczxBS7Kmyjan+rZkZL7kRakkpyFXg/ lhhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=S56XwUweIj7c9BA8qPsmdgfPWxRN81NEkyUZ0PYoRyA=; b=TI9y5aZxZ3tdWsyIsJVHwbmEhtuJqkjamH+otUfNhGLoivP2nKT4Jl2qPa5n2HF9L4 +X3TJ2covvmh13RixIy2Da7Vixo8AKJ6ngn6cQ/k9HPw8Kd0CG42+p60GO0bjj/y50XQ 3eEZ66H6OMSs8Ed/w5aTSRM0lUVScz1PhS//96HGiklx8CKXMZY5sGa3rp7XqH8RALWp Y2E+7oGEjpfZ0rRzch28RTKIBe/xQ3bfFkMy0vSVr4ZUrDMOH4W7/+HrWRpmC9JnqSfd rK76ogn4OZkJgA9KnDqVJNvmPIvEKlL/bHxrYXBgZuw37XzUIfUWlZ/pzT5FzRFjLVjA fo0g== X-Gm-Message-State: AHYfb5iKMFn4sR52Oq2iuwJWVfwJXYpW/OozgSsOt1Ln+d6rtMTxxMJm MBmDenY11gNv4GZt/x8mhkpzX2XA4Q== X-Received: by 10.84.149.139 with SMTP id m11mr28788570pla.376.1502747647611; Mon, 14 Aug 2017 14:54:07 -0700 (PDT) MIME-Version: 1.0 Received: by 10.100.167.2 with HTTP; Mon, 14 Aug 2017 14:53:37 -0700 (PDT) In-Reply-To: <1502747056.13978.40.camel@linuxfoundation.org> References: <007BD92917A2324FA403BCF9A464CF84CF3D645F@ALA-MBD.corp.ad.wrs.com> <1502747056.13978.40.camel@linuxfoundation.org> From: Khem Raj Date: Mon, 14 Aug 2017 14:53:37 -0700 Message-ID: To: Richard Purdie Cc: "openembedded-core@lists.openembedded.org" Subject: Re: master-next X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Aug 2017 21:54:06 -0000 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Mon, Aug 14, 2017 at 2:44 PM, Richard Purdie wrote: > On Mon, 2017-08-14 at 19:24 +0000, Slater, Joseph wrote: >> Is there something =E2=80=9Cdifferent=E2=80=9D about this branch? I fin= d that if I >> have a local master and master-next, and am on master, when I do a >> pull master-next will wind up both ahead and behind origin/master- >> next. If I switch to master-next and rebase, it might fail, or it >> might leave me with one or more =E2=80=9Clocal=E2=80=9D commits that are= not mine. >> For the case I tried today, it is commit 3d4f241 which seems to only >> be on my local master-next, but came from Mark Horn/Ross Burton on >> August 2. >> >> Can anyone explain this? > > master-next rebases. The patch in question was in master-next, it > failed tests and I booted it out until it gets fixed. > > master never rebases by comparison. may be using branch namespace might make it better ? something like $user/branch means its a private branch and branches in global namespaces are public branches > > Cheers, > > Richard > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-bk0-f41.google.com (mail-bk0-f41.google.com [209.85.214.41]) by yocto-www.yoctoproject.org (Postfix) with ESMTP id 1455CE01570 for ; Tue, 27 Aug 2013 23:55:17 -0700 (PDT) Received: by mail-bk0-f41.google.com with SMTP id na10so2060641bkb.0 for ; Tue, 27 Aug 2013 23:55:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:content-type; bh=pLDQzOTHdkQp4abnVbNuN1eKh+zcoRGtnnuDaufsRMM=; b=EL+6o5y+7UuCDuiugMncVNJLmIfZPW/I1As+6eu+mizIDGQtnmseALf7QCbgp9R+3t WL7Yg59x2GgQ9NtY/GFbyoMzk7ZSkz4l2Ii1fBCyfrqUT7ROs7a8wO4SrYmt/eCktGOr mc2cKqSPlY1XSGpyjCFDvZF1Ebl/maW7vc2QeybLk/9BcK6UimqmfqiYlA4uSfP+xDXm YssDzS854pS+vIU92OSLekEIz8MfP/3wzebtDCLnn2xNr6TEzUlVZnslmDyPWRgxl0CU U3r4VsRZgAA4rexuXIwI5tCqUCxUQlUmrna8ssy+j2LsH0aKXE+zGPkjsyiQD6fGmISb hQEQ== MIME-Version: 1.0 X-Received: by 10.205.26.134 with SMTP id rm6mr16521123bkb.9.1377672915719; Tue, 27 Aug 2013 23:55:15 -0700 (PDT) Received: by 10.204.236.193 with HTTP; Tue, 27 Aug 2013 23:55:15 -0700 (PDT) Date: Wed, 28 Aug 2013 09:55:15 +0300 Message-ID: From: Alexei Kopendakov To: "meta-freescale@yoctoproject.org" Subject: master-next 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, 28 Aug 2013 06:55:18 -0000 Content-Type: multipart/alternative; boundary=20cf301ee3f9c2488104e4fc78ad --20cf301ee3f9c2488104e4fc78ad Content-Type: text/plain; charset=ISO-8859-1 Hello all. I'am try build fsl-image-gui for imx6qsabresd (master-next , source i got by repo init -u https://github.com/cbetz421/fsl-community-bsp-platform -b master-next ) And got next error: http://pastebin.com/FsBFDKzT Why??? -- Alexei Kopendakov --20cf301ee3f9c2488104e4fc78ad Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable
Hello all.

I'am try buil= d fsl-image-gui for imx6qsabresd =A0(master-next , source i got by=A0
=

repo init -u=A0https://github.com/cbetz421/fsl-community-bsp-platform<= span style=3D"font-family:arial,sans-serif;font-size:13px">=A0-b=A0<= span style=3D"font-family:arial,sans-serif;font-size:13px">master-next =A0)=

And got next error:=A0

<= a href=3D"http://pastebin.com/FsBFDKzT">http://pastebin.com/FsBFDKzT

Why???

--
Alexei Kopenda= kov
--20cf301ee3f9c2488104e4fc78ad-- From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from co9outboundpool.messaging.microsoft.com (co9ehsobe002.messaging.microsoft.com [207.46.163.25]) by yocto-www.yoctoproject.org (Postfix) with ESMTP id 2A209E01412 for ; Wed, 28 Aug 2013 04:48:35 -0700 (PDT) Received: from mail33-co9-R.bigfish.com (10.236.132.251) by CO9EHSOBE029.bigfish.com (10.236.130.92) with Microsoft SMTP Server id 14.1.225.22; Wed, 28 Aug 2013 11:48:34 +0000 Received: from mail33-co9 (localhost [127.0.0.1]) by mail33-co9-R.bigfish.com (Postfix) with ESMTP id BFAAE20015A; Wed, 28 Aug 2013 11:48:34 +0000 (UTC) X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI X-SpamScore: 8 X-BigFish: VS8(zzbb2dI98dI9371I1432I14ffIzz1f42h208ch1ee6h1de0h1fdah2073h1202h1e76h1d1ah1d2ah1fc6hz8dhz1de098h177df4h17326ah186068h8275bh8275dh1de097hf73b6uz2dh2a8h839h947hd25he5bhf0ah1288h12a5h12a9h12bdh137ah13b6h1441h1504h1537h153bh162dh1631h1758h1765h18e1h190ch1946h19b4h19c3h1ad9h1b0ah1b2fh1fb3h1d0ch1d2eh1d3fh1dfeh1dffh1f5fh1fe8h1ff5h1155h) Received: from mail33-co9 (localhost.localdomain [127.0.0.1]) by mail33-co9 (MessageSwitch) id 1377690513416263_14205; Wed, 28 Aug 2013 11:48:33 +0000 (UTC) Received: from CO9EHSMHS012.bigfish.com (unknown [10.236.132.236]) by mail33-co9.bigfish.com (Postfix) with ESMTP id 5F08C1E005D; Wed, 28 Aug 2013 11:48:33 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by CO9EHSMHS012.bigfish.com (10.236.130.22) with Microsoft SMTP Server (TLS) id 14.16.227.3; Wed, 28 Aug 2013 11:48:33 +0000 Received: from az84smr01.freescale.net (10.64.34.197) by 039-SN1MMR1-004.039d.mgd.msft.net (10.84.1.14) with Microsoft SMTP Server (TLS) id 14.3.146.2; Wed, 28 Aug 2013 11:48:32 +0000 Received: from [10.29.244.63] ([10.29.244.63]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id r7SBmUJh003296; Wed, 28 Aug 2013 04:48:31 -0700 Message-ID: <521DE2B4.1020104@freescale.com> Date: Wed, 28 Aug 2013 08:44:52 -0300 From: Daiane Angolini User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130803 Thunderbird/17.0.8 MIME-Version: 1.0 To: Alexei Kopendakov References: In-Reply-To: X-OriginatorOrg: freescale.com X-FOPE-CONNECTOR: Id%0$Dn%*$RO%0$TLS%0$FQDN%$TlsDn% Cc: "meta-freescale@yoctoproject.org" Subject: Re: master-next 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, 28 Aug 2013 11:48:37 -0000 Content-Type: text/plain; charset="ISO-8859-1"; format=flowed Content-Transfer-Encoding: 7bit On 08/28/2013 03:55 AM, Alexei Kopendakov wrote: > Hello all. > > I'am try build fsl-image-gui for imx6qsabresd (master-next , source i > got by > > repo init -u https://github.com/cbetz421/fsl-community-bsp-platform -b > master-next ) > > And got next error: > > http://pastebin.com/FsBFDKzT > > Why??? Please, share your DISTRO_FEATURES. (bitbake -e | grep ^DISTRO_FEATURES) It looks like an error I've been seeing on master-next when I'm trying to build X11. I'm trying to solve it by adding "opengl" to DISTRO_FEATURES. still in progress. > > -- > Alexei Kopendakov > > > _______________________________________________ > meta-freescale mailing list > meta-freescale@yoctoproject.org > https://lists.yoctoproject.org/listinfo/meta-freescale > -- Daiane