Re: [PATCH 2/5] dim: auto-commit in apply-pull if rerere solved it all

On Fri, May 4, 2018 at 9:39 PM, Dave Airlie <airl...@gmail.com> wrote: > On 5 May 2018 at 00:10, Jani Nikula <jani.nik...@linux.intel.com> wrote: >> On Fri, 04 May 2018, Daniel Vetter <daniel.vet...@ffwll.ch> wrote: >>> Now that we experiment with di

Re: [PATCH 3/5] dim: shut up sed broken pipe noise in apply-pull

On Mon, May 7, 2018 at 9:14 AM, Jani Nikula <jani.nik...@linux.intel.com> wrote: > On Fri, 04 May 2018, Daniel Vetter <daniel.vet...@ffwll.ch> wrote: >> On Fri, May 4, 2018 at 4:11 PM, Jani Nikula <jani.nik...@linux.intel.com> >> wrote: >>> On F

[PATCH] dim: switch to dry-run in warn_or_fail

-pull Cc: Dave Airlie <airl...@gmail.com> Signed-off-by: Daniel Vetter <daniel.vet...@intel.com> --- dim | 13 + 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dim b/dim index d8288a342352..499ffcfdd807 100755 --- a/dim +++ b/dim @@ -144,6 +144,12 @@ function

Re: current dim master misapplies a pull

im should detect whether the pull is for a dim-managed branch, and only check for Link: tags in that case. With dim -f apply-pull drm-next it all goes through smoothly. -Daniel -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch ___

Re: [DIM PATCH 3/3] dim: Don't use --set-upstream

cd $DIM_PREFIX/drm-rerere > -- > Sean Paul, Software Engineer, Google / Chromium OS > > ___ > dim-tools mailing list > dim-tools@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dim-tools -- Daniel Vetter Sof

Re: [PATCH] dim: fix the repo for drm-next

gt; This fixes dim status and a bunch of pull request and other commands. > > Cc: Daniel Vetter <daniel.vet...@ffwll.ch> > Signed-off-by: Jani Nikula <jani.nik...@intel.com> > --- > dim | 16 ++-- > 1 file changed, 6 insertions(+), 10 deletions(-) >

Re: [PATCH 2/4] dim: shut up sed broken pipe noise in apply-pull

On Wed, May 09, 2018 at 11:10:18AM -0700, Lucas De Marchi wrote: > On Fri, May 4, 2018 at 12:04 AM, Daniel Vetter <daniel.vet...@ffwll.ch> wrote: > > "head" immediately closes its stdin, which upsets sed. Shut it up. > > > > Cc: Dave Airlie <airl...@gma

Re: [Intel-gfx] [PATCH] dim: replace pipe commands with single sed

> I noticed this while reviewing "[PATCH 2/4] dim: shut up sed broken pipe > > noise in apply-pull". Reviewed-by: Daniel Vetter <daniel.vet...@ffwll.ch> > > > > dim | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a

Re: [PATCH 4/4] dim: store Link: in MERGE_MSG in apply-pull

On Fri, May 04, 2018 at 04:00:53PM +0300, Jani Nikula wrote: > On Fri, 04 May 2018, Daniel Vetter <daniel.vet...@ffwll.ch> wrote: > > This way there's no need for a dim apply-pull-continue, plain old git > > commit is enough. > > > > Aside: We might want to do th

[PATCH 4/5] dim: bail apply-pull if the msg-id isn't there

Looks funny, but let's allow it to be overriden. Also move it up before we commit to the merge. v2: Remeber to remove the old message_id parsing (Jani). Cc: Jani Nikula <jani.nik...@linux.intel.com> Cc: Dave Airlie <airl...@gmail.com> Signed-off-by: Daniel Vetter <daniel.

[PATCH 3/5] dim: shut up sed broken pipe noise in apply-pull

"head" immediately closes its stdin, which upsets sed. Shut it up. Cc: Dave Airlie <airl...@gmail.com> Signed-off-by: Daniel Vetter <daniel.vet...@intel.com> --- dim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dim b/dim index 97b4f8d1531b..010dd20

[PATCH 1/5] dim: check all commits in dim apply-pull and push-branch

ie <airl...@gmail.com> Signed-off-by: Daniel Vetter <daniel.vet...@intel.com> --- dim | 46 +- 1 file changed, 29 insertions(+), 17 deletions(-) diff --git a/dim b/dim index d8288a342352..d2eb4a0cb6e2 100755 --- a/dim +++ b/dim @@ -734,10 +7

[PATCH 5/5] dim: store Link: in MERGE_MSG in apply-pull

