| Message ID | 1455547082-6890-1-git-send-email-cardoe@cardoe.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, Feb 15, 2016 at 08:38:02AM -0600, Doug Goldstein wrote: > Switch from tracking a commit post 1.9.0 to the 1.9.1 release. > Thanks for this patch. We can't apply this patch just yet. We need to wait a bit until the change to upstream trickles down to our own tree [0] -- OSSTest will work on that shortly. See [1] for an example output. Wei. [0] git://xenbits.xen.org/osstest/seabios.git [1] <osstest-80975-mainreport@xen.org> > Signed-off-by: Doug Goldstein <cardoe@cardoe.com> > --- > > Please make sure to sync git://xenbits.xen.org/seabios.git to > upstream prior to pushing this to staging. > > --- > Config.mk | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/Config.mk b/Config.mk > index 429e460..79eb2bd 100644 > --- a/Config.mk > +++ b/Config.mk > @@ -255,9 +255,9 @@ MINIOS_UPSTREAM_REVISION ?= 89268f00b0b0215057cb74edd94e866536a02489 > # Fri Jan 15 13:24:03 2016 +0000 > # mini-os: Include libxenforeignmemory with libxc > > -SEABIOS_UPSTREAM_REVISION ?= 3403ac4313812752be6e6aac35239ca6888a8cab > -# Mon Dec 28 13:50:41 2015 +0100 > -# build: fix typo in buildversion.py > +SEABIOS_UPSTREAM_REVISION ?= rel-1.9.1 > +# Fri Jan 15 15:49:32 2016 +0000 > +# biostables: Support SMBIOS 2.6+ UUID format > > ETHERBOOT_NICS ?= rtl8139 8086100e > > -- > 2.4.10 > > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel
On Mon, 2016-02-15 at 16:13 +0000, Wei Liu wrote: > On Mon, Feb 15, 2016 at 08:38:02AM -0600, Doug Goldstein wrote: > > Switch from tracking a commit post 1.9.0 to the 1.9.1 release. > > > > Thanks for this patch. > > We can't apply this patch just yet. We need to wait a bit until the > change to upstream trickles down to our own tree [0] -- OSSTest will > work on that shortly. See [1] for an example output. Our osstest branch only tests seabios.git#master whereas this is tracking the 1.9.x stable branch. I don't think we really want/need the overhead of testing multiple branches of SeaBIOS, so IMHO it is sufficient to observe that all of the commits on the stable branch have passed our master branch commit gate (even if that means they did so in the context of other un-backported patches). I haven't checked but given the timings and http://logs.test-lab.xenproject.org/osste st/results/all-branch-statuses.txt indicating our seabios branch is up to date I expect this is the case. There is some risk to this, but SeaBIOS gets a fairly small number of changes so the stable branches do not stray too far from master in general so I think this approach is fine. IOW it would be fine to push upstreams 1.9-stable to our repo along with the rel-1.9.1 tag and to then apply this patch. > > Wei. > > [0] git://xenbits.xen.org/osstest/seabios.git > [1] <osstest-80975-mainreport@xen.org> > > > Signed-off-by: Doug Goldstein <cardoe@cardoe.com> > > --- > > > > Please make sure to sync git://xenbits.xen.org/seabios.git to > > upstream prior to pushing this to staging. > > > > --- > > Config.mk | 6 +++--- > > 1 file changed, 3 insertions(+), 3 deletions(-) > > > > diff --git a/Config.mk b/Config.mk > > index 429e460..79eb2bd 100644 > > --- a/Config.mk > > +++ b/Config.mk > > @@ -255,9 +255,9 @@ MINIOS_UPSTREAM_REVISION ?= > > 89268f00b0b0215057cb74edd94e866536a02489 > > # Fri Jan 15 13:24:03 2016 +0000 > > # mini-os: Include libxenforeignmemory with libxc > > > > -SEABIOS_UPSTREAM_REVISION ?= 3403ac4313812752be6e6aac35239ca6888a8cab > > -# Mon Dec 28 13:50:41 2015 +0100 > > -# build: fix typo in buildversion.py > > +SEABIOS_UPSTREAM_REVISION ?= rel-1.9.1 > > +# Fri Jan 15 15:49:32 2016 +0000 > > +# biostables: Support SMBIOS 2.6+ UUID format > > > > ETHERBOOT_NICS ?= rtl8139 8086100e > >
On Tue, Feb 16, 2016 at 01:43:26PM +0000, Ian Campbell wrote: > On Mon, 2016-02-15 at 16:13 +0000, Wei Liu wrote: > > On Mon, Feb 15, 2016 at 08:38:02AM -0600, Doug Goldstein wrote: > > > Switch from tracking a commit post 1.9.0 to the 1.9.1 release. > > > > > > > Thanks for this patch. > > > > We can't apply this patch just yet. We need to wait a bit until the > > change to upstream trickles down to our own tree [0] -- OSSTest will > > work on that shortly. See [1] for an example output. > > Our osstest branch only tests seabios.git#master whereas this is tracking > the 1.9.x stable branch. > > I don't think we really want/need the overhead of testing multiple branches > of SeaBIOS, so IMHO it is sufficient to observe that all of the commits on > the stable branch have passed our master branch commit gate (even if that > means they did so in the context of other un-backported patches). I haven't > checked but given the timings and http://logs.test-lab.xenproject.org/osste > st/results/all-branch-statuses.txt indicating our seabios branch is up to > date I expect this is the case. > > There is some risk to this, but SeaBIOS gets a fairly small number of > changes so the stable branches do not stray too far from master in general > so I think this approach is fine. > > IOW it would be fine to push upstreams 1.9-stable to our repo along with > the rel-1.9.1 tag and to then apply this patch. > Makes sense.
On 2/16/16 7:52 AM, Wei Liu wrote: > On Tue, Feb 16, 2016 at 01:43:26PM +0000, Ian Campbell wrote: >> On Mon, 2016-02-15 at 16:13 +0000, Wei Liu wrote: >>> On Mon, Feb 15, 2016 at 08:38:02AM -0600, Doug Goldstein wrote: >>>> Switch from tracking a commit post 1.9.0 to the 1.9.1 release. >>>> >>> >>> Thanks for this patch. >>> >>> We can't apply this patch just yet. We need to wait a bit until the >>> change to upstream trickles down to our own tree [0] -- OSSTest will >>> work on that shortly. See [1] for an example output. >> >> Our osstest branch only tests seabios.git#master whereas this is tracking >> the 1.9.x stable branch. >> >> I don't think we really want/need the overhead of testing multiple branches >> of SeaBIOS, so IMHO it is sufficient to observe that all of the commits on >> the stable branch have passed our master branch commit gate (even if that >> means they did so in the context of other un-backported patches). I haven't >> checked but given the timings and http://logs.test-lab.xenproject.org/osste >> st/results/all-branch-statuses.txt indicating our seabios branch is up to >> date I expect this is the case. >> >> There is some risk to this, but SeaBIOS gets a fairly small number of >> changes so the stable branches do not stray too far from master in general >> so I think this approach is fine. >> >> IOW it would be fine to push upstreams 1.9-stable to our repo along with >> the rel-1.9.1 tag and to then apply this patch. >> > > Makes sense. > ping?
On Wed, Feb 24, 2016 at 08:34:31AM -0600, Doug Goldstein wrote: > On 2/16/16 7:52 AM, Wei Liu wrote: > > On Tue, Feb 16, 2016 at 01:43:26PM +0000, Ian Campbell wrote: > >> On Mon, 2016-02-15 at 16:13 +0000, Wei Liu wrote: > >>> On Mon, Feb 15, 2016 at 08:38:02AM -0600, Doug Goldstein wrote: > >>>> Switch from tracking a commit post 1.9.0 to the 1.9.1 release. > >>>> > >>> > >>> Thanks for this patch. > >>> > >>> We can't apply this patch just yet. We need to wait a bit until the > >>> change to upstream trickles down to our own tree [0] -- OSSTest will > >>> work on that shortly. See [1] for an example output. > >> > >> Our osstest branch only tests seabios.git#master whereas this is tracking > >> the 1.9.x stable branch. > >> > >> I don't think we really want/need the overhead of testing multiple branches > >> of SeaBIOS, so IMHO it is sufficient to observe that all of the commits on > >> the stable branch have passed our master branch commit gate (even if that > >> means they did so in the context of other un-backported patches). I haven't > >> checked but given the timings and http://logs.test-lab.xenproject.org/osste > >> st/results/all-branch-statuses.txt indicating our seabios branch is up to > >> date I expect this is the case. > >> > >> There is some risk to this, but SeaBIOS gets a fairly small number of > >> changes so the stable branches do not stray too far from master in general > >> so I think this approach is fine. > >> > >> IOW it would be fine to push upstreams 1.9-stable to our repo along with > >> the rel-1.9.1 tag and to then apply this patch. > >> > > > > Makes sense. > > > > ping? > With my recently acquired seabios maintainer hat on: Acked-by: Wei Liu <wei.liu2@citrix.com> One of the committers will need to pick this up to do the actual push. Wei. > -- > Doug Goldstein >
>>> On 24.02.16 at 15:41, <wei.liu2@citrix.com> wrote: > On Wed, Feb 24, 2016 at 08:34:31AM -0600, Doug Goldstein wrote: >> On 2/16/16 7:52 AM, Wei Liu wrote: >> > On Tue, Feb 16, 2016 at 01:43:26PM +0000, Ian Campbell wrote: >> >> On Mon, 2016-02-15 at 16:13 +0000, Wei Liu wrote: >> >>> On Mon, Feb 15, 2016 at 08:38:02AM -0600, Doug Goldstein wrote: >> >>>> Switch from tracking a commit post 1.9.0 to the 1.9.1 release. >> >>>> >> >>> >> >>> Thanks for this patch. >> >>> >> >>> We can't apply this patch just yet. We need to wait a bit until the >> >>> change to upstream trickles down to our own tree [0] -- OSSTest will >> >>> work on that shortly. See [1] for an example output. >> >> >> >> Our osstest branch only tests seabios.git#master whereas this is tracking >> >> the 1.9.x stable branch. >> >> >> >> I don't think we really want/need the overhead of testing multiple branches >> >> of SeaBIOS, so IMHO it is sufficient to observe that all of the commits on >> >> the stable branch have passed our master branch commit gate (even if that >> >> means they did so in the context of other un-backported patches). I haven't >> >> checked but given the timings and http://logs.test-lab.xenproject.org/osste >> >> st/results/all-branch-statuses.txt indicating our seabios branch is up to >> >> date I expect this is the case. >> >> >> >> There is some risk to this, but SeaBIOS gets a fairly small number of >> >> changes so the stable branches do not stray too far from master in general >> >> so I think this approach is fine. >> >> >> >> IOW it would be fine to push upstreams 1.9-stable to our repo along with >> >> the rel-1.9.1 tag and to then apply this patch. >> >> >> > >> > Makes sense. >> > >> >> ping? >> > > With my recently acquired seabios maintainer hat on: > > Acked-by: Wei Liu <wei.liu2@citrix.com> > > One of the committers will need to pick this up to do the actual push. I can't see a rel-1.9.1 tag yet in the repo on xenbits, so - are you sure? Jan
On Wed, Feb 24, 2016 at 08:14:09AM -0700, Jan Beulich wrote: > >>> On 24.02.16 at 15:41, <wei.liu2@citrix.com> wrote: > > On Wed, Feb 24, 2016 at 08:34:31AM -0600, Doug Goldstein wrote: > >> On 2/16/16 7:52 AM, Wei Liu wrote: > >> > On Tue, Feb 16, 2016 at 01:43:26PM +0000, Ian Campbell wrote: > >> >> On Mon, 2016-02-15 at 16:13 +0000, Wei Liu wrote: > >> >>> On Mon, Feb 15, 2016 at 08:38:02AM -0600, Doug Goldstein wrote: > >> >>>> Switch from tracking a commit post 1.9.0 to the 1.9.1 release. > >> >>>> > >> >>> > >> >>> Thanks for this patch. > >> >>> > >> >>> We can't apply this patch just yet. We need to wait a bit until the > >> >>> change to upstream trickles down to our own tree [0] -- OSSTest will > >> >>> work on that shortly. See [1] for an example output. > >> >> > >> >> Our osstest branch only tests seabios.git#master whereas this is tracking > >> >> the 1.9.x stable branch. > >> >> > >> >> I don't think we really want/need the overhead of testing multiple branches > >> >> of SeaBIOS, so IMHO it is sufficient to observe that all of the commits on > >> >> the stable branch have passed our master branch commit gate (even if that > >> >> means they did so in the context of other un-backported patches). I haven't > >> >> checked but given the timings and http://logs.test-lab.xenproject.org/osste > >> >> st/results/all-branch-statuses.txt indicating our seabios branch is up to > >> >> date I expect this is the case. > >> >> > >> >> There is some risk to this, but SeaBIOS gets a fairly small number of > >> >> changes so the stable branches do not stray too far from master in general > >> >> so I think this approach is fine. > >> >> > >> >> IOW it would be fine to push upstreams 1.9-stable to our repo along with > >> >> the rel-1.9.1 tag and to then apply this patch. > >> >> > >> > > >> > Makes sense. > >> > > >> > >> ping? > >> > > > > With my recently acquired seabios maintainer hat on: > > > > Acked-by: Wei Liu <wei.liu2@citrix.com> > > > > One of the committers will need to pick this up to do the actual push. > > I can't see a rel-1.9.1 tag yet in the repo on xenbits, so - are you > sure? > That's what I meant -- a committer needs to fetch from upstream tree then push the tag to our own seabios tree before applying this patch. The upstream tree is at git://git.seabios.org/seabios.git . If you can handle that, it would be great. :-) Wei. > Jan >
>>> On 24.02.16 at 16:18, <wei.liu2@citrix.com> wrote: > On Wed, Feb 24, 2016 at 08:14:09AM -0700, Jan Beulich wrote: >> >>> On 24.02.16 at 15:41, <wei.liu2@citrix.com> wrote: >> > On Wed, Feb 24, 2016 at 08:34:31AM -0600, Doug Goldstein wrote: >> >> On 2/16/16 7:52 AM, Wei Liu wrote: >> >> > On Tue, Feb 16, 2016 at 01:43:26PM +0000, Ian Campbell wrote: >> >> >> On Mon, 2016-02-15 at 16:13 +0000, Wei Liu wrote: >> >> >>> On Mon, Feb 15, 2016 at 08:38:02AM -0600, Doug Goldstein wrote: >> >> >>>> Switch from tracking a commit post 1.9.0 to the 1.9.1 release. >> >> >>>> >> >> >>> >> >> >>> Thanks for this patch. >> >> >>> >> >> >>> We can't apply this patch just yet. We need to wait a bit until the >> >> >>> change to upstream trickles down to our own tree [0] -- OSSTest will >> >> >>> work on that shortly. See [1] for an example output. >> >> >> >> >> >> Our osstest branch only tests seabios.git#master whereas this is tracking >> >> >> the 1.9.x stable branch. >> >> >> >> >> >> I don't think we really want/need the overhead of testing multiple > branches >> >> >> of SeaBIOS, so IMHO it is sufficient to observe that all of the commits on >> >> >> the stable branch have passed our master branch commit gate (even if that >> >> >> means they did so in the context of other un-backported patches). I haven't >> >> >> checked but given the timings and http://logs.test-lab.xenproject.org/osste > >> >> >> st/results/all-branch-statuses.txt indicating our seabios branch is up to >> >> >> date I expect this is the case. >> >> >> >> >> >> There is some risk to this, but SeaBIOS gets a fairly small number of >> >> >> changes so the stable branches do not stray too far from master in general >> >> >> so I think this approach is fine. >> >> >> >> >> >> IOW it would be fine to push upstreams 1.9-stable to our repo along with >> >> >> the rel-1.9.1 tag and to then apply this patch. >> >> >> >> >> > >> >> > Makes sense. >> >> > >> >> >> >> ping? >> >> >> > >> > With my recently acquired seabios maintainer hat on: >> > >> > Acked-by: Wei Liu <wei.liu2@citrix.com> >> > >> > One of the committers will need to pick this up to do the actual push. >> >> I can't see a rel-1.9.1 tag yet in the repo on xenbits, so - are you >> sure? >> > > That's what I meant -- a committer needs to fetch from upstream tree > then push the tag to our own seabios tree before applying this patch. > > The upstream tree is at git://git.seabios.org/seabios.git . > > If you can handle that, it would be great. :-) I'd rather leave this to someone being a better friend with git than I am, so Ian, maybe you could do this? Ultimately I think you, Wei, should really have commit rights on that particular tree, to efficiently fulfill your role as its maintainer. Jan
On Wed, Feb 24, 2016 at 08:44:44AM -0700, Jan Beulich wrote: > >>> On 24.02.16 at 16:18, <wei.liu2@citrix.com> wrote: > > On Wed, Feb 24, 2016 at 08:14:09AM -0700, Jan Beulich wrote: > >> >>> On 24.02.16 at 15:41, <wei.liu2@citrix.com> wrote: > >> > On Wed, Feb 24, 2016 at 08:34:31AM -0600, Doug Goldstein wrote: > >> >> On 2/16/16 7:52 AM, Wei Liu wrote: > >> >> > On Tue, Feb 16, 2016 at 01:43:26PM +0000, Ian Campbell wrote: > >> >> >> On Mon, 2016-02-15 at 16:13 +0000, Wei Liu wrote: > >> >> >>> On Mon, Feb 15, 2016 at 08:38:02AM -0600, Doug Goldstein wrote: > >> >> >>>> Switch from tracking a commit post 1.9.0 to the 1.9.1 release. > >> >> >>>> > >> >> >>> > >> >> >>> Thanks for this patch. > >> >> >>> > >> >> >>> We can't apply this patch just yet. We need to wait a bit until the > >> >> >>> change to upstream trickles down to our own tree [0] -- OSSTest will > >> >> >>> work on that shortly. See [1] for an example output. > >> >> >> > >> >> >> Our osstest branch only tests seabios.git#master whereas this is tracking > >> >> >> the 1.9.x stable branch. > >> >> >> > >> >> >> I don't think we really want/need the overhead of testing multiple > > branches > >> >> >> of SeaBIOS, so IMHO it is sufficient to observe that all of the commits on > >> >> >> the stable branch have passed our master branch commit gate (even if that > >> >> >> means they did so in the context of other un-backported patches). I haven't > >> >> >> checked but given the timings and http://logs.test-lab.xenproject.org/osste > > > >> >> >> st/results/all-branch-statuses.txt indicating our seabios branch is up to > >> >> >> date I expect this is the case. > >> >> >> > >> >> >> There is some risk to this, but SeaBIOS gets a fairly small number of > >> >> >> changes so the stable branches do not stray too far from master in general > >> >> >> so I think this approach is fine. > >> >> >> > >> >> >> IOW it would be fine to push upstreams 1.9-stable to our repo along with > >> >> >> the rel-1.9.1 tag and to then apply this patch. > >> >> >> > >> >> > > >> >> > Makes sense. > >> >> > > >> >> > >> >> ping? > >> >> > >> > > >> > With my recently acquired seabios maintainer hat on: > >> > > >> > Acked-by: Wei Liu <wei.liu2@citrix.com> > >> > > >> > One of the committers will need to pick this up to do the actual push. > >> > >> I can't see a rel-1.9.1 tag yet in the repo on xenbits, so - are you > >> sure? > >> > > > > That's what I meant -- a committer needs to fetch from upstream tree > > then push the tag to our own seabios tree before applying this patch. > > > > The upstream tree is at git://git.seabios.org/seabios.git . > > > > If you can handle that, it would be great. :-) > > I'd rather leave this to someone being a better friend with git > than I am, so Ian, maybe you could do this? > This is fine. It's not very urgent anyway. > Ultimately I think you, Wei, should really have commit rights > on that particular tree, to efficiently fulfill your role as its > maintainer. This works for me, too. Wei. > > Jan >
> > >> I can't see a rel-1.9.1 tag yet in the repo on xenbits, so - are you > > >> sure? > > >> > > > > > > That's what I meant -- a committer needs to fetch from upstream tree > > > then push the tag to our own seabios tree before applying this patch. > > > > > > The upstream tree is at git://git.seabios.org/seabios.git . > > > > > > If you can handle that, it would be great. :-) > > > > I'd rather leave this to someone being a better friend with git > > than I am, so Ian, maybe you could do this? > > > > This is fine. It's not very urgent anyway. Pushed the new tag in seabios.git and also pushed this patch in staging.
diff --git a/Config.mk b/Config.mk index 429e460..79eb2bd 100644 --- a/Config.mk +++ b/Config.mk @@ -255,9 +255,9 @@ MINIOS_UPSTREAM_REVISION ?= 89268f00b0b0215057cb74edd94e866536a02489 # Fri Jan 15 13:24:03 2016 +0000 # mini-os: Include libxenforeignmemory with libxc -SEABIOS_UPSTREAM_REVISION ?= 3403ac4313812752be6e6aac35239ca6888a8cab -# Mon Dec 28 13:50:41 2015 +0100 -# build: fix typo in buildversion.py +SEABIOS_UPSTREAM_REVISION ?= rel-1.9.1 +# Fri Jan 15 15:49:32 2016 +0000 +# biostables: Support SMBIOS 2.6+ UUID format ETHERBOOT_NICS ?= rtl8139 8086100e
Switch from tracking a commit post 1.9.0 to the 1.9.1 release. Signed-off-by: Doug Goldstein <cardoe@cardoe.com> --- Please make sure to sync git://xenbits.xen.org/seabios.git to upstream prior to pushing this to staging. --- Config.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)