[Intel-gfx] [PATCH 00/18] dim: split out drm-misc/tip.git

Daniel Vetter daniel.vetter at ffwll.ch
Fri Oct 21 19:36:42 UTC 2016


Hi all,

So here's all the bits I think we need for:
- split out drm-misc.git repo
- rolling model in drm-misc to avoid the merge window, like for drm-intel
  branches.
- split out rerere stuff into a shared drm-tip.git repo
- sharing .git metadata using git worktrees.

Conversion howto:
1. Update to latest dim, but store it somewhere outside of the maintainer-tools
branch.
2. Remove the drm-intel-rerere, drm-intel-nightly and maintainter-tools
branches. With the new dim .git repos can be shared (assuming your git has
worktree support).
3. Run dim setup. I'll probably complain about a few missing remotes. Add them
if needed - dim doesn't do this automatically to allow you to bikeshed the
remote names ;-)
4. Profit!

If possible I'd like to roll this all out officially next week or so, so pls
scream if you see any trouble.

Cheers, Daniel

Chris Wilson (1):
  dim-update-next: Update DRIVER_TIMESTAMP

Daniel Vetter (17):
  dim: Extract TODO
  dim: Autocheck for up-to-dateness
  dim: echoerr helper for printing to stderr
  dim: autodetect remotes, first part for dim_setup
  dim: support git worktree for aux checkouts
  dim: Nuke nightly-forget
  dim: autodetect branches in rebuild-nightly
  dim: remove integration-tree remotes
  dim: Split out drm-nightly.git
  dim: s/drm-nightly/drm-tip
  dim: use git branch --list
  dim: add revert-rerere
  dim: use get_maintainers.pl in dim fixes
  dim: support multiple remotes for branches
  dim: remove DIM_DRM_UPSTREAM_REMOTE config var
  dim: Adapat create/remove-branch
  dim: Make update_linux_next multi-repo compliant

 TODO               |  25 ++++
 dim                | 433 ++++++++++++++++++++++++++++++++---------------------
 dim.rst            |  37 +++--
 dimrc.sample       |   6 +-
 drm-intel-flow.dot |  18 +--
 drm-intel.rst      |  20 +--
 qf                 |  11 --
 7 files changed, 333 insertions(+), 217 deletions(-)
 create mode 100644 TODO

-- 
2.9.3



More information about the Intel-gfx mailing list