: Jani Nikula <jani.nik...@linux.intel.com> Signed-off-by: Daniel Vetter <daniel.vet...@intel.com> --- dim | 17 - 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/dim b/dim index 2faaab5a966a..1edcfea0caa5 100755 --- a/dim +++ b/dim @@ -519,6 +519,15 @@ fun

[PATCH 2/5] dim: auto-commit in apply-pull if rerere solved it all

com> Signed-off-by: Daniel Vetter <daniel.vet...@intel.com> --- dim | 20 +++- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/dim b/dim index d2eb4a0cb6e2..97b4f8d1531b 100755 --- a/dim +++ b/dim @@ -505,9 +505,7 @@ function check_conflicts # tree

Re: [PATCH] dim: switch to dry-run in warn_or_fail

On Fri, May 04, 2018 at 03:54:07PM +0300, Jani Nikula wrote: > On Fri, 04 May 2018, Daniel Vetter <daniel.vet...@ffwll.ch> wrote: > > When merging a pull requests there's potentially a long list of > > problematic patches. By switching to dry-run mode we can dump them > &

Re: [PATCH 3/5] dim: shut up sed broken pipe noise in apply-pull

On Fri, May 4, 2018 at 4:11 PM, Jani Nikula <jani.nik...@linux.intel.com> wrote: > On Fri, 04 May 2018, Daniel Vetter <daniel.vet...@ffwll.ch> wrote: >> "head" immediately closes its stdin, which upsets sed. Shut it up. > > I don't understand this, care

[PATCH] dim: check for empty pulls

Signed-off-by: Daniel Vetter <daniel.vet...@intel.com> --- dim | 4 1 file changed, 4 insertions(+) diff --git a/dim b/dim index 9ec43df08c4a..65f793a19380 100755 --- a/dim +++ b/dim @@ -939,6 +939,10 @@ function dim_apply_pull echo Pulling $pull_branch ... git fetch

[PATCH] dim: Don't fast-forward in apply-pull

Obvious oversight. Signed-off-by: Daniel Vetter <daniel.vet...@intel.com> --- dim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dim b/dim index ddfb809fcc5c..33acacb24790 100755 --- a/dim +++ b/dim @@ -969,7 +969,7 @@ function dim_appl

[PATCH 2/2] dim: sanity checks for merges

Just checks that merges aren't done without minimal thought. Cc: Jani Nikula <jani.nik...@linux.intel.com> Cc: Dave Airlie <airl...@gmail.com> Signed-off-by: Daniel Vetter <daniel.vet...@intel.com> --- dim | 22 ++ 1 file changed, 22 insertions(+) diff

[PATCH 1/2] dim: Fix Link: checking regression

In commit c0c4dc1c924bd1d94315601026a2f9facd8a7f73 Author: Daniel Vetter <daniel.vet...@ffwll.ch> Date: Wed May 2 15:08:24 2018 +0200 dim: check all commits in dim apply-pull and push-branch I broke the managed_branch logic which made sure we don't check for Link: tags for pulled br

Re: [PATCH] dim: check for empty pulls

On Tue, May 15, 2018 at 12:34 PM, Jani Nikula <jani.nik...@linux.intel.com> wrote: > On Tue, 15 May 2018, Daniel Vetter <daniel.vet...@ffwll.ch> wrote: >> This could be a parsing error of the pull (for all the people who >> don't use a script like dim pull-request

Re: [PATCH] dim: Don't fast-forward in apply-pull

On Fri, May 18, 2018 at 10:33 AM, Maarten Lankhorst <maarten.lankho...@linux.intel.com> wrote: > Op 18-05-18 om 09:31 schreef Daniel Vetter: >> Obvious oversight. >> >> Signed-off-by: Daniel Vetter <daniel.vet...@intel.com> >> --- >> dim | 2 +- &

Re: [PATCH 1/2] dim: Make branch_to_remote more robust

On Tue, May 22, 2018 at 1:41 PM, Jani Nikula <jani.nik...@intel.com> wrote: > On Tue, 22 May 2018, Daniel Vetter <daniel.vet...@ffwll.ch> wrote: >> The old version relied on branch@{upstream}, which requires that >> the branch is checked out. Instead use the indirection

[PATCH 1/2] dim: Make branch_to_remote more robust

The old version relied on branch@{upstream}, which requires that the branch is checked out. Instead use the indirection through the abstract drm-tip repo. Cc: Jani Nikula <jani.nik...@intel.com> Signed-off-by: Daniel Vetter <daniel.vet...@intel.com> --- dim | 6 +++--- 1 fil

[PATCH 2/2] dim: Look up drm-next/fixes remotes

a maintainer, no longer). Cc: Jani Nikula <jani.nik...@intel.com> Signed-off-by: Daniel Vetter <daniel.vet...@intel.com> --- dim | 18 ++ 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dim b/dim index 118c446b87d5..4a8184ce2f80 100755 --- a/dim +++ b/di

