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

On 5 May 2018 at 00:10, Jani Nikula wrote: > On Fri, 04 May 2018, Daniel Vetter wrote: >> Now that we experiment with dim for drm-next it's much more likely >> that pull requests have conflicts. But also that dim already knows >> about them,

[PULL] drm-misc-next

drm-misc-next-2018-05-04: drm-misc-next for v4.18: Ignore the dma-fence changes, they have been immediately reverted. :) Core Changes: - Rounding behavior when clipping a visible plane has changed slightly. We now consistently try to round towards the 1.0x scale to prevent running into hw

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

Yeah this seems useful after doing my first -f pull today. Acked-by: Dave Airlie On 4 May 2018 at 15:21, Daniel Vetter wrote: > When merging a pull requests there's potentially a long list of > problematic patches. By switching to dry-run mode we can

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

On Fri, 04 May 2018, Daniel Vetter wrote: > When merging a pull requests there's potentially a long list of > problematic patches. But currently we only report the first issue and > then bail out. > > The upside here is that without this patch the workflow when >

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

On Fri, 04 May 2018, Daniel Vetter wrote: > 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 > Cc: Dave Airlie

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

On Fri, 04 May 2018, Daniel Vetter wrote: > "head" immediately closes its stdin, which upsets sed. Shut it up. I don't understand this, care to expand? Can't review stuff I don't understand. :p BR, Jani. > > Cc: Dave Airlie > Signed-off-by: Daniel

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

On Fri, 04 May 2018, Daniel Vetter 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 the same trick for dim apply-branch, but > git am is a bit harder to script. > > v2: Drop cat, use shell

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

On Fri, 04 May 2018, Daniel Vetter 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 > all. > > The upside here is that without this patch the workflow when > processing a pull is:

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 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 the same trick for dim apply-branch,

[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 Cc: Dave Airlie Signed-off-by: Daniel Vetter ---

[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 Signed-off-by: Daniel Vetter --- dim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dim b/dim index 97b4f8d1531b..010dd2001254 100755 --- a/dim

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

When merging a pull requests there's potentially a long list of problematic patches. But currently we only report the first issue and then bail out. The upside here is that without this patch the workflow when processing a pull is: $ dim apply-pull ... -> dim refuses, only reports first problem

[PATCH 5/5] 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. v2: Drop cat, use shell redirects to appeas shellcheck. Cc: Dave Airlie Cc: Jani

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

Now that we experiment with dim for drm-next it's much more likely that pull requests have conflicts. But also that dim already knows about them, in the recent drm-intel-next pull it resolve 7/8 conflicts. If it solves them all then just go ahead an commit. Cc: Dave Airlie

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

On Fri, 04 May 2018, Daniel Vetter wrote: > Looks funny, but let's allow it to be overriden. Also move it > up before we commit to the merge. > > Cc: Dave Airlie > Signed-off-by: Daniel Vetter > --- > dim | 8 +--- > 1 file

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

On Fri, 04 May 2018, Daniel Vetter 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 the same trick for dim apply-branch, but > git am is a bit harder to script. > > Cc: Dave Airlie

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 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 > > all. > > > > The upside

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 wrote: > On Fri, 04 May 2018, Daniel Vetter wrote: >> "head" immediately closes its stdin, which upsets sed. Shut it up. > > I don't understand this, care to expand? Can't review stuff I don't >

[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 Signed-off-by: Daniel Vetter --- dim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dim b/dim index b771f9dc5f0d..518043c9058d 100755 --- a/dim

[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 Signed-off-by: Daniel Vetter --- dim | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dim b/dim index

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

Now that we experiment with dim for drm-next it's much more likely that pull requests have conflicts. But also that dim already knows about them, in the recent drm-intel-next pull it resolve 7/8 conflicts. If it solves them all then just go ahead an commit. Cc: Dave Airlie

[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 Signed-off-by: Daniel Vetter --- dim | 17