| Message ID | 1446824780-20765-1-git-send-email-mike.holmes@linaro.org |
|---|---|
| State | Accepted |
| Commit | fefcfdc26d541755421037ccb84ee580893102f7 |
| Headers | show |
Shouldn't these be tagged --subject-prefix="NEXT PATCH" to make it clear which branch it's intended for? Other than that, looks fine. On Fri, Nov 6, 2015 at 9:46 AM, Mike Holmes <mike.holmes@linaro.org> wrote: > Signed-off-by: Mike Holmes <mike.holmes@linaro.org> > Reviewed-and-tested-by: Bill Fischofer <bill.fischofer@linaro.org> > --- doc/implementers-guide/Makefile.am | 2 +- > doc/users-guide/Makefile.am | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/doc/implementers-guide/Makefile.am > b/doc/implementers-guide/Makefile.am > index 25437d3..f973823 100644 > --- a/doc/implementers-guide/Makefile.am > +++ b/doc/implementers-guide/Makefile.am > @@ -4,7 +4,7 @@ all-local: $(TARGET) > > $(TARGET): implementers-guide.adoc > @mkdir -p $(top_srcdir)/doc/output > - asciidoc --out-file=$@ $< > + asciidoc -b html5 -a icons -a toc2 -a max-width=55em > --out-file=$@ $< > > clean-local: > rm -f $(TARGET) > diff --git a/doc/users-guide/Makefile.am b/doc/users-guide/Makefile.am > index 312358d..3a804d1 100644 > --- a/doc/users-guide/Makefile.am > +++ b/doc/users-guide/Makefile.am > @@ -4,7 +4,7 @@ all-local: $(TARGET) > > $(TARGET): users-guide.adoc > @mkdir -p $(top_srcdir)/doc/output > - asciidoc --out-file=$@ $< > + asciidoc -b html5 -a icons -a toc2 -a max-width=55em > --out-file=$@ $< > > clean-local: > rm -f $(TARGET) > -- > 2.5.0 > > _______________________________________________ > lng-odp mailing list > lng-odp@lists.linaro.org > https://lists.linaro.org/mailman/listinfo/lng-odp >
Merged, Maxim. On 11/09/2015 03:31, Bill Fischofer wrote: > Shouldn't these be tagged --subject-prefix="NEXT PATCH" to make it > clear which branch it's intended for? Other than that, looks fine. > > Bill, we agreed to not send patches to next branch. It's used as staging for new api and I will take care about merging it to right place. Yes, for that I'm taking it to next. Then after 1.4.1 will merge it to master. > On Fri, Nov 6, 2015 at 9:46 AM, Mike Holmes <mike.holmes@linaro.org > <mailto:mike.holmes@linaro.org>> wrote: > > Signed-off-by: Mike Holmes <mike.holmes@linaro.org > <mailto:mike.holmes@linaro.org>> > > > Reviewed-and-tested-by: Bill Fischofer <bill.fischofer@linaro.org > <mailto:bill.fischofer@linaro.org>> > > --- > > doc/implementers-guide/Makefile.am | 2 +- > doc/users-guide/Makefile.am | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/doc/implementers-guide/Makefile.am > b/doc/implementers-guide/Makefile.am > index 25437d3..f973823 100644 > --- a/doc/implementers-guide/Makefile.am > +++ b/doc/implementers-guide/Makefile.am > @@ -4,7 +4,7 @@ all-local: $(TARGET) > > $(TARGET): implementers-guide.adoc > @mkdir -p $(top_srcdir)/doc/output > - asciidoc --out-file=$@ $< > + asciidoc -b html5 -a icons -a toc2 -a max-width=55em > --out-file=$@ $< > > clean-local: > rm -f $(TARGET) > diff --git a/doc/users-guide/Makefile.am b/doc/users-guide/Makefile.am > index 312358d..3a804d1 100644 > --- a/doc/users-guide/Makefile.am > +++ b/doc/users-guide/Makefile.am > @@ -4,7 +4,7 @@ all-local: $(TARGET) > > $(TARGET): users-guide.adoc > @mkdir -p $(top_srcdir)/doc/output > - asciidoc --out-file=$@ $< > + asciidoc -b html5 -a icons -a toc2 -a max-width=55em > --out-file=$@ $< > > clean-local: > rm -f $(TARGET) > -- > 2.5.0 > > _______________________________________________ > lng-odp mailing list > lng-odp@lists.linaro.org <mailto:lng-odp@lists.linaro.org> > https://lists.linaro.org/mailman/listinfo/lng-odp > > > > > _______________________________________________ > lng-odp mailing list > lng-odp@lists.linaro.org > https://lists.linaro.org/mailman/listinfo/lng-odp
Nothing should be targeted at next imho, next catches api next code ready for a release. Master takes all improvements to the tests and Linux generic although I think this will change when the api is its own repo with its own list. On Nov 8, 2015 4:31 PM, "Bill Fischofer" <bill.fischofer@linaro.org> wrote: > Shouldn't these be tagged --subject-prefix="NEXT PATCH" to make it clear > which branch it's intended for? Other than that, looks fine. > > > On Fri, Nov 6, 2015 at 9:46 AM, Mike Holmes <mike.holmes@linaro.org> > wrote: > >> Signed-off-by: Mike Holmes <mike.holmes@linaro.org> >> > > Reviewed-and-tested-by: Bill Fischofer <bill.fischofer@linaro.org> > > >> --- > > doc/implementers-guide/Makefile.am | 2 +- >> doc/users-guide/Makefile.am | 2 +- >> 2 files changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/doc/implementers-guide/Makefile.am >> b/doc/implementers-guide/Makefile.am >> index 25437d3..f973823 100644 >> --- a/doc/implementers-guide/Makefile.am >> +++ b/doc/implementers-guide/Makefile.am >> @@ -4,7 +4,7 @@ all-local: $(TARGET) >> >> $(TARGET): implementers-guide.adoc >> @mkdir -p $(top_srcdir)/doc/output >> - asciidoc --out-file=$@ $< >> + asciidoc -b html5 -a icons -a toc2 -a max-width=55em >> --out-file=$@ $< >> >> clean-local: >> rm -f $(TARGET) >> diff --git a/doc/users-guide/Makefile.am b/doc/users-guide/Makefile.am >> index 312358d..3a804d1 100644 >> --- a/doc/users-guide/Makefile.am >> +++ b/doc/users-guide/Makefile.am >> @@ -4,7 +4,7 @@ all-local: $(TARGET) >> >> $(TARGET): users-guide.adoc >> @mkdir -p $(top_srcdir)/doc/output >> - asciidoc --out-file=$@ $< >> + asciidoc -b html5 -a icons -a toc2 -a max-width=55em >> --out-file=$@ $< >> >> clean-local: >> rm -f $(TARGET) >> -- >> 2.5.0 >> >> _______________________________________________ >> lng-odp mailing list >> lng-odp@lists.linaro.org >> https://lists.linaro.org/mailman/listinfo/lng-odp >> > >
OK, however the patches did not apply to master or api-next, but did apply to next. On Tue, Nov 10, 2015 at 3:03 PM, Mike Holmes <mike.holmes@linaro.org> wrote: > Nothing should be targeted at next imho, next catches api next code ready > for a release. Master takes all improvements to the tests and Linux generic > although I think this will change when the api is its own repo with its > own list. > On Nov 8, 2015 4:31 PM, "Bill Fischofer" <bill.fischofer@linaro.org> > wrote: > >> Shouldn't these be tagged --subject-prefix="NEXT PATCH" to make it clear >> which branch it's intended for? Other than that, looks fine. >> >> >> On Fri, Nov 6, 2015 at 9:46 AM, Mike Holmes <mike.holmes@linaro.org> >> wrote: >> >>> Signed-off-by: Mike Holmes <mike.holmes@linaro.org> >>> >> >> Reviewed-and-tested-by: Bill Fischofer <bill.fischofer@linaro.org> >> >> >>> --- >> >> doc/implementers-guide/Makefile.am | 2 +- >>> doc/users-guide/Makefile.am | 2 +- >>> 2 files changed, 2 insertions(+), 2 deletions(-) >>> >>> diff --git a/doc/implementers-guide/Makefile.am >>> b/doc/implementers-guide/Makefile.am >>> index 25437d3..f973823 100644 >>> --- a/doc/implementers-guide/Makefile.am >>> +++ b/doc/implementers-guide/Makefile.am >>> @@ -4,7 +4,7 @@ all-local: $(TARGET) >>> >>> $(TARGET): implementers-guide.adoc >>> @mkdir -p $(top_srcdir)/doc/output >>> - asciidoc --out-file=$@ $< >>> + asciidoc -b html5 -a icons -a toc2 -a max-width=55em >>> --out-file=$@ $< >>> >>> clean-local: >>> rm -f $(TARGET) >>> diff --git a/doc/users-guide/Makefile.am b/doc/users-guide/Makefile.am >>> index 312358d..3a804d1 100644 >>> --- a/doc/users-guide/Makefile.am >>> +++ b/doc/users-guide/Makefile.am >>> @@ -4,7 +4,7 @@ all-local: $(TARGET) >>> >>> $(TARGET): users-guide.adoc >>> @mkdir -p $(top_srcdir)/doc/output >>> - asciidoc --out-file=$@ $< >>> + asciidoc -b html5 -a icons -a toc2 -a max-width=55em >>> --out-file=$@ $< >>> >>> clean-local: >>> rm -f $(TARGET) >>> -- >>> 2.5.0 >>> >>> _______________________________________________ >>> lng-odp mailing list >>> lng-odp@lists.linaro.org >>> https://lists.linaro.org/mailman/listinfo/lng-odp >>> >> >>
On 10 November 2015 at 19:11, Bill Fischofer <bill.fischofer@linaro.org> wrote: > OK, however the patches did not apply to master or api-next, but did apply > to next. > Yes I did re-base there since we stalled master work to make a bug fix release, but I feel it is the wrong direction as I have thought more about it. > > On Tue, Nov 10, 2015 at 3:03 PM, Mike Holmes <mike.holmes@linaro.org> > wrote: > >> Nothing should be targeted at next imho, next catches api next code ready >> for a release. Master takes all improvements to the tests and Linux generic >> although I think this will change when the api is its own repo with its >> own list. >> On Nov 8, 2015 4:31 PM, "Bill Fischofer" <bill.fischofer@linaro.org> >> wrote: >> >>> Shouldn't these be tagged --subject-prefix="NEXT PATCH" to make it clear >>> which branch it's intended for? Other than that, looks fine. >>> >>> >>> On Fri, Nov 6, 2015 at 9:46 AM, Mike Holmes <mike.holmes@linaro.org> >>> wrote: >>> >>>> Signed-off-by: Mike Holmes <mike.holmes@linaro.org> >>>> >>> >>> Reviewed-and-tested-by: Bill Fischofer <bill.fischofer@linaro.org> >>> >>> >>>> --- >>> >>> doc/implementers-guide/Makefile.am | 2 +- >>>> doc/users-guide/Makefile.am | 2 +- >>>> 2 files changed, 2 insertions(+), 2 deletions(-) >>>> >>>> diff --git a/doc/implementers-guide/Makefile.am >>>> b/doc/implementers-guide/Makefile.am >>>> index 25437d3..f973823 100644 >>>> --- a/doc/implementers-guide/Makefile.am >>>> +++ b/doc/implementers-guide/Makefile.am >>>> @@ -4,7 +4,7 @@ all-local: $(TARGET) >>>> >>>> $(TARGET): implementers-guide.adoc >>>> @mkdir -p $(top_srcdir)/doc/output >>>> - asciidoc --out-file=$@ $< >>>> + asciidoc -b html5 -a icons -a toc2 -a max-width=55em >>>> --out-file=$@ $< >>>> >>>> clean-local: >>>> rm -f $(TARGET) >>>> diff --git a/doc/users-guide/Makefile.am b/doc/users-guide/Makefile.am >>>> index 312358d..3a804d1 100644 >>>> --- a/doc/users-guide/Makefile.am >>>> +++ b/doc/users-guide/Makefile.am >>>> @@ -4,7 +4,7 @@ all-local: $(TARGET) >>>> >>>> $(TARGET): users-guide.adoc >>>> @mkdir -p $(top_srcdir)/doc/output >>>> - asciidoc --out-file=$@ $< >>>> + asciidoc -b html5 -a icons -a toc2 -a max-width=55em >>>> --out-file=$@ $< >>>> >>>> clean-local: >>>> rm -f $(TARGET) >>>> -- >>>> 2.5.0 >>>> >>>> _______________________________________________ >>>> lng-odp mailing list >>>> lng-odp@lists.linaro.org >>>> https://lists.linaro.org/mailman/listinfo/lng-odp >>>> >>> >>> > -- Mike Holmes Technical Manager - Linaro Networking Group Linaro.org <http://www.linaro.org/> *│ *Open source software for ARM SoCs
diff --git a/doc/implementers-guide/Makefile.am b/doc/implementers-guide/Makefile.am index 25437d3..f973823 100644 --- a/doc/implementers-guide/Makefile.am +++ b/doc/implementers-guide/Makefile.am @@ -4,7 +4,7 @@ all-local: $(TARGET) $(TARGET): implementers-guide.adoc @mkdir -p $(top_srcdir)/doc/output - asciidoc --out-file=$@ $< + asciidoc -b html5 -a icons -a toc2 -a max-width=55em --out-file=$@ $< clean-local: rm -f $(TARGET) diff --git a/doc/users-guide/Makefile.am b/doc/users-guide/Makefile.am index 312358d..3a804d1 100644 --- a/doc/users-guide/Makefile.am +++ b/doc/users-guide/Makefile.am @@ -4,7 +4,7 @@ all-local: $(TARGET) $(TARGET): users-guide.adoc @mkdir -p $(top_srcdir)/doc/output - asciidoc --out-file=$@ $< + asciidoc -b html5 -a icons -a toc2 -a max-width=55em --out-file=$@ $< clean-local: rm -f $(TARGET)
Signed-off-by: Mike Holmes <mike.holmes@linaro.org> --- doc/implementers-guide/Makefile.am | 2 +- doc/users-guide/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)