[PATCH] dim: Make branch_to_remote more robust

this change removes some of the implicit validation that the branch has a local tracking branch. I only spotted one place where an assert_branch was missing. Cc: Jani Nikula <jani.nik...@intel.com> Signed-off-by: Daniel Vetter <daniel.vet...@intel.com> --- dim | 14 +++--- 1 file

[PATCH 1/5] dim: exclude commits from subordinate trees in pull-request

that. Cc: Dave Airlie <airl...@gmail.com> Signed-off-by: Daniel Vetter <daniel.vet...@intel.com> --- dim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dim b/dim index 5308d07aee00..629fe1cb71be 100755 --- a/dim +++ b/dim @@ -1764,7 +1764,7 @@ function dim

[PATCH 5/5] dim: Look up drm-next/fixes remotes

a maintainer, no longer). v2: Rebase, I had a patch in my local tree which isn't needed with this one here anymore. Cc: Jani Nikula <jani.nik...@intel.com> Signed-off-by: Daniel Vetter <daniel.vet...@intel.com> --- dim | 20 ++-- 1 file changed, 10 insertions(+),

[PATCH 4/5] dim: Make branch_to_remote more robust

this change removes some of the implicit validation that the branch has a local tracking branch. I only spotted one place where an assert_branch was missing. Cc: Jani Nikula <jani.nik...@intel.com> Signed-off-by: Daniel Vetter <daniel.vet...@intel.com> --- dim | 14 +++--- 1 file

Re: [RFC] dim: Add warncheck subcommand

; > Please use echoerr for error messages throughout. > >> + >> +# error will probably propagate, let's cut the noise >> +echo > > I'm not fond of superfluous whitespace in output. > >> +echo "Quitting early. P

Re: [PULL] drm-intel-next

; this doesn't conflict with tagging manageable sized batches > in dinq like Rodrigo has done here. So we're good. The scripts don't require to send out a pull request when only tagging, I guess this pull here was just a fumble? -Daniel -- Daniel Vetter Software Engineer, Intel Corporation +41 (

Re: [PULL] drm-intel-next

ed batches > in dinq like Rodrigo has done here. So we're good. > > BR, > Jani. > > -- > Jani Nikula, Intel Open Source Graphics Center -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch ___ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools

Re: [PATCH 5/5] dim: Look up drm-next/fixes remotes

On Wed, May 23, 2018 at 9:27 AM, Daniel Vetter wrote: > ... instead of hard-coding them. Will allow us to move the drm > subsystem trees around without also having to update dim. Just a heads-up, I'm doing the nightly.conf book-keeping now to also move drm-fixes over. Hopefully should al

[PATCH] qf: Add TODO

We have some documents floating around internally, imo better if we track at least the simple ideas here ... v2: Alternative approach for getting rid of the patch rediffing noise. Cc: Lucas De Marchi Cc: Rodrigo Vivi Signed-off-by: Daniel Vetter --- qf | 8 1 file changed, 8

[PATCH] dim: Look up drm-next/fixes remotes

a maintainer, no longer). v2: Rebase, I had a patch in my local tree which isn't needed with this one here anymore. v3: Don't forget the drm-next branch name I accidentally dropped (Jani). Cc: Jani Nikula Signed-off-by: Daniel Vetter --- dim | 20 ++-- 1 file changed, 10

[PATCH] qf: Add TODO

We have some documents floating around internally, imo better if we track at least the simple ideas here ... Cc: Lucas De Marchi Cc: Rodrigo Vivi Signed-off-by: Daniel Vetter --- qf | 8 1 file changed, 8 insertions(+) diff --git a/qf b/qf index bffe9b753fa0..c606936c9c4c 100755

Re: [PATCH] dim: Look up drm-next/fixes remotes

On Thu, May 31, 2018 at 1:54 PM, Jani Nikula wrote: > On Wed, 30 May 2018, Daniel Vetter wrote: >> On Wed, May 30, 2018 at 09:44:24AM +0200, Daniel Vetter wrote: >>> ... instead of hard-coding them. Will allow us to move the drm >>> subsystem trees around withou

Re: [PATCH] qf: Add TODO

On Wed, May 30, 2018 at 6:24 PM, Rodrigo Vivi wrote: > On Wed, May 30, 2018 at 09:22:34AM -0700, Rodrigo Vivi wrote: >> On Wed, May 30, 2018 at 09:43:43AM +0200, Daniel Vetter wrote: >> > We have some documents floating around internally, imo better if we >> > track at

