Skip to content
Snippets Groups Projects
Select Git revision
0 results
Search by author
  • Any Author
  • Aaron Watry Aaron Watry awatry
  • Adam Jackson Adam Jackson ajax
  • Aditya Swarup Aditya Swarup aswarup
  • Alejandro Piñeiro Alejandro Piñeiro apinheiro
  • Alexander von Gluck Alexander von Gluck kallisti5
  • Alex Deucher Alex Deucher agd5f
  • Alex Smith Alex Smith aejsmith
  • Alok Hota Alok Hota ahota
  • Alyssa Rosenzweig Alyssa Rosenzweig alyssa
  • Andreas Baierl Andreas Baierl rellla
  • Andreas Boll Andreas Boll ab
  • Andres Gomez Andres Gomez tanty
  • Andres Rodriguez Andres Rodriguez lostgoat
  • Andrey Grodzovsky Andrey Grodzovsky agrodzov
  • Antía Puentes Antía Puentes apuentes
  • Antonino Maniscalco Antonino Maniscalco antonino
  • Antonio Ospite Antonio Ospite ao2
  • Anuj Phogat Anuj Phogat aphogat
  • Asahi Lina Asahi Lina asahilina
  • Axel Davy Axel Davy axeldavy
20 authors
  1. Aug 03, 2017
  3. Jul 26, 2017
  5. Jul 24, 2017
    • Simona Vetter's avatar
      dim: Make rr-cache more robust · 72953209
      Simona Vetter authored 
      
There's a failure mode I didn't take into account:

1. You start a dim rebuild-tip, and update your rr-cache. Because you
didn't push for a while, this adds some really old files (but with
today's timestamp).

2. 2nd person finished their dim rebuild-tip and garbage-collects the
old rr-cache entries.

3. We get to commit_rr_cache, and the first thing the script does is
update the rr-cache branch, which deletes the old entries.

4. Then we copy them over again, because their timestamp is fresh.

