- Aug 16, 2017
-
-
Jani Nikula authored
Nowadays our process relies on the Fixes: line, and Cc: drm-intel-fixes is redundant. Stop adding and using it. Acked-by:
Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by:
Jani Nikula <jani.nikula@intel.com>
-
Jani Nikula authored
We don't have any static files to copy over, so comment out the config option about it. Silences warning: WARNING: html_static_path entry '/home/jani/src/maintainer-tools/_static' does not exist Cc: Daniel Vetter <daniel@ffwll.ch> Acked-by:
Daniel Vetter <daniel@ffwll.ch> Signed-off-by:
Jani Nikula <jani.nikula@intel.com>
-
- Aug 14, 2017
-
-
Simona Vetter authored
Cc: "Tahvanainen, Jari" <jari.tahvanainen@intel.com> Acked-by:
Jari Tahvanainen <jari.tahvanainen@intel.com> Acked-by:
Jani Nikula <jani.nikula@intel.com> Signed-off-by:
Daniel Vetter <daniel.vetter@intel.com>
-
Jani Nikula authored
dim list-aliases lists "list-aliases" as being an alias of "list-aliases". This is because the temporary subcmd variable reference is erroneously included in the list. Unset it. Reviewed-by:
Rodrigo Vivi <rodrigo.vivi@intel.com> Signed-off-by:
Jani Nikula <jani.nikula@intel.com>
-
Jani Nikula authored
We don't generally apply patches to the drm-intel-fixes or drm-intel-next-fixes trees, we cherry-pick instead, so the aliases are unnecessary. And, of course, anyone really needing them can add them as personal aliases in their dimrc. Reviewed-by:
Rodrigo Vivi <rodrigo.vivi@intel.com> Signed-off-by:
Jani Nikula <jani.nikula@intel.com>
-
Jani Nikula authored
Demote dim_cherry_pick_branch to an internal function. It's too specialized (at least for now) to be useful for anything other than as a helper for the cherry-pick-fixes and cherry-pick-next-fixes subcommands. As a side effect, fixes mancheck for missing documentation for the subcommand. Reviewed-by:
Rodrigo Vivi <rodrigo.vivi@intel.com> Signed-off-by:
Jani Nikula <jani.nikula@intel.com>
-
Jani Nikula authored
Reported by 'make mancheck'. Reviewed-by:
Rodrigo Vivi <rodrigo.vivi@intel.com> Signed-off-by:
Jani Nikula <jani.nikula@intel.com>
-
- Aug 11, 2017
-
-
Jani Nikula authored
Fixes: 3cb0514bf1ca ("dim: add checks for author and committer sign-off-by") Cc: Benjamin Gaignard <benjamin.gaignard@linaro.org> Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Reviewed-by:
Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by:
Jani Nikula <jani.nikula@intel.com>
-
Jani Nikula authored
The fix is a bit artificial, but mute the warning. Fixes: 809748225c4e ("dim: Add add-missing-cc command") Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Reviewed-by:
Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by:
Jani Nikula <jani.nikula@intel.com>
-
Jani Nikula authored
Fixes: 809748225c4e ("dim: Add add-missing-cc command") Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Reviewed-by:
Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by:
Jani Nikula <jani.nikula@intel.com>
-
Jani Nikula authored
Fixes: 7968b1c8 ("dim: Enforce review requirements") Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Reviewed-by:
Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by:
Jani Nikula <jani.nikula@intel.com>
-
Jani Nikula authored
Based on Sphinx-quickstart, with existing and generated Makefiles merged together. This makes the rst2html and Sphinx builds work side by side. Plain 'make' continues to use rst2html, and 'make html' and friends use Sphinx. The intention is to keep both for a transition period so that we can have documentation autobuilders updated. Once we're fully converted to Sphinx, we can share the common parts of drm-intel and drm-misc documentation better, and have more coherent documentation overall. We can also start looking into using the graphviz (Sphinx builtin) and WaveDrom (3rd party) extensions. For now, we use the same old clunky methods for including them. v2: require Sphinx 1.3, use sphinx_rtd_theme Acked-by:
Rodrigo Vivi <rodrigo.vivi@intel.com> Signed-off-by:
Jani Nikula <jani.nikula@intel.com>
-
Jani Nikula authored
I have no idea what I was thinking when I added them as raw html. Using the image directive should allow browsers to handle the page layout better. Reviewed-by:
Rodrigo Vivi <rodrigo.vivi@intel.com> Reviewed-by:
Sean Paul <seanpaul@chromium.org> Signed-off-by:
Jani Nikula <jani.nikula@intel.com>
-
Jani Nikula authored
Wrap wavedrom timelines in <div style="overflow-x:auto"> (idea copied from the wavedrom sphinx extension) to provide scrollbars for overflowing content. This is useful even with rst2html. Reviewed-by:
Sean Paul <seanpaul@chromium.org> Signed-off-by:
Jani Nikula <jani.nikula@intel.com>
-
Jani Nikula authored
Way back when the WaveDrom stuff was added, the scripts could only be accessed over http. This caused issues with sites served over https and modern browsers rightly complaining about mixed content. This was worked around by downloading the WaveDrom scripts over http at build time, and bundling them inline into the http. Now that WaveDrom is available over https, simplify the hackery, and let the user's browser load the scripts directly at page load time. Reviewed-by:
Rodrigo Vivi <rodrigo.vivi@intel.com> Signed-off-by:
Jani Nikula <jani.nikula@intel.com>
-
- Aug 10, 2017
-
-
Jani Nikula authored
Simplify the build by doing the WaveDrom processing from the rst file (albeit raw html block) instead of post-processing the output html. Acked-by:
Rodrigo Vivi <rodrigo.vivi@intel.com> Signed-off-by:
Jani Nikula <jani.nikula@intel.com>
-
Jani Nikula authored
Reviewed-by:
Rodrigo Vivi <rodrigo.vivi@intel.com> Signed-off-by:
Jani Nikula <jani.nikula@intel.com>
-
Jani Nikula authored
Be strict and also require plain rst with no raw directives. Reviewed-by:
Rodrigo Vivi <rodrigo.vivi@intel.com> Signed-off-by:
Jani Nikula <jani.nikula@intel.com>
-
Jani Nikula authored
Let tab completion handle rebuild-tip better. If someone needs the old alias, it can be placed in ~/.dimrc. Acked-by:
Daniel Vetter <daniel@ffwll.ch> Signed-off-by:
Jani Nikula <jani.nikula@intel.com>
-
- Aug 08, 2017
-
-
Simona Vetter authored
I screwed up: - a '/' at the end makes readlink follow the link before testing it. - only delete everything when it's not a symlink. Cc: Jani Nikula <jani.nikula@linux.intel.com> Acked-by:
Jani Nikula <jani.nikula@linux.intel.com> Signed-off-by:
Daniel Vetter <daniel.vetter@intel.com>
-
- Aug 07, 2017
-
-
Simona Vetter authored
After about a month and a few attempts it's clear that my rr-cache gc logic is busted. When copying stuff back&forth between the git branch and git's rr-cache dir, something somewhere (or maybe it's git rerere itself) touches all files and wreaks the timestamps. End result is that over this month, every time when someone gc'ed a few files, they've been resurrected a few days later by someone else. I think the only way to fix this is by dropping the copying and replacing git's rr-cache with a symbolic link. That way, when we delete an rr-cache entry in the git branch, it won't be able to resurrect. I hope at least ... This also makes dim revert-rerere no longer needed, delete it. v2: Unfunny the ln option placement (Jani). Acked-by:
Jani Nikula <jani.nikula@linux.intel.com> Signed-off-by:
Daniel Vetter <daniel.vetter@intel.com>
-
- Aug 03, 2017
-
-
Instead of listing branches and grepping for the current branch, simply read the name of the current branch and compare. Suggested-by:
Daniel Vetter <daniel.vetter@intel.com> Signed-off-by:
Thierry Reding <treding@nvidia.com> Signed-off-by:
Daniel Vetter <daniel.vetter@ffwll.ch>
-
The new apply and push commands are shorthands for applying patches to and pushing the current branch, respectively. v2: use git symbolic-ref to find current branch (Daniel Vetter) Signed-off-by:
Thierry Reding <treding@nvidia.com> [danvet: Fixup dim.rst as per Jani's review.] Signed-off-by:
Daniel Vetter <daniel.vetter@ffwll.ch>
-
Simona Vetter authored
mtime is when the file contents last changed, ctime when attributes in the inode last changed. We want the former. For some reason ctime in my rr-cache is always very recent. Acked-by:
Jani Nikula <jani.nikula@linux.intel.com> Signed-off-by:
Daniel Vetter <daniel.vetter@intel.com>
-
Simona Vetter authored
It's a bit silly to have to spec both -d and -f to see what dim would all complain about. And dry-run should never cause bad side-effects. Acked-by:
Jani Nikula <jani.nikula@linux.intel.com> Signed-off-by:
Daniel Vetter <daniel.vetter@intel.com>
-
- Jul 26, 2017
-
-
Simona Vetter authored
Somehow a few formatting issues crept in that rst complained about in commit 7b414ba9e7aa75fc4dff6597036ff758031b9bdf (HEAD -> maintainer-tools) Author: Daniel Vetter <daniel.vetter@ffwll.ch> Date: Thu Jul 20 21:28:12 2017 +0200 drm-intel.rst: Fix formatting Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> Acked-by:
Sean Paul <seanpaul@chromium.org> Signed-off-by:
Daniel Vetter <daniel.vetter@intel.com>
-
Add checks for author and committer sign-off-by. Add a check for "Link" tag added by dim apply-branch. Use real names for people with many different email addresses. Signed-off-by:
Benjamin Gaignard <benjamin.gaignard@linaro.org> Signed-off-by:
Daniel Vetter <daniel.vetter@ffwll.ch>
-
- Jul 24, 2017
-
-
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 <seanpaul@chromium.org> Signed-off-by:
Daniel Vetter <daniel.vetter@intel.com>
-
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:
Imre Deak <imre.deak@linux.intel.com> Signed-off-by:
Daniel Vetter <daniel.vetter@intel.com>
-
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:
Imre Deak <imre.deak@intel.com> Acked-by:
Daniel Vetter <daniel.vetter@ffwll.ch>
-
- Jul 20, 2017
-
-
This patch adds a flowchart to the drm-misc documentation to help committers decide which branch is most appropriate for a given patch. Signed-off-by:
Sean Paul <seanpaul@chromium.org> Signed-off-by:
Daniel Vetter <daniel.vetter@ffwll.ch>
-
- Jul 18, 2017
-
-
Jani Nikula authored
The refactoring dropped a cd to the drm-rerere dir, leading to "cp: cannot stat 'rr-cache/*': No such file or directory" on dim ub. Reported-by:
Archit Taneja <architt@codeaurora.org> Fixes: 599eb3db ("dim: Move all rerere updating into helpers") Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: Sean Paul <seanpaul@chromium.org> Reviewed-by:
Daniel Vetter <daniel.vetter@ffwll.ch> Tested-by:
Archit Taneja <architt@codeaurora.org> Signed-off-by:
Jani Nikula <jani.nikula@intel.com>
-
- Jul 17, 2017
-
-
Simona Vetter authored
http: gets a "301 moved permanently" reply. Reported-by:
Paul Menzel <paulepanter@users.sourceforge.net> Cc: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by:
Paul Menzel <paulepanter@users.sourceforge.net> Acked-by:
Jani Nikula <jani.nikula@intel.com> Signed-off-by:
Daniel Vetter <daniel.vetter@intel.com>
-
- Jul 14, 2017
-
-
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 <seanpaul@chromium.org> Signed-off-by:
Daniel Vetter <daniel.vetter@intel.com>
-
Simona Vetter authored
Just prep work. Reviewed-by:
Sean Paul <seanpaul@chromium.org> Signed-off-by:
Daniel Vetter <daniel.vetter@intel.com>
-
- Jul 12, 2017
-
-
Maarten Lankhorst authored
This commit will take the topmost commit and add all cc's from get_maintainer.pl, it is useful for adding cc's to an entire patch series touching multiple drivers, to add the right cc to each one. Signed-off-by:
Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Acked-by:
Daniel Vetter <daniel.vetter@ffwll.ch> [mlankhorst: Rewrite commit message based on Jani's feedback] Acked-by:
Jani Nikula <jani.nikula@linux.intel.com>
-
- Jul 10, 2017
-
-
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:
Rodrigo Vivi <rodrigo.vivi@intel.com> Acked-by:
Jani Nikula <jani.nikula@intel.com>
-
- Jul 06, 2017
-
-
Rodrigo Vivi authored
I noticed when resolving a conflict that reappeared. Signed-off-by:
Rodrigo Vivi <rodrigo.vivi@intel.com> Reviewed-by:
Jani Nikula <jani.nikula@intel.com>
-
- Jun 28, 2017
-
-
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:
Jani Nikula <jani.nikula@linux.intel.com> Signed-off-by:
Daniel Vetter <daniel.vetter@intel.com>
-
- Jun 19, 2017
-
-
The autogenerated driver date update patch doesn't have a r-b tag for obvious reasons, which gets caught up in the new r-b/a-b check in dim push-branch. Hack around this. Note this only overrides the dim checks, it's still a ff-only git push (the -f for that needs to be added as a push-branch parameter). Signed-off-by:
Daniel Vetter <daniel.vetter@intel.com> Signed-off-by:
Jani Nikula <jani.nikula@intel.com>
-