Re: [DIM DOCS PATCH 1/2] doc: update CI and pre-merge details in committer guidelines

ure out what's going on. > +.. _patchwork: https://patchwork.freedesktop.org/project/intel-gfx/series/ > > Tooling > === > -- > 2.11.0 > > ___ > dim-tools mailing list > dim-tools@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dim-tools -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch ___ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools

Re: [DIM DOCS PATCH 2/2] doc: clarify what type of changes are acceptable at commit time

weaks are acceptable. > + > On Confidence, Complexity, and Transparency > --- > > -- > 2.11.0 > > ___ > dim-tools mailing list > dim-tools@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dim-to

Re: [PATCH] dim: handle parse failures in apply_pull better

On Tue, May 01, 2018 at 04:29:10PM -0400, Sean Paul wrote: > On Mon, Apr 30, 2018 at 08:29:57AM +0200, Daniel Vetter wrote: > > We're relying on get fetch failing and set -e, but that doesn't work > > if we parse nothing: In that case git fetch just fetches upstream and > > s

Re: [PATCH] docs: More links to the conflict resolution howto

On Thu, Apr 26, 2018 at 05:31:32PM +0200, Daniel Vetter wrote: > It's a bit a FAQ, and good excuse to use native sphinx links (now that > we do/will use sphinx for everything). > > Cc: Jani Nikula <jani.nik...@intel.com> > Signed-off-by: Daniel Vetter <daniel.vet...@in

Re: [PATCH 3/3] dim+qf: fix shellcheck SC2209

On Thu, Apr 26, 2018 at 5:47 PM, Daniel Vetter <daniel.vet...@ffwll.ch> wrote: > Seems like a fairly reasonable thing to check to me, so lets appease > it. For reference: SC2209: Use var=$(command) to assign output (or quote to assign string). Need to add that to the commit mess

Re: [PATCH 2/3] Makefile: shut up about SC1117 and SC2207 in shellcheck

On Thu, Apr 26, 2018 at 6:14 PM, Jani Nikula <jani.nik...@linux.intel.com> wrote: > On Thu, 26 Apr 2018, Daniel Vetter <daniel.vet...@ffwll.ch> wrote: >> Not sure how this happened, but we gained a lot of errors. I think we should >> exclude these two since we have l

[PATCH] docs: More links to the conflict resolution howto

It's a bit a FAQ, and good excuse to use native sphinx links (now that we do/will use sphinx for everything). Cc: Jani Nikula <jani.nik...@intel.com> Signed-off-by: Daniel Vetter <daniel.vet...@intel.com> --- dim.rst | 6 -- drm-tip.rst | 2 ++ repositories.rst

Re: [PATCH] docs: More links to the conflict resolution howto

On Thu, Apr 26, 2018 at 05:49:30PM +0200, Daniel Vetter wrote: > On Thu, Apr 26, 2018 at 05:31:32PM +0200, Daniel Vetter wrote: > > It's a bit a FAQ, and good excuse to use native sphinx links (now that > > we do/will use sphinx for everything). > > > > Cc: Jani Ni

[PATCH] dim: handle parse failures in apply_pull better

We're relying on get fetch failing and set -e, but that doesn't work if we parse nothing: In that case git fetch just fetches upstream and succeed. Dave stumbled over this by feeding a .mbox with dos linefeeds into dim. Cc: Dave Airlie <airl...@gmail.com> Signed-off-by: Daniel Vetter <d

[PATCH 2/2] dim: exclude commits from subordinate trees in pull-request

that. Cc: Dave Airlie <airl...@gmail.com> Signed-off-by: Daniel Vetter <daniel.vet...@intel.com> --- dim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dim b/dim index cf7ad2dae35f..d8288a342352 100755 --- a/dim +++ b/dim @@ -1721,7 +1721,7 @@ function dim

[PATCH 1/2] dim: Add new drm upstreams

We might want to hold of on pushing this one until it's clearer that drm group maintainership takes off. Cc: Dave Airlie <airl...@gmail.com> Signed-off-by: Daniel Vetter <daniel.vet...@intel.com> --- dim | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dim b/dim index

[PATCH] dim: handle parse failures in apply_pull better

gt; Cc: Dave Airlie <airl...@gmail.com> Signed-off-by: Daniel Vetter <daniel.vet...@intel.com> --- dim | 7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dim b/dim index ec51e36b1269..1d78ca275c5d 100755 --- a/dim +++ b/dim @@ -901,7 +901,12 @@ funct

[PATCH] dim: fix url_to_remote