5. The filtering doesn't catch them, because git ls-files doesn't list
them (they're deleted files after all).

6. They get re-added right away.

I think this is what happend today between Chris and Imre, and
resulted in a bit of confusion.

I think if we pull only after copying this would be avoided, since the
pull would delete the files the 2nd person gc'ed in step 2, and so
prevents them from getting re-added. Worst case there's a functional
conflict and the pusher needs to clean up the mess.

Reviewed-by: Sean Paul's avatarSean Paul <seanpaul@chromium.org>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
      72953209
    • Simona Vetter's avatar
      dim: remove debug output · 45c1b402
      Simona Vetter authored 
      
Oops. It caused some concerns from people running dim rebuild-tip.

v2: Drop misplaced changes I forgot to remove (Imre).

Acked-by: default avatarImre Deak <imre.deak@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
      45c1b402
    • Imre Deak's avatar
      dim: Suppress output of git pull into the rerere-cache branch · 6a35d6b0
      Imre Deak authored 
      
The output of git pull into the rr-cache branch isn't really
interesting, so suppress it like during the rest of rr-cache
branch maintenance commands.

Cc: Jani Nikula <jani.nikula@intel.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarImre Deak <imre.deak@intel.com>
Acked-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      6a35d6b0
  7. Jul 20, 2017
  9. Jul 18, 2017
  11. Jul 17, 2017
  13. Jul 14, 2017
    • Simona Vetter's avatar
      dim: Try to gc the rr-cache · 12a25fd6
      Simona Vetter authored 
      
The problem is that we have a distributed cache - every committer has
a copy. Which means even just a slight clock skew will make sure that
a naive gc algorithm results in lots of thrashing around.

To fix this add a huge hysteresis: Only add files newer than 1 day,
and only remove them when older than 60 days. As long as people have
reasonable accurate clocks on their machines this should work.

A different problem is that we can't use filesystem timestamps (and
hence can't use git rerere gc): When someone comes back from vacations
and updates git rerere, all the files will have current timestamps,
even when they've been pushed out weeks ago. To fix that, use the git
log to judge old files to remove. Also, remove old files before adding
new ones, to avoid confusion.

Also, we need to teach the cp -r to preserve timestamps, otherwise
this won't work.

v2: Use git log to remove old files.

v3: Remove the debug uncommenting (Sean).

v4: Split out code movement and explain better what's going on (Jani).

Reviewed-by: Sean Paul's avatarSean Paul <seanpaul@chromium.org>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
      12a25fd6
    • Simona Vetter's avatar
      dim: Move all rerere updating into helpers · 599eb3db
      Simona Vetter authored 
      
Just prep work.

Reviewed-by: Sean Paul's avatarSean Paul <seanpaul@chromium.org>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
      599eb3db
  15. Jul 12, 2017
  17. Jul 10, 2017
    • Rodrigo Vivi's avatar
      drm-intel: Fix links to torvalds documentation. · edf1f784
      Rodrigo Vivi authored 
      
All process related docs has moved to the new "process" folder,
but also all .txt migrated to .rst as well.

However let's link to final generated .html instead of .rst

Ideally .rst would referrence .rst with :ref:`` but since
these documentation are different repository we cannot link
like this. However the main usage is through the
compiled html pages and since we already reference another
.html here so let's use our daily compiled doc.

v2: squashed drm-intel: Link to .html instead of .rst

Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: default avatarJani Nikula <jani.nikula@intel.com>
      edf1f784
  19. Jul 06, 2017
  21. Jun 28, 2017
    • Simona Vetter's avatar
      dim: Fixes/polish for cherry-pick · ee9c0149
      Simona Vetter authored 
      
- Subcommands without subshell is nice, except it can break worktree
  setups: Branch specific commands want to run in the worktree,
  general commands like dim_cite switch back to the main directory.
  Tears ensue (or well, some cryptic complaint from git that
  cherry-pick --abort failed because there's no cherry-pick in
  progress). Run it in a subshell.

  Not sure we need a general fix to make this more robust.

- Document commands a bit better.

Cc: Jani Nikula <jani.nikula@linux.intel.com>
Acked-by: default avatarJani Nikula <jani.nikula@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
      ee9c0149
  23. Jun 19, 2017
  25. May 29, 2017
    •  's avatar
      drm-misc: Document recommended base for -fixes pulls · a174f35b
        authored and Simona Vetter's avatar Simona Vetter committed 
      
Summarize the following discussion on dri-devel:

   "dim has you covered for this, in case you've rolled forward but Dave
    hasn't yet, you can regenerate against linus upstream branch for a
    cleaner pull (but still warn Dave ofc):
    $ dim pull-request drm-misc-next origin/master" (Daniel)

   "FWIW this is what I've always done with drm-intel-fixes." (Jani)

   "As long as I'm warned in the pull request I often fast forward to
    the base if my tree is clean, just to avoid the pull request having
    noise in it." (Dave)

Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: Sean Paul <seanpaul@chromium.org>
Cc: Dave Airlie <airlied@redhat.com>
Signed-off-by: default avatarLukas Wunner <lukas@wunner.de>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      a174f35b
  27. May 24, 2017
  29. May 08, 2017
  31. May 04, 2017
    • Sean Paul's avatar
      dim: Add pull request tag template · fb7d7d67
      Sean Paul authored and Jani Nikula's avatar Jani Nikula committed 
      
Each pull request is accompanied by a summary that is stored in the git tag
from which it is generated. These summaries all share the same template with
headers classifying changes to UAPI, Cross-subsystem, Core, and Drivers. This
patch adds this template to the tag summary automatically in dim pull-request.

Changes in v2:
  - Tweaked the template var name s/PULL/TAG/ (Daniel)
Changes in v3:
  - Use git tag -F- to ingest template (Jani)
  - Tweak naming/comments again to hopefully clarify things (Jani)

Signed-off-by: Sean Paul's avatarSean Paul <seanpaul@chromium.org>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
      fb7d7d67
  33. Apr 18, 2017
  35. Apr 07, 2017
  37. Apr 05, 2017
  39. Apr 04, 2017
  41. Apr 03, 2017
    • Simona Vetter's avatar
      drm-misc: Next phase in small drivers in drm-misc · 0f27283f
      Simona Vetter authored 
      
I think the initial experiment worked fairly well, and the
kickstarting of a review (well, ack/best practices really) market
seems to work ok-ish too. I think we can try to make it (slowly) scale
to more drivers, with driver teams interested in being part of
drm-misc. I do think we need to be careful though, to make sure we
don't overstretch the review/mentoring bandwidth and can improve
process&tooling as we go.

v2: Spelling fix (Jani).

Cc: Sumit Semwal <sumit.semwal@linaro.org>
Cc: Gustavo Padovan <gustavo@padovan.org>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Acked-by: default avatarJani Nikula <jani.nikula@linux.intel.com>
Cc: Sean Paul <seanpaul@chromium.org>
Cc: Archit Taneja <architt@codeaurora.org>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Boris Brezillon <boris.brezillon@free-electrons.com>
Acked-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
Cc: Neil Armstrong <narmstrong@baylibre.com>
Cc: Mark Yao <mark.yao@rock-chips.com>
Cc: Eric Anholt <eric@anholt.net>
Cc: Shawn Guo <shawnguo@kernel.org>
Acked-by: default avatarShawn Guo <shawnguo@kernel.org>
Cc: Dave Airlie <airlied@redhat.com>
Acked-by: Sean Paul's avatarSean Paul <seanpaul@chromium.org>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
      0f27283f
  43. Mar 30, 2017
    • Simona Vetter's avatar
      dim: Add apply-pull command · 9696f2fe
      Simona Vetter authored 
      
I'm getting real lazy, let's start scripting this. Very rough draft,
but adds a Link: (patchwork tracks pull requests too, maybe we'll
start CI-ing them too), and sob line. In the future we might add more
checks here ...

v2: Review from Jani:
- Move abbrevation into my own .dimrc
- Drop shift, we don't use $@

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
      9696f2fe