| Message ID | 1437665602-6564-1-git-send-email-stuart.haslam@linaro.org |
|---|---|
| State | Accepted |
| Commit | 2a0d3198fd423a3315248f6234e9288dc31b4307 |
| Headers | show |
sing patch: lng-odp_API-NEXT_PATCH_validation_common_fix_VPATH_builds.mbox Trying to apply patch Patch applied ERROR: Remove Gerrit Change-Id's before submitting upstream. #8: Change-Id: Icc73306eabc211cbb77d4fa57d493f7ebbea7447 We need to make changes to checkpatch possibly, looks like there are some interactions with gerrit On 23 July 2015 at 11:33, Stuart Haslam <stuart.haslam@linaro.org> wrote: > libs are in $(top_builddir) rather than $(top_srcdir). > > Change-Id: Icc73306eabc211cbb77d4fa57d493f7ebbea7447 > Signed-off-by: Stuart Haslam <stuart.haslam@linaro.org> > Assuming that for ODP we will not mind gerrit IDs - I don’t see a reason to worry about them, but open to education :) Reviewed-by: Mike Holmes <mike.holmes@linaro.org> > --- > test/validation/Makefile.inc | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/test/validation/Makefile.inc b/test/validation/Makefile.inc > index 439a304..ac80814 100644 > --- a/test/validation/Makefile.inc > +++ b/test/validation/Makefile.inc > @@ -1,8 +1,8 @@ > include $(top_srcdir)/test/Makefile.inc > > -COMMON_DIR = $(top_srcdir)/test/validation/common > +COMMON_DIR = $(top_builddir)/test/validation/common > > -AM_CFLAGS += -I$(COMMON_DIR) > +AM_CFLAGS += -I$(top_srcdir)/test/validation/common > AM_LDFLAGS += -static > > LIBCUNIT_COMMON = $(COMMON_DIR)/libcunit_common.la > -- > 2.1.1 > > _______________________________________________ > lng-odp mailing list > lng-odp@lists.linaro.org > https://lists.linaro.org/mailman/listinfo/lng-odp >
On Thu, Jul 23, 2015 at 12:43:01PM -0400, Mike Holmes wrote: > sing patch: lng-odp_API-NEXT_PATCH_validation_common_fix_VPATH_builds.mbox > Trying to apply patch > Patch applied > ERROR: Remove Gerrit Change-Id's before submitting upstream. > #8: > Change-Id: Icc73306eabc211cbb77d4fa57d493f7ebbea7447 > > We need to make changes to checkpatch possibly, looks like there are some > interactions with gerrit Hrm, yes this is because of a commit hook I added to insert the Change-Id required for gerrit. I suppose I could've removed it before sending to the list, but there doesn't seem much point. checkpatch is complaining because they don't want Change-Ids in the kernel git log, but if we're merging changes directly via gerrit we're going to have them (unless there's some way to strip them on merge?). It's going to look a bit messy if we're not consistent though, so does that mean all changes need a Change-Id?.. and what about when changes from api-next get merged to master (which doesn't use gerrit). Oof. > On 23 July 2015 at 11:33, Stuart Haslam <stuart.haslam@linaro.org> wrote: > > > libs are in $(top_builddir) rather than $(top_srcdir). > > > > Change-Id: Icc73306eabc211cbb77d4fa57d493f7ebbea7447 > > Signed-off-by: Stuart Haslam <stuart.haslam@linaro.org> > > > > Assuming that for ODP we will not mind gerrit IDs - I don’t see a reason to > worry about them, but open to education :) > Reviewed-by: Mike Holmes <mike.holmes@linaro.org> > > > > --- > > test/validation/Makefile.inc | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/test/validation/Makefile.inc b/test/validation/Makefile.inc > > index 439a304..ac80814 100644 > > --- a/test/validation/Makefile.inc > > +++ b/test/validation/Makefile.inc > > @@ -1,8 +1,8 @@ > > include $(top_srcdir)/test/Makefile.inc > > > > -COMMON_DIR = $(top_srcdir)/test/validation/common > > +COMMON_DIR = $(top_builddir)/test/validation/common > > > > -AM_CFLAGS += -I$(COMMON_DIR) > > +AM_CFLAGS += -I$(top_srcdir)/test/validation/common > > AM_LDFLAGS += -static > > > > LIBCUNIT_COMMON = $(COMMON_DIR)/libcunit_common.la > > -- > > 2.1.1 > > > > _______________________________________________ > > lng-odp mailing list > > lng-odp@lists.linaro.org > > https://lists.linaro.org/mailman/listinfo/lng-odp > >
On 23 July 2015 at 13:03, Stuart Haslam <stuart.haslam@linaro.org> wrote: > On Thu, Jul 23, 2015 at 12:43:01PM -0400, Mike Holmes wrote: > > sing patch: > lng-odp_API-NEXT_PATCH_validation_common_fix_VPATH_builds.mbox > > Trying to apply patch > > Patch applied > > ERROR: Remove Gerrit Change-Id's before submitting upstream. > > #8: > > Change-Id: Icc73306eabc211cbb77d4fa57d493f7ebbea7447 > > > > We need to make changes to checkpatch possibly, looks like there are some > > interactions with gerrit > > Hrm, yes this is because of a commit hook I added to insert the > Change-Id required for gerrit. I suppose I could've removed it before > sending to the list, but there doesn't seem much point. checkpatch is > complaining because they don't want Change-Ids in the kernel git log, > but if we're merging changes directly via gerrit we're going to have > them (unless there's some way to strip them on merge?). > > It's going to look a bit messy if we're not consistent though, so does > that mean all changes need a Change-Id?.. and what about when changes > from api-next get merged to master (which doesn't use gerrit). Oof. > I don’t think they do any harm and I don’t think it matters if some patches have an ID and others don’t. They just look like another line on the sign off list and that has an arbitrary number of sign offs already. > > > On 23 July 2015 at 11:33, Stuart Haslam <stuart.haslam@linaro.org> > wrote: > > > > > libs are in $(top_builddir) rather than $(top_srcdir). > > > > > > Change-Id: Icc73306eabc211cbb77d4fa57d493f7ebbea7447 > > > Signed-off-by: Stuart Haslam <stuart.haslam@linaro.org> > > > > > > > Assuming that for ODP we will not mind gerrit IDs - I don’t see a reason > to > > worry about them, but open to education :) > > Reviewed-by: Mike Holmes <mike.holmes@linaro.org> > > > > > > > --- > > > test/validation/Makefile.inc | 4 ++-- > > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > > > diff --git a/test/validation/Makefile.inc > b/test/validation/Makefile.inc > > > index 439a304..ac80814 100644 > > > --- a/test/validation/Makefile.inc > > > +++ b/test/validation/Makefile.inc > > > @@ -1,8 +1,8 @@ > > > include $(top_srcdir)/test/Makefile.inc > > > > > > -COMMON_DIR = $(top_srcdir)/test/validation/common > > > +COMMON_DIR = $(top_builddir)/test/validation/common > > > > > > -AM_CFLAGS += -I$(COMMON_DIR) > > > +AM_CFLAGS += -I$(top_srcdir)/test/validation/common > > > AM_LDFLAGS += -static > > > > > > LIBCUNIT_COMMON = $(COMMON_DIR)/libcunit_common.la > > > -- > > > 2.1.1 > > > > > > _______________________________________________ > > > lng-odp mailing list > > > lng-odp@lists.linaro.org > > > https://lists.linaro.org/mailman/listinfo/lng-odp > > > >
So no objections about patch itself? Maxim. On 07/23/15 20:23, Mike Holmes wrote: > > > On 23 July 2015 at 13:03, Stuart Haslam <stuart.haslam@linaro.org > <mailto:stuart.haslam@linaro.org>> wrote: > > On Thu, Jul 23, 2015 at 12:43:01PM -0400, Mike Holmes wrote: > > sing patch: > lng-odp_API-NEXT_PATCH_validation_common_fix_VPATH_builds.mbox > > Trying to apply patch > > Patch applied > > ERROR: Remove Gerrit Change-Id's before submitting upstream. > > #8: > > Change-Id: Icc73306eabc211cbb77d4fa57d493f7ebbea7447 > > > > We need to make changes to checkpatch possibly, looks like there > are some > > interactions with gerrit > > Hrm, yes this is because of a commit hook I added to insert the > Change-Id required for gerrit. I suppose I could've removed it before > sending to the list, but there doesn't seem much point. checkpatch is > complaining because they don't want Change-Ids in the kernel git log, > but if we're merging changes directly via gerrit we're going to have > them (unless there's some way to strip them on merge?). > > It's going to look a bit messy if we're not consistent though, so does > that mean all changes need a Change-Id?.. and what about when changes > from api-next get merged to master (which doesn't use gerrit). Oof. > > > I don’t think they do any harm and I don’t think it matters if some > patches have an ID and others don’t. They just look like another line > on the sign off list and that has an arbitrary number of sign offs > already. > > > > > > > On 23 July 2015 at 11:33, Stuart Haslam > <stuart.haslam@linaro.org <mailto:stuart.haslam@linaro.org>> wrote: > > > > > libs are in $(top_builddir) rather than $(top_srcdir). > > > > > > Change-Id: Icc73306eabc211cbb77d4fa57d493f7ebbea7447 > > > Signed-off-by: Stuart Haslam <stuart.haslam@linaro.org > <mailto:stuart.haslam@linaro.org>> > > > > > > > Assuming that for ODP we will not mind gerrit IDs - I don’t see > a reason to > > worry about them, but open to education :) > > Reviewed-by: Mike Holmes <mike.holmes@linaro.org > <mailto:mike.holmes@linaro.org>> > > > > > > > --- > > > test/validation/Makefile.inc | 4 ++-- > > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > > > diff --git a/test/validation/Makefile.inc > b/test/validation/Makefile.inc > > > index 439a304..ac80814 100644 > > > --- a/test/validation/Makefile.inc > > > +++ b/test/validation/Makefile.inc > > > @@ -1,8 +1,8 @@ > > > include $(top_srcdir)/test/Makefile.inc > > > > > > -COMMON_DIR = $(top_srcdir)/test/validation/common > > > +COMMON_DIR = $(top_builddir)/test/validation/common > > > > > > -AM_CFLAGS += -I$(COMMON_DIR) > > > +AM_CFLAGS += -I$(top_srcdir)/test/validation/common > > > AM_LDFLAGS += -static > > > > > > LIBCUNIT_COMMON = $(COMMON_DIR)/libcunit_common.la > <http://libcunit_common.la> > > > -- > > > 2.1.1 > > > > > > _______________________________________________ > > > lng-odp mailing list > > > lng-odp@lists.linaro.org <mailto: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 > > > > _______________________________________________ > lng-odp mailing list > lng-odp@lists.linaro.org > https://lists.linaro.org/mailman/listinfo/lng-odp
On 23 July 2015 at 17:08, Maxim Uvarov <maxim.uvarov@linaro.org> wrote: > So no objections about patch itself? > Not form me, just need to update checkpatch to not warn on gerrit IDs when used with ODP > > Maxim. > > On 07/23/15 20:23, Mike Holmes wrote: > >> >> >> On 23 July 2015 at 13:03, Stuart Haslam <stuart.haslam@linaro.org >> <mailto:stuart.haslam@linaro.org>> wrote: >> >> On Thu, Jul 23, 2015 at 12:43:01PM -0400, Mike Holmes wrote: >> > sing patch: >> lng-odp_API-NEXT_PATCH_validation_common_fix_VPATH_builds.mbox >> > Trying to apply patch >> > Patch applied >> > ERROR: Remove Gerrit Change-Id's before submitting upstream. >> > #8: >> > Change-Id: Icc73306eabc211cbb77d4fa57d493f7ebbea7447 >> > >> > We need to make changes to checkpatch possibly, looks like there >> are some >> > interactions with gerrit >> >> Hrm, yes this is because of a commit hook I added to insert the >> Change-Id required for gerrit. I suppose I could've removed it before >> sending to the list, but there doesn't seem much point. checkpatch is >> complaining because they don't want Change-Ids in the kernel git log, >> but if we're merging changes directly via gerrit we're going to have >> them (unless there's some way to strip them on merge?). >> >> It's going to look a bit messy if we're not consistent though, so does >> that mean all changes need a Change-Id?.. and what about when changes >> from api-next get merged to master (which doesn't use gerrit). Oof. >> >> >> I don’t think they do any harm and I don’t think it matters if some >> patches have an ID and others don’t. They just look like another line on >> the sign off list and that has an arbitrary number of sign offs already. >> >> >> >> >> >> > On 23 July 2015 at 11:33, Stuart Haslam >> <stuart.haslam@linaro.org <mailto:stuart.haslam@linaro.org>> wrote: >> > >> > > libs are in $(top_builddir) rather than $(top_srcdir). >> > > >> > > Change-Id: Icc73306eabc211cbb77d4fa57d493f7ebbea7447 >> > > Signed-off-by: Stuart Haslam <stuart.haslam@linaro.org >> <mailto:stuart.haslam@linaro.org>> >> > > >> > >> > Assuming that for ODP we will not mind gerrit IDs - I don’t see >> a reason to >> > worry about them, but open to education :) >> > Reviewed-by: Mike Holmes <mike.holmes@linaro.org >> <mailto:mike.holmes@linaro.org>> >> > >> > >> > > --- >> > > test/validation/Makefile.inc | 4 ++-- >> > > 1 file changed, 2 insertions(+), 2 deletions(-) >> > > >> > > diff --git a/test/validation/Makefile.inc >> b/test/validation/Makefile.inc >> > > index 439a304..ac80814 100644 >> > > --- a/test/validation/Makefile.inc >> > > +++ b/test/validation/Makefile.inc >> > > @@ -1,8 +1,8 @@ >> > > include $(top_srcdir)/test/Makefile.inc >> > > >> > > -COMMON_DIR = $(top_srcdir)/test/validation/common >> > > +COMMON_DIR = $(top_builddir)/test/validation/common >> > > >> > > -AM_CFLAGS += -I$(COMMON_DIR) >> > > +AM_CFLAGS += -I$(top_srcdir)/test/validation/common >> > > AM_LDFLAGS += -static >> > > >> > > LIBCUNIT_COMMON = $(COMMON_DIR)/libcunit_common.la >> <http://libcunit_common.la> >> > > -- >> > > 2.1.1 >> > > >> > > _______________________________________________ >> > > lng-odp mailing list >> > > lng-odp@lists.linaro.org <mailto: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 >> >> >> >> _______________________________________________ >> lng-odp mailing list >> 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 >
diff --git a/test/validation/Makefile.inc b/test/validation/Makefile.inc index 439a304..ac80814 100644 --- a/test/validation/Makefile.inc +++ b/test/validation/Makefile.inc @@ -1,8 +1,8 @@ include $(top_srcdir)/test/Makefile.inc -COMMON_DIR = $(top_srcdir)/test/validation/common +COMMON_DIR = $(top_builddir)/test/validation/common -AM_CFLAGS += -I$(COMMON_DIR) +AM_CFLAGS += -I$(top_srcdir)/test/validation/common AM_LDFLAGS += -static LIBCUNIT_COMMON = $(COMMON_DIR)/libcunit_common.la
libs are in $(top_builddir) rather than $(top_srcdir). Change-Id: Icc73306eabc211cbb77d4fa57d493f7ebbea7447 Signed-off-by: Stuart Haslam <stuart.haslam@linaro.org> --- test/validation/Makefile.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)