We've only been matching prefixes, which totally broke with the new drm/drm.git repo. Make sure we match the full url. v2: Remove the debug leftovers (Jani). Acked-by: Jani Nikula <jani.nik...@linux.intel.com> Signed-off-by: Daniel Vetter <daniel.vet...@ffwll.ch> --- dim | 2 +- 1

Re: [PATCH] drm-misc.rst: Document commit rights

On Thu, Apr 26, 2018 at 04:54:23PM +0200, Lukas Wunner wrote: > On Thu, Apr 26, 2018 at 04:25:57PM +0200, Daniel Vetter wrote: > > This is the exact same text as proposed for igt: > > > > https://patchwork.kernel.org/patch/10339739/ > > > > With one minor c

[PATCH 2/4] dim: shut up sed broken pipe noise in apply-pull

"head" immediately closes its stdin, which upsets sed. Shut it up. Cc: Dave Airlie <airl...@gmail.com> Signed-off-by: Daniel Vetter <daniel.vet...@intel.com> --- dim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dim b/dim index b771f9dc5f0d..518043c

[PATCH 3/4] dim: bail apply-pull if the msg-id isn't there

Looks funny, but let's allow it to be overriden. Also move it up before we commit to the merge. Cc: Dave Airlie <airl...@gmail.com> Signed-off-by: Daniel Vetter <daniel.vet...@ffwll.ch> --- dim | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dim

[PATCH 1/4] dim: auto-commit in apply-pull if rerere solved it all

com> Signed-off-by: Daniel Vetter <daniel.vet...@intel.com> --- dim | 20 +++- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/dim b/dim index 499ffcfdd807..b771f9dc5f0d 100755 --- a/dim +++ b/dim @@ -511,9 +511,7 @@ function check_conflicts # tree

[PATCH 4/4] dim: store Link: in MERGE_MSG in apply-pull

This way there's no need for a dim apply-pull-continue, plain old git commit is enough. Aside: We might want to do the same trick for dim apply-branch, but git am is a bit harder to script. Cc: Dave Airlie <airl...@gmail.com> Signed-off-by: Daniel Vetter <daniel.vet...@intel.com> -

Re: [PATCH] dim: remove all mentions of drm-upstream

On Tue, Jun 19, 2018 at 01:12:00PM +0100, Daniel Stone wrote: > On Tue, 19 Jun 2018 at 13:08, Daniel Vetter wrote: > > The one case in dim_status is entirely unused. > > > > The usage in dim_setup seems still in use, but this is code for > > backwards compat hacks pred

[PATCH] dim: allow tags in backmerges

-by: Dave Airlie Cc: Dave Airlie Signed-off-by: Daniel Vetter --- dim | 4 +++- dim.rst | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dim b/dim index e477d043458b..d4a1efc50d2a 100755 --- a/dim +++ b/dim @@ -1011,7 +1011,9 @@ function dim_backmerge upstream

[PATCH] dim: allow tags in backmerges

Signed-off-by: Daniel Vetter --- dim | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dim b/dim index e477d043458b..d4a1efc50d2a 100755 --- a/dim +++ b/dim @@ -1011,7 +1011,9 @@ function dim_backmerge upstream=${2:?$usage} if ! dim_list_upstreams | grep -q

[PATCH] dim: allow tags in backmerges

the check work from anywhere, we need to move the cd a bit up (Dave). Requested-by: Dave Airlie Cc: Dave Airlie Signed-off-by: Daniel Vetter --- dim | 7 +-- dim.rst | 3 ++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dim b/dim index e477d043458b..5ca4646ff685 100755

[PATCH] dim: add From: tags for pull requests

