> -----Original Message----- > From: Zanussi, Tom > Sent: Thursday, January 17, 2013 1:55 PM > To: Kamble, Nitin A > Cc: bruce.ashfi...@windriver.com; Hart, Darren; linux- > yo...@yoctoproject.org > Subject: Re: [meta branch v3 01/12] meta: relocate git-merge of emgd > branch > > On Wed, 2013-01-16 at 11:23 -0800, nitin.a.kam...@intel.com wrote: > > From: Nitin A Kamble <nitin.a.kam...@intel.com> > > > > Move git-merge of emgd branch out from the bsp area and into the > > features area > > > > Just a minor nit - can you please proofread for obvious typos like below > before submitting?
Thanks Tom for catching this, and sorry for I missing these typos. I have corrected these from all the commit messages on the contrib branch. Nitin > > > This change avoids getting emged sources unnecessarily included in the > > ^^^^^ > > > noemgd bsp kernel sources. > > > > This addresses this bug/feature rquest: > > ^^^^^^ > > Thanks, > > Tom > > > [YOCTO #2268] > > > > Signed-off-by: Nitin A Kamble <nitin.a.kam...@intel.com> > > --- > > .../bsp/crownbay/crownbay-standard.scc | 2 -- > > .../kernel-cache/bsp/emenlow/emenlow-standard.scc | 2 -- > > meta/cfg/kernel-cache/bsp/fri2/fri2-standard.scc | 2 -- > > .../kernel-cache/bsp/sys940x/sys940x-standard.scc | 2 -- > > .../kernel-cache/features/drm-emgd/drm-emgd.scc | 1 + > > 5 files changed, 1 insertions(+), 8 deletions(-) > > > > diff --git a/meta/cfg/kernel-cache/bsp/crownbay/crownbay-standard.scc > > b/meta/cfg/kernel-cache/bsp/crownbay/crownbay-standard.scc > > index 3db03de..9fe4776 100644 > > --- a/meta/cfg/kernel-cache/bsp/crownbay/crownbay-standard.scc > > +++ b/meta/cfg/kernel-cache/bsp/crownbay/crownbay-standard.scc > > @@ -5,8 +5,6 @@ define KARCH i386 > > include ktypes/standard > > branch crownbay > > > > -git merge emgd-1.14 > > - > > include crownbay.scc > > > > # default policy for standard kernels diff --git > > a/meta/cfg/kernel-cache/bsp/emenlow/emenlow-standard.scc > > b/meta/cfg/kernel-cache/bsp/emenlow/emenlow-standard.scc > > index a2094ef..3526a18 100644 > > --- a/meta/cfg/kernel-cache/bsp/emenlow/emenlow-standard.scc > > +++ b/meta/cfg/kernel-cache/bsp/emenlow/emenlow-standard.scc > > @@ -5,8 +5,6 @@ define KARCH i386 > > include ktypes/standard > > branch emenlow > > > > -git merge emgd-1.14 > > - > > include emenlow.scc > > > > # default policy for standard kernels diff --git > > a/meta/cfg/kernel-cache/bsp/fri2/fri2-standard.scc > > b/meta/cfg/kernel-cache/bsp/fri2/fri2-standard.scc > > index fc47a2e..029eafa 100644 > > --- a/meta/cfg/kernel-cache/bsp/fri2/fri2-standard.scc > > +++ b/meta/cfg/kernel-cache/bsp/fri2/fri2-standard.scc > > @@ -5,8 +5,6 @@ define KARCH i386 > > include ktypes/standard > > branch fri2 > > > > -git merge emgd-1.14 > > - > > include fri2.scc > > > > # Extra fri2 configs above the minimal defined in fri2.scc diff --git > > a/meta/cfg/kernel-cache/bsp/sys940x/sys940x-standard.scc > > b/meta/cfg/kernel-cache/bsp/sys940x/sys940x-standard.scc > > index 3149a3e..7b21cbc 100644 > > --- a/meta/cfg/kernel-cache/bsp/sys940x/sys940x-standard.scc > > +++ b/meta/cfg/kernel-cache/bsp/sys940x/sys940x-standard.scc > > @@ -5,8 +5,6 @@ define KARCH i386 > > include ktypes/standard > > branch sys940x > > > > -git merge emgd-1.14 > > - > > include sys940x.scc > > include cfg/efi-ext.scc > > > > diff --git a/meta/cfg/kernel-cache/features/drm-emgd/drm-emgd.scc > > b/meta/cfg/kernel-cache/features/drm-emgd/drm-emgd.scc > > index 672ee2e..01bcec8 100644 > > --- a/meta/cfg/kernel-cache/features/drm-emgd/drm-emgd.scc > > +++ b/meta/cfg/kernel-cache/features/drm-emgd/drm-emgd.scc > > @@ -1 +1,2 @@ > > kconf hardware drm-emgd.cfg > > +git merge emgd-1.14 > _______________________________________________ linux-yocto mailing list linux-yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/linux-yocto
