-
> > 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/
ast kernel releases it has become opionated about
pointless bikesheds to the point I simply had to ignore most of it. It'd
be great if we have an authoritative answer to all code layout questions,
but in reality we don't.
I think the ingore list is probably best kept within maintainer-tool
that the autocomplete stuff exists and helps
with this stuff :-)
-Daniel
>
> > Signed-off-by: Joonas Lahtinen
> > Cc: Daniel Vetter
> > ---
> > dim | 6 ++
> > 1 file changed, 6 insertions(+)
> >
> > diff --git a/dim b/dim
> > index ed26033
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
> Cc: Daniel Vetter
> ---
> dim | 6 ++
> 1 file changed, 6 insertions(+)
>
> dif
On Fri, Mar 02, 2018 at 05:58:00PM +0200, Jani Nikula wrote:
> checkpatch already covers "WARNING:AVOID_BUG: Avoid crashing the kernel
> - try using WARN_ON & recovery code rather than BUG() or BUG_ON()"
Nice. Reviewed-by: Daniel Vetter on both patches.
>
> Remove th
On Mon, Mar 5, 2018 at 10:55 AM, Joonas Lahtinen
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 backmerges.
>> >
>> > Sig
On Tue, Mar 6, 2018 at 12:20 AM, Sean Paul wrote:
> On Mon, Mar 5, 2018 at 12:10 AM, Daniel Vetter 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 wrote:
>>> >
>>> > Hi Dave,
>>&
On Tue, Mar 06, 2018 at 11:32:05AM +0200, Jani Nikula wrote:
> Upstream branches are defined by dim list-upstreams. Allow override for
> when the user knows what they're doing.
>
> Cc: Daniel Vetter
> Cc: Joonas Lahtinen
> Cc: Rodrigo Vivi
> Signed-off-by: Jani Ni
On Tue, Mar 6, 2018 at 8:20 PM, Sean Paul 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:
>> > > On Tue, Mar
profile=drm-misc
> + ;;
Use branch_to_repo instead, if that doesn't come up with anything, then
default?
With that little bit of polished applied, on patches 1&2:
Reviewed-by: Daniel Vetter
> +
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 think
it looks a lot more reasonable. There's also a huge pile of stuff that we
shou
On Tue, Mar 13, 2018 at 4:07 PM, Jani Nikula wrote:
> On Tue, 13 Mar 2018, Daniel Vetter wrote:
>> On Tue, Mar 13, 2018 at 01:30:09PM +0200, Jani Nikula wrote:
>>> To reduce noise on CI checkpatch reports, we want to silence some
>>> checkpatch warnings. Different
dim tools.
> +
> + - Pushing patches that didn’t pass CI.
> +
> +- Freedesktop.org Code of Conduct violations may lead to temporary or
> permanent
> + account or commit rights suspension according to freedesktop.org umbrella
> + rules.
> diff --git a/index.rst b/index.rst
> index d2142a7898f8..2db033161196 100644
> --- a/index.rst
> +++ b/index.rst
> @@ -23,6 +23,7 @@ Contents:
> :maxdepth: 2
>
> repositories
> + commit-access
> drm-misc
> drm-intel
> dim
> --
> 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
http://blog.ffwll.ch
___
dim-tools mailing list
dim-tools@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dim-tools
On Thu, Mar 15, 2018 at 4:32 PM, Jani Nikula wrote:
> On Thu, 15 Mar 2018, Daniel Vetter 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 hoc,
>>> without transparency, con
On Thu, Mar 22, 2018 at 3:25 PM, Harry Wentland wrote:
> On 2018-03-22 09:04 AM, Sean Paul wrote:
>> On Thu, Mar 22, 2018 at 11:53:29AM +0200, Jani Nikula wrote:
>>> On Wed, 21 Mar 2018, Sean Paul wrote:
>>>
>>> Please insert rationale here...
>>>
>
ms to get the job done. I'll start nominating people as
soon as we have the drm-intel commit right story sorted. I do think we
have quite a pile of people involved in drm core work, that itself isn't a
problem I think.
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
ht
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
On Mon, Mar 26, 2018 at 10:00 AM, Jani Nikula wrote:
> On Mon, 26 Mar 2018, Daniel Vetter wrote:
>> And as mentioned I think dri-drivers isn't big enough to be
>> sustainable on its own.
>
> It certainly is big enough to be disruptive to my inbox, and I don't
>
Ubuntu 16.04 LTS has this version of git, and it's known to handle
(some, but not all) stored conflict resolutions differently than newer
versions of git.
Since it's a common snag detect it and suggest to upgrade.
Signed-off-by: Daniel Vetter
---
dim | 4
1 file changed, 4
t; > echo -e "The following files are outside of i915
> > maintenance scope:\n"
> > echo "$non_i915_files"
> > echo -e "\nConfirm you have appropriate Acked-by and
> > Reviewed-
--
> 2.14.3
>
> ___
> 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
; @@ -2329,10 +2327,6 @@ if [ $developer_command = "0" ]; then
> done
>
> read_integration_config
> -else
> - if [ -r $DIM_PREFIX/drm-rerere/$integration_config ]; then
> - read_integration_config
> - fi
> fi
>
> # throw
by: Jani Nikula
TIL {:?}, nice.
Reviewed-by: Daniel Vetter
> ---
> dim | 13 +
> 1 file changed, 5 insertions(+), 8 deletions(-)
>
> diff --git a/dim b/dim
> index 2496703aac7f..b41beca7301b 100755
> --- a/dim
> +++ b/dim
> @@ -1602,19 +1602,16
5e931976fae0 100755
> --- a/dim
> +++ b/dim
> @@ -103,6 +103,11 @@ dim_test_request_recipients=(
> # integration configuration
> dim_integration_config=nightly.conf
>
> +#
> +# Only function and alias definitions until the command line pargument
> parsing
s/par
On Thu, Mar 29, 2018 at 11:46:01AM +0300, Jani Nikula wrote:
> Signed-off-by: Jani Nikula
Patches 2-9:
Acked-by: Daniel Vetter
I think patch 1 is ok if we stick to the variable with in-line comments
instead of HERE doc for me too.
-Daniel
> ---
> dim | 8
> 1 fil
On Tue, Apr 03, 2018 at 12:03:27PM +0300, Jani Nikula wrote:
> Make the developer subcommand checking less clunky.
>
> v2: Preserve array with in-line comments (Daniel)
>
> Signed-off-by: Jani Nikula
Reviewed-by: Daniel Vetter
&g
On Tue, Apr 03, 2018 at 11:32:04AM +0200, Maarten Lankhorst wrote:
> Signed-off-by: Maarten Lankhorst
Would be neat if we could somehow figure this out automatically ...
Reviewed-by: Daniel Vetter
> ---
> dim | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a
> change it on different environments, unless the patch really changed.
>
> Signed-off-by: Lucas De Marchi
Oh, I always wanted this, never knew how. This sounds awesome.
Reviewed-by: Daniel Vetter
> ---
> qf | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
&
But with -fixes he's probably looking at stuff more
because less pull request flood.
Since -fixes-queued still requires rebased, what if we just try to at
least rebase every 2nd week or so (instead of backmerging all the
time), and see how that works? Rebase ofc needs to be really, really
care
Works better with an untypoed airlied.
On Wed, Apr 25, 2018 at 7:55 PM, Daniel Vetter wrote:
> On Wed, Apr 25, 2018 at 7:00 PM, Sean Paul wrote:
>> Hey maintainers,
>> I'm noticing a trend which is unlikely to slow down, so I'd like to get
>> your input. I
On Wed, Apr 25, 2018 at 8:07 PM, Sean Paul wrote:
> On Wed, Apr 25, 2018 at 1:56 PM Daniel Vetter wrote:
>
>> Works better with an untypoed airlied.
>
>> On Wed, Apr 25, 2018 at 7:55 PM, Daniel Vetter wrote:
>> > On Wed, Apr 25, 2018 at 7:00 PM, Sean Paul
We've only been matching prefixes, which totally broke with the new
drm/drm.git repo. Make sure we match the full url.
Signed-off-by: Daniel Vetter
---
dim | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/dim b/dim
index 95692c609745..501ab48354cf 100755
--- a/dim
+++
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
Signed-off-by: Daniel Vetter
---
dim | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/
e could grep for the actual S-o-B tag with
> committer's email? Or there was a reason we started with 'From:' grepping,
> can't remember.
Accident of history most likely, but in other places we do check the
git author vs. the git committer, and require that both put their sob
on
l this out.
On both patches: Reviewed-by: Daniel Vetter
> ---
> drm-intel.rst| 94 +
> drm-misc.rst | 2 +
> drm-tip.rst | 113
> +++
> index.rst
On Thu, Apr 26, 2018 at 4:25 PM, Daniel Vetter wrote:
> This is the exact same text as proposed&merged for igt:
>
> https://patchwork.kernel.org/patch/10339739/
>
> With one minor change: Both regular contributions to the kernel
> overall and to userspace graphics coun
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
Signed-off-by: Daniel Vetter
---
dim.rst | 6 --
drm-tip.rst | 2 ++
repositories.rst | 5 ++---
3 files changed, 8 insertions(+), 5 dele
le
more links for the other patch I just sent out).
On the series: Acked-by: Daniel Vetter
>
> .PHONY: clean
> clean:
> @@ -71,10 +71,14 @@ help:
> @echo " singlehtml to make a single large HTML file"
> @echo " linkcheck to check all external links
dim setup has become quite a bit more user friendly since we've typed
this text.
Signed-off-by: Daniel Vetter
---
getting-started.rst | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/getting-started.rst b/getting-started.rst
index 10c3a1125e4d..d035862e3970 100644
7: Prefer mapfile or read -a to split command output (or quote to avoid
splitting).
Our bash_completion scripts are full of these - everywhere we call compgen.
Signed-off-by: Daniel Vetter
---
Makefile | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefil
Seems like a fairly reasonable thing to check to me, so lets appease
it.
Signed-off-by: Daniel Vetter
---
dim | 6 +++---
qf | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dim b/dim
index 091dff8518ed..ec51e36b1269 100755
--- a/dim
+++ b/dim
@@ -2216,10 +2216,10
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
> Signed-off-by: Daniel Vetter
Uh this breaks mancheck because rst2html doesn
On Thu, Apr 26, 2018 at 6:14 PM, Jani Nikula
wrote:
> On Thu, 26 Apr 2018, Daniel Vetter wrote:
>> Not sure how this happened, but we gained a lot of errors. I think we should
>> exclude these two since we have lots of them:
>
> shellcheck --version?
>
> I'm
On Thu, Apr 26, 2018 at 5:47 PM, Daniel Vetter 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 message.
-Daniel
> Signed-off-b
also ask you to add more remotes (after you've pulled the
latest bugfixes), so keep an eye out for that.
Cheers, Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
___
dim-tools mailing list
On Thu, Apr 26, 2018 at 10:18 PM, Daniel Vetter wrote:
> Hi all,
>
> We (well Dave and me) are playing around with dim and hit a bug. Bug
> is fixed, but to be able to continue experimenting you folks all need
> to upgrade. If you don't, then the drm-tip rebuild step fails
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
Signed-off-by: Daniel Vetter
---
dim | 7 +
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 N
nk
which for the /mbox file which also exists for pulls) is probably better.
-Daniel
--
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
On Mon, Apr 30, 2018 at 9:08 AM, Lukas Wunner 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
>&
ned-off-by: Daniel Vetter
---
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 @@ function dim_apply_pull
pull_branch=$(sed -e '0,/[gG]it repository at:$/d' $file |
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&merged for igt:
> >
> > https://patchwork.kernel.org/patch/10339739/
> >
> >
We might want to hold of on pushing this one until it's clearer that
drm group maintainership takes off.
Cc: Dave Airlie
Signed-off-by: Daniel Vetter
---
dim | 3 +++
1 file changed, 3 insertions(+)
diff --git a/dim b/dim
index 1d78ca275c5d..cf7ad2dae35f 100755
--- a/dim
+++ b/dim
@@ -18
ieves that.
Cc: Dave Airlie
Signed-off-by: Daniel Vetter
---
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_update_next
$DRY git add drivers/gpu/drm/i915/
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
&
apply-pull
Cc: Dave Airlie
Signed-off-by: Daniel Vetter
---
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 echoerr
echo "$dim: $*" >&
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
Signed-off-by: D
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 -
1 file change
"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
+++ b/dim
@@ -907,7 +907,7 @
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 518043c9058d..26da35b55c32 100755
--- a/dim
+++
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
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.
> >
> >
atches, that's the only place
we now call warn_or_fail
- rework the check function to check for everything and return the
final verdict
v2: Complete rework on Jani's suggestion.
Acked-by: Dave Airlie
Cc: Jani Nikula
Cc: Dave Airlie
Signed-off-by: Dani
ff-by: Daniel Vetter
---
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 @@ function rr_cache_dir
fi
}
+function git_dir
+{
+ if [ -d $PWD/.git ] ;
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
Signed-off-by: D
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
---
dim | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
"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
+++ b/dim
@@ -915,7 +915,7 @
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
> understand.
On Fri, May 4, 2018 at 4:06 PM, 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. But currently we only report the first issue and
>> then bail out.
>>
>>
On Fri, May 4, 2018 at 9:39 PM, Dave Airlie wrote:
> 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
On Mon, May 7, 2018 at 9:14 AM, Jani Nikula wrote:
> On Fri, 04 May 2018, Daniel Vetter wrote:
>> 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,
On Fri, May 04, 2018 at 05:13:23PM +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
gt; This fixes dim status and a bunch of pull request and other commands.
>
> Cc: Daniel Vetter
> Signed-off-by: Jani Nikula
> ---
> dim | 16 ++--
> 1 file changed, 6 insertions(+), 10 deletions(-)
>
> diff --git a/dim b/dim
> index 6b684ba5308c..a582
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 wrote:
> > "head" immediately closes its stdin, which upsets sed. Shut it up.
> >
> > Cc: Dave Airlie
> > Signed-off-by: Daniel Vetter
> >
2018 at 2:28 PM, Lucas De Marchi
> wrote:
> > A single sed can do the job of taking the second line after a match and
> > it looks simpler.
> >
> > Signed-off-by: Lucas De Marchi
> > ---
> >
> > I noticed this while reviewing "[PATCH 2/4] dim: s
d
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
Lots of things we didn't mark up. Reported by Dave.
Cc: Dave Airlie
Signed-off-by: Daniel Vetter
---
dim | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/dim b/dim
index 0c979a48bcd2..9ec43df08c4a 100755
--- a/dim
+++ b/dim
@@ -952,14 +952,14 @@ fun
On Mon, May 14, 2018 at 3:06 PM, Jani Nikula
wrote:
> On Mon, 14 May 2018, Daniel Vetter wrote:
>> Lots of things we didn't mark up. Reported by Dave.
>>
>> Cc: Dave Airlie
>> Signed-off-by: Daniel Vetter
>
> The dry run is a bit hit and miss, which ca
On Mon, May 14, 2018 at 10:00:44AM -0400, Sean Paul wrote:
> repo is re-assigned 2 lines lower
:-)
Reviewed-by: Daniel Vetter
>
> Signed-off-by: Sean Paul
> ---
> dim | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/dim b/dim
> index 6b684ba5308c..7d87
s is a special case maybe add a comment?
# git push gives confusing error messages for non-existing
# branches, even with --dry-run, hence the even quieter $DRY
With that Reviewed-by: Daniel Vetter
> + $DRY git push $remote +$branch --set-upstream
>
> cd $DIM_
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
Software Engineer, Int
This could be a parsing error of the pull (for all the people who
don't use a script like dim pull-request to make sure all the silly
details are right), or some confusion on the part of the sender, or
something else.
Either way not good to continue.
Cc: Dave Airlie
Signed-off-by: Daniel V
On Tue, May 15, 2018 at 12:34 PM, Jani Nikula
wrote:
> On Tue, 15 May 2018, Daniel Vetter wrote:
>> This could be a parsing error of the pull (for all the people who
>> don't use a script like dim pull-request to make sure all the silly
>> details are right), or some co
; managing the pull request and maintenance, I need to learn more and improve
> our working flow to prevent this happen in future. Sorry for the
> inconvenience.
>
> Thanks,
> Zhi.
>
> -Original Message-
> From: Nikula, Jani
> Sent: Tuesday, May 15, 2018 12:56 PM
> T
"... should _not_ take this as a personal failure ..." is what I meant
of course. Worst possible oversight :-/
-Daniel
On Tue, May 15, 2018 at 4:58 PM, Daniel Vetter wrote:
> Imo we should take this as a personal failure of anyone, things
> happen. Instead this is a good opport
Just checks that merges aren't done without minimal thought.
Cc: Jani Nikula
Cc: Dave Airlie
Signed-off-by: Daniel Vetter
---
dim | 22 ++
1 file changed, 22 insertions(+)
diff --git a/dim b/dim
index c3229fd72193..ddfb809fcc5c 100755
--- a/dim
+++ b/dim
@@ -785,6 +7
In
commit c0c4dc1c924bd1d94315601026a2f9facd8a7f73
Author: Daniel Vetter
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 branches (since external
Obvious oversight.
Signed-off-by: Daniel Vetter
---
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_apply_pull
checkpatch_commit_push_range 0 "
On Fri, May 18, 2018 at 10:33 AM, Maarten Lankhorst
wrote:
> Op 18-05-18 om 09:31 schreef Daniel Vetter:
>> Obvious oversight.
>>
>> Signed-off-by: Daniel Vetter
>> ---
>> dim | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
&g
maintainer, no longer).
Cc: Jani Nikula
Signed-off-by: Daniel Vetter
---
dim | 18 ++
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/dim b/dim
index 118c446b87d5..4a8184ce2f80 100755
--- a/dim
+++ b/dim
@@ -1788,7 +1788,7 @@ function dim_update_next
$DRY
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
Signed-off-by: Daniel Vetter
---
dim | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/dim b/dim
On Tue, May 22, 2018 at 1:41 PM, Jani Nikula wrote:
> On Tue, 22 May 2018, Daniel Vetter wrote:
>> 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.
>
> IST
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
Signed-off-by: Daniel Vetter
---
dim | 14 +++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/dim b
Just checks that merges aren't done without minimal thought.
Cc: Jani Nikula
Cc: Dave Airlie
Signed-off-by: Daniel Vetter
---
dim | 22 ++
1 file changed, 22 insertions(+)
diff --git a/dim b/dim
index 2fa158231228..ff9e572726cb 100755
--- a/dim
+++ b/dim
@@ -785,6 +7
ieves that.
Cc: Dave Airlie
Signed-off-by: Daniel Vetter
---
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_update_next
$DRY git add drivers/gpu/drm/i915/
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
Signed-off-by: Daniel Vetter
---
dim | 20 ++--
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/dim b/dim
index dbd2c9a
In
commit c0c4dc1c924bd1d94315601026a2f9facd8a7f73
Author: Daniel Vetter
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 branches (since external
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
Signed-off-by: Daniel Vetter
---
dim | 14 +++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/dim b
Hi all,
I still have a bunch of patches from all the fine-tuning (plus one
regression fix due to the already merged fine-tuning) for the drm-next
experiments. Review and comments very much appreciated.
Cheers, Daniel
Daniel Vetter (5):
dim: exclude commits from subordinate trees in pull
On Wed, May 23, 2018 at 01:35:56PM +0300, Jani Nikula wrote:
> On Wed, 23 May 2018, Daniel Vetter wrote:
> > In
> >
> > commit c0c4dc1c924bd1d94315601026a2f9facd8a7f73
> > Author: Daniel Vetter
> > Date: Wed May 2 15:08:24 2018 +0200
> >
> >
1 - 100 of 469 matches
Mail list logo