Cc: Dave Airlie Signed-off-by: Daniel Vetter --- dim | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dim b/dim index 5ca4646ff685..a1c194318b56 100755 --- a/dim +++ b/dim @@ -945,7 +945,7 @@ function dim_apply_branch function dim_apply_pull { - local branch file

Re: [PATCH] dim: allow tags in backmerges

On Mon, Aug 6, 2018 at 10:16 PM, Dave Airlie wrote: > On 7 August 2018 at 06:11, Daniel Vetter wrote: >> Linus prefers that we backmerge a specific tag instead of a random >> point in his branch. Allow that. >> >> I guess it'd be nice to somehow figure out where

[PATCH 1/2] dim: clarify dimrc a bit

Some notes I took while ramping up Shashank on dim. Aside: Requiring that DIM_REPO is already checked out seems to confuse too. Maybe we should just fall back to initializing an empty git repo - we'll all all the branches and remotes anyway. Cc: Shashank Sharma Signed-off-by: Daniel Vetter

[PATCH 2/2] Split out README.rst

-tools. But this should be good enough for now. Signed-off-by: Daniel Vetter --- README.rst | 16 index.rst | 16 +--- 2 files changed, 17 insertions(+), 15 deletions(-) create mode 100644 README.rst diff --git a/README.rst b/README.rst new file mode 100644 index

[PATCH 1/2] Split out CONTRIBUTING.rst

This way gitlab will automatically spot it and show it when people try to do a merge request or file an issue. Also shrink the title a bit, it looks terrible in the sidebar. Signed-off-by: Daniel Vetter --- CONTRIBUTING.rst | 11 +++ dim.rst | 12 index.rst

Re: [PATCH] dim: Add dim rebase command

ile > + > + branch=${1:?$usage} > + upstream=${2:?$usage} > + > + validate_upstream_branch $branch $upstream > + > + git rebase --signoff $upstream >& /dev/null || true > + if git diff | grep -q '\(<<<<<<<\|===\|>

[PATCH] Migrate to Gitlab

we're going to migrate there will be a read-only copy with all urls working nicely, maintainer-tools is the only exception here. v2: Don't forget about dim_setup. Signed-off-by: Daniel Vetter --- dim | 12 +++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dim b/dim

[PATCH] Add .gitlab-ci.yml

ful, since if you do a fork and test there, gitlab CI will run stuff for you. Example: https://gitlab.freedesktop.org/danvet/maintainer-tools/blob/master/.gitlab-ci.yml Observe the awesome green checkmark in the top-left corner! Signed-off-by: Daniel Vetter --- .gitlab-ci.yml | 9

Re: [PATCH v2] dim: Add dim rebase command

Changes in v2: > - s/validate_upstream_branch/validate_upstream_baseline/ (Daniel) > - Use check_conflicts instead of hand rolling (Daniel) > > Cc: Boris Brezillon > Cc: Daniel Vetter > Signed-off-by: Sean Paul Reviewed-by: Daniel Vetter > --- > dim | 42 +

[PATCH] Add .gitlab-ci.yml

e Marchi Signed-off-by: Daniel Vetter --- .gitlab-ci.yml | 9 + 1 file changed, 9 insertions(+) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index ..382e3cf1442e --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,9 @@ +

[PATCH] Add .gitlab-ci.yml

n fedora the python3 packages have a -3 suffix. Don't ask. Reviewed-by: Lucas De Marchi Signed-off-by: Daniel Vetter --- .gitlab-ci.yml | 9 + 1 file changed, 9 insertions(+) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 10064

Re: [PATCH] Add .gitlab-ci.yml

On Tue, Aug 28, 2018 at 8:04 PM, Lucas De Marchi wrote: > On Tue, Aug 28, 2018 at 10:24 AM Daniel Vetter wrote: >> >> This gives us neat little CI integration. No more "you have a >> different version of shellcheck" - we just pick the one everyone can >>

Re: [PATCH] Migrate to Gitlab

On Tue, Aug 28, 2018 at 9:31 PM, Daniel Vetter wrote: > - Use the https url so we don't require everyone to have their gitlab > accounts ready already. Otherwise we'd need to gate migrating > maintainer-tools on migrating all the drm kernel repos, and I'd > really like

Re: [PATCH 2/3] dim: Introduce dim_request_pull_tags

gt; or with "-1", "-2", etc > > Suggested-by: Daniel Vetter > Cc: Daniel Vetter > Cc: Jani Nikula > Signed-off-by: Rodrigo Vivi > --- > dim | 45 + > dim.rst | 6 ++ > 2 files changed, 51

Re: [PATCH 3/3] dim: Move drm-intel-next specifics to its caller.

On Fri, Aug 24, 2018 at 02:43:36PM -0700, Rodrigo Vivi wrote: > By expanding the usage of new dim_pull_request_tags > we can move the drm-intel-next specific parts to > dim_pull_request_next and simplify the dim_pull_request > limiting it to only create the tags. > > Cc: Daniel

Re: [PATCH 1/3] dim: Move special handling of drm-intel-next's repo to branch_to_repo

On Fri, Aug 24, 2018 at 02:43:34PM -0700, Rodrigo Vivi wrote: > I don't understand exactly why we need this special handling only > for drm-intel-next. But let's at least consolidate this into > branch_to_repo instead of spreading it around. > > Cc: Jani Nikula > Cc: Daniel Ve

RFC: Migration to Gitlab

nal to commit rights. - Anything else I've forgotten. A lot of this still needs to be figured out first. As a first step I'm looking for volunteers who want to join the fun, besides comments and thoughts on the overall topic of course. Cheers, Daniel -- Daniel Vetter Software Engineer, Intel Corpor

Re: [igt-dev] RFC: Migration to Gitlab

On Wed, Aug 22, 2018 at 3:13 PM, Jani Nikula wrote: > On Wed, 22 Aug 2018, Daniel Vetter wrote: >> Hi all, >> >> I think it's time to brainstorm a bit about the gitlab migration. Basic >> reasons: >> >> - fd.o admins want to deprecate shell accounts and

[PATCH 1/2] dim: Migrate to Gitlab

) Signed-off-by: Daniel Vetter --- dim | 12 +++- dim.rst | 3 +-- getting-started.rst | 4 ++-- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dim b/dim index 3f5fdb9233f7..3612cc66d1c4 100755 --- a/dim +++ b/dim @@ -76,6 +76,8 @@ dim=$(basename

Re: [PATCH 1/2] dim: Migrate to Gitlab

On Wed, Aug 29, 2018 at 7:10 PM, Sean Paul wrote: > On Wed, Aug 29, 2018 at 05:25:24PM +0200, Daniel Vetter wrote: >> - Use the https url so we don't require everyone to have their gitlab >> accounts ready already. Otherwise we'd need to gate migrating >> maintainer-t

[PATCH 2/2] doc: First attempt at CD

Hiler Cc: Daniel Stone Signed-off-by: Daniel Vetter --- .gitlab-ci.yml | 12 dim.rst| 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9050d3eaf4e8..a23c324e1967 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,3

[PATCH] doc: First attempt at CD

-by: Daniel Vetter --- .gitlab-ci.yml | 12 1 file changed, 12 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9050d3eaf4e8..a23c324e1967 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,3 +7,15 @@ check: stage: build script: - make check

Re: [PATCH 1/2] dim: Migrate to Gitlab

On Wed, Aug 29, 2018 at 7:42 PM, Sean Paul wrote: > On Wed, Aug 29, 2018 at 01:40:26PM -0400, Sean Paul wrote: >> On Wed, Aug 29, 2018 at 07:32:26PM +0200, Daniel Vetter wrote: >> > On Wed, Aug 29, 2018 at 7:10 PM, Sean Paul wrote: >> > > On Wed, Aug 29, 2018 at 0

[PATCH] dim: Migrate to Gitlab

Acked-by: Rodrigo Vivi (v2) Reviewed-by: Daniel Stone (v2) Signed-off-by: Daniel Vetter --- dim | 5 +++-- dim.rst | 3 +-- getting-started.rst | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dim b/dim index 3612cc66d1c4..2176f8b5 100755

[PATCH] dim: Migrate to Gitlab

Vivi Cc: Daniel Stone Acked-by: Rodrigo Vivi (v2) Reviewed-by: Daniel Stone (v2) Reviewed-by: Sean Paul (v3) Signed-off-by: Daniel Vetter --- dim | 14 +- dim.rst | 3 +-- getting-started.rst | 4 ++-- 3 files changed, 16 insertions(+), 5 deletions

Re: [DIM DOCS PATCH 2/2] doc: clarify what type of changes are acceptable at commit time

On Thu, Jul 5, 2018 at 3:53 PM, Jani Nikula wrote: > On Wed, 27 Jun 2018, Daniel Vetter wrote: >> On Wed, Jun 27, 2018 at 5:13 PM, Jani Nikula wrote: >>> As a rule of thumb, don't change patches while committing. >>> >>> Cc: Imre Deak >>> Signed-of

Re: [DIM PATCH 2/3] dim: add checkpatch profiles to allow different checkpatch options

;; > + drm-misc-next|drm-misc-next-fixes|drm-misc-fixes) > + profile=drm-misc > + ;; Use branch_to_repo instead, if that doesn't come up with anything, then default? With that little bit of

Re: [Intel-gfx] [DIM PATCH 3/3] dim: loosen some drm-intel checkpatch rules

; drm-intel) > - profile_options="" > + profile_options="--max-line-length=100 > --ignore=BIT_MACRO,PREFER_KERNEL_TYPES,SPLIT_STRING,LONG_LINE_STRING" I've scrolled a bit through checkpatch complaines with this, and I thi

Re: [DIM PATCH 2/3] dim: add checkpatch profiles to allow different checkpatch options

On Tue, Mar 13, 2018 at 4:07 PM, Jani Nikula <jani.nik...@intel.com> wrote: > On Tue, 13 Mar 2018, Daniel Vetter <dan...@ffwll.ch> wrote: >> On Tue, Mar 13, 2018 at 01:30:09PM +0200, Jani Nikula wrote: >>> To reduce noise on CI checkpatch reports, we want to silenc

Re: [maintainer-tools PATCH] doc: how to become a drm-intel committer

On Thu, Mar 15, 2018 at 4:32 PM, Jani Nikula <jani.nik...@intel.com> wrote: > On Thu, 15 Mar 2018, Daniel Vetter <dan...@ffwll.ch> wrote: >> On Wed, Mar 14, 2018 at 05:11:02PM +0200, Jani Nikula wrote: >>> Until now, the drm-intel commit access have been handed out ad

Re: [maintainer-tools PATCH] doc: how to become a drm-intel committer

ents. > + > + - Pushing patches without proper tags or links. > + > + - Pushing patches to other branches than drm-intel-next-queued. > + > + - Pushing patches without using dim tools. > + > + - Pushing patches that didn’t pass CI. > + > +

Re: [PULL] drm-misc-next

On Tue, Mar 6, 2018 at 8:20 PM, Sean Paul <seanp...@chromium.org> wrote: > On Tue, Mar 06, 2018 at 09:07:52PM +0200, Ville Syrjälä wrote: >> On Tue, Mar 06, 2018 at 02:01:21PM -0500, Sean Paul wrote: >> > On Tue, Mar 06, 2018 at 07:42:53AM +0100, Daniel Vetter wrote: &g

Re: [PATCH] dim: Add Documentation to i915 specific paths

_i915_files" > > echo -e "\nConfirm you have appropriate Acked-by and > > Reviewed-by for above files." > > -- > Jani Nikula, Intel Open Source Technology Center > ___ > dim-tools mailing list > dim-tools@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dim-tools -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch ___ dim-tools mailing list dim-tools@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dim-tools

Re: [Intel-gfx] [RFC] splitting dri-devel to drm core and drivers lists?

On Mon, Mar 26, 2018 at 10:00 AM, Jani Nikula <jani.nik...@intel.com> wrote: > On Mon, 26 Mar 2018, Daniel Vetter <dan...@ffwll.ch> wrote: >> And as mentioned I think dri-drivers isn't big enough to be >> sustainable on its own. > > It certainly is big enough to

Re: [Intel-gfx] [RFC] splitting dri-devel to drm core and drivers lists?

On Mon, Mar 26, 2018 at 09:42:52AM +0300, Joonas Lahtinen wrote: > Quoting Daniel Vetter (2018-03-23 18:39:04) > > On Fri, Mar 23, 2018 at 06:22:46PM +0200, Jani Nikula wrote: > > > There was some discussion on the dim-tools list about splitting the > > > dri-devel l

Re: [PULL] drm-misc-next

-- > > drivers/gpu/drm/sun4i/sun4i_layer.h| 1 + > > drivers/gpu/drm/tinydrm/Kconfig| 2 + > > drivers/gpu/drm/tve200/tve200_display.c| 10 - > > drivers/gpu/drm/tve200/tve200_drm.h | 2 - > > drivers/gpu/drm/tve200/tve200_drv.c

Re: [PATCH] dim: make update-branches update drm-next

On Thu, Mar 01, 2018 at 12:09:39PM +0200, Joonas Lahtinen wrote: > Update drm-next branch if it exists, to avoid incomplete backmerges. > > Signed-off-by: Joonas Lahtinen <joonas.lahti...@linux.intel.com> > Cc: Daniel Vetter <daniel.vet...@ffwll.ch> > --- > dim |

Re: [PATCH] dim: make update-branches update drm-next

ng. Or maybe tell more people that the autocomplete stuff exists and helps with this stuff :-) -Daniel > > > Signed-off-by: Joonas Lahtinen <joonas.lahti...@linux.intel.com> > > Cc: Daniel Vetter <daniel.vet...@ffwll.ch> > > --- > > dim | 6 ++ > >

Re: [PATCH] dim: make update-branches update drm-next

On Mon, Mar 5, 2018 at 10:55 AM, Joonas Lahtinen <joonas.lahti...@linux.intel.com> wrote: > Quoting Daniel Vetter (2018-03-05 10:18:52) >> On Thu, Mar 01, 2018 at 12:09:39PM +0200, Joonas Lahtinen wrote: >> > Update drm-next branch if it exists, to avoid incomplete backmerg

Re: [PULL] drm-misc-next

On Tue, Mar 6, 2018 at 12:20 AM, Sean Paul <seanp...@chromium.org> wrote: > On Mon, Mar 5, 2018 at 12:10 AM, Daniel Vetter <dan...@ffwll.ch> wrote: >> On Fri, Mar 02, 2018 at 04:22:15PM -0500, Sean Paul wrote: >>> On Wed, Feb 28, 2018 at 3:34 PM, Sean Paul

  1   2   3   4   >