- Mar 28, 2018
-
-
Joonas Lahtinen authored
We should not be nagging, we should almost be thanking for adding Documentation patches for i915 :) Signed-off-by:
Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Cc: Jani Nikula <jani.nikula@intel.com> Acked-by:
Jani Nikula <jani.nikula@intel.com>
-
- Mar 21, 2018
-
-
Sean Paul authored
Acked-by:
Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by:
Sean Paul <seanpaul@chromium.org> Link: https://patchwork.freedesktop.org/patch/msgid/20180321171240.229876-2-seanpaul@chromium.org
-
Sean Paul authored
Acked-by:
Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by:
Sean Paul <seanpaul@chromium.org>
-
- Mar 14, 2018
-
-
Jani Nikula authored
In qf line 411: git reset --hard $(git rev-parse --abbrev-ref @{u}) ^-- SC1083: This { is literal. Check expression (missing ;/\n?) or quote it. ^-- SC1083: This } is literal. Check expression (missing ;/\n?) or quote it. Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> Cc: Lucas De Marchi <lucas.demarchi@intel.com> Fixes: 0db98111 ("qf: Make qf_pull -f forcibly clean") Acked-by:
Rodrigo Vivi <rodrigo.vivi@intel.com> Signed-off-by:
Jani Nikula <jani.nikula@intel.com>
-
Jani Nikula authored
Set max line length to 100. I don't want to silence the LONG_LINE warning altogether, and I'd still prefer to keep lines under 80 characters, but I also don't want to see all the noise, and nor do I want to see silly code trying to arbitrarily squeeze under 80 when it doesn't make sense. 100 is a nice arbitrary round number... I hope review catches silly stuff regardless. Fingers crossed. BIT_MACRO. We have (1 << N) all over the place. I hope to switch to BIT() macro eventually, but this documents current use. PREFER_KERNEL_TYPES. We also have uint(8|16|32|64)_t all over the place. I also hope to move towards kernel types, but this documents current use. SPLIT_STRING, LONG_LINE_STRING. Don't nag about strings split to many lines, but also don't nag about strings not split. There's plenty more that could be tweaked, but let's start with something to improve the S/N ratio of the automated CI checkpatch reports. Now that we have --show-types included in the output, we can more easily discuss the ignores on a case-by-case basis. Cc: Arkadiusz Hiler <arkadiusz.hiler@intel.com> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> Reviewed-by:
Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by:
Jani Nikula <jani.nikula@intel.com>
-
Jani Nikula authored
To reduce noise on CI checkpatch reports, we want to silence some checkpatch warnings. Different branches may end up having different rules, and users may want to get unfiltered results, so introduce checkpatch profiles. Add some placeholder profiles to be filled later on. The idea is that CI would run 'dim checkpatch HEAD^ drm-intel' (or some other commit range-ish as the case may be). Cc: Arkadiusz Hiler <arkadiusz.hiler@intel.com> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> Reviewed-by:
Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by:
Jani Nikula <jani.nikula@intel.com>
-
Jani Nikula authored
Remove some old cruft. Pass checkpatch parameters via a variable. No functional changes. Cc: Arkadiusz Hiler <arkadiusz.hiler@intel.com> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> Reviewed-by:
Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by:
Jani Nikula <jani.nikula@intel.com>
-
- Mar 13, 2018
-
-
Rodrigo Vivi authored
The intention of commit '663e7293 ("qf: Allow rebase function to start from anywhere.")' was to allow the qf rebase to start from anywhere, including from a place where not patch is yet applied with quilt. However pop -f was not the right answer for that. We need to make sure that qf pull provides a really clean environment so qf rebase can really work from scratch to all (-a) patches. The goal is that a simple qf pull -f && qf rebase drm-tip/drm-tip Always simply work to rebase from anywhere. v2: Implement this behavior only on -f is used to avoid losing work in progress (Daniel). v3: Rebased. Fixes: 663e7293 ("qf: Allow rebase function to start from anywhere.") Cc: Lucas De Marchi <lucas.demarchi@intel.com> Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by:
Rodrigo Vivi <rodrigo.vivi@intel.com> Acked-by:
Lucas De Marchi <lucas.demarchi@intel.com>
-
Rodrigo Vivi authored
qf_checkout implies that you need to have that baseline on your local repository, what it is not good for a distributed maintenance. Let's make qf pull -f useful for the case we want to start a clean rebase from anywhere. v2: Remove dubious comments and use -f. v3: Avoid git pull --ff-only breaking force so force with fetch and hard reset v4: Removed duplicated git fetch (Lucas). Cc: Paulo Zanoni <paulo.r.zanoni@intel.com> Cc: Michel Thierry <michel.thierry@intel.com> Cc: James Ausmus <james.ausmus@intel.com> Cc: Lucas De Marchi <lucas.demarchi@intel.com> Signed-off-by:
Rodrigo Vivi <rodrigo.vivi@intel.com> Reviewed-by:
Lucas De Marchi <lucas.demarchi@intel.com>
-
- Mar 08, 2018
-
-
Rodrigo Vivi authored
When working with wiggle to easily solve rebasing conflicts we also need to be able to easily continue, easily see the impacted files and easily clean the repo to avoid ending up with many .rej and .porig files. v2: Remove -r from rm. (Lucas) Use -z instead of '== ""' comparison. (Lucas) Add documentation to the helpers. (Required by make check). Cc: Paulo Zanoni <paulo.r.zanoni@intel.com> Cc: Michel Thierry <michel.thierry@intel.com> Cc: James Ausmus <james.ausmus@intel.com> Cc: Lucas De Marchi <lucas.demarchi@intel.com> Signed-off-by:
Rodrigo Vivi <rodrigo.vivi@intel.com> Reviewed-by:
Lucas De Marchi <lucas.demarchi@intel.com>
-
- Mar 06, 2018
-
-
Jani Nikula authored
Upstream branches are defined by dim list-upstreams. Allow override for when the user knows what they're doing. Cc: Daniel Vetter <daniel@ffwll.ch> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> Reviewed-by:
Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by:
Jani Nikula <jani.nikula@intel.com>
-
- Mar 05, 2018
-
-
Jani Nikula authored
Too many aliases just make completions and everything harder, and if you really need this particular alias, you can shove it in your, uh, .dimrc. Reviewed-by:
Arkadiusz Hiler <arkadiusz.hiler@intel.com> Signed-off-by:
Jani Nikula <jani.nikula@intel.com>
-
Jani Nikula authored
checkpatch already covers "WARNING:AVOID_BUG: Avoid crashing the kernel - try using WARN_ON & recovery code rather than BUG() or BUG_ON()" Remove the redundant warning in dim. Reviewed-by:
Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by:
Jani Nikula <jani.nikula@intel.com>
-
Jani Nikula authored
checkpatch classifies its warnings to types. Print them in the checkpatch output to be better able to discuss ignoring types. Reviewed-by:
Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by:
Jani Nikula <jani.nikula@intel.com>
-
- Mar 02, 2018
-
-
Jani Nikula authored
Copy-paste fail. Mea culpa. Reported-by:
Madhav Chauhan <madhav.chauhan@intel.com> Cc: Madhav Chauhan <madhav.chauhan@intel.com> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> Fixes: df764fb3 ("doc: extract repository documentation to a separate file") Reviewed-by:
Rodrigo Vivi <rodrigo.vivi@intel.com> Reviewed-by:
Madhav Chauhan <madhav.chauhan@intel.com> Signed-off-by:
Jani Nikula <jani.nikula@intel.com>
-
- Feb 27, 2018
-
-
Lucas De Marchi authored
clean-patches is easier to remember, at least for me. However list-unused-patches already supports purging the files, so just use it. Signed-off-by:
Lucas De Marchi <lucas.demarchi@intel.com> Reviewed-by:
Rodrigo Vivi <rodrigo.vivi@intel.com> Signed-off-by:
Rodrigo Vivi <rodrigo.vivi@intel.com>
-
Lucas De Marchi authored
We would leave a trailing slash which causes patches on the git-root directory to be removed since they don't have that slash in the series file. Considering we have a patches/0001-bla.patch this would lead to: + ... + for patch in patches/{*/,/}*.patch + grep '^/0001-bla.patch$' patches/series + echo No reference to patches//0001-bla.patch, deleting it. + rm patches//0001-bla.patch The fix is to change the work directory to patches and stop fixing up the path. It's also safer to just use git-ls-files so we don't potentially remove patches still not added. Signed-off-by:
Lucas De Marchi <lucas.demarchi@intel.com> Reviewed-by:
Rodrigo Vivi <rodrigo.vivi@intel.com> Signed-off-by:
Rodrigo Vivi <rodrigo.vivi@intel.com>
-
Lucas De Marchi authored
The clean-patches command operates locally in the repository and doesn't need the baseline to be checked, so just remove the check. Signed-off-by:
Lucas De Marchi <lucas.demarchi@intel.com> Reviewed-by:
Rodrigo Vivi <rodrigo.vivi@intel.com> Signed-off-by:
Rodrigo Vivi <rodrigo.vivi@intel.com>
-
- Feb 20, 2018
-
-
Rodrigo Vivi authored
drm-intel-fixes@lists.freedesktop.org is dead for a while already and everybody is pretty much using 'Fixes:' tag properly. So it is time to adjust the documentation to the real life. No change on the flow though. Signed-off-by:
Rodrigo Vivi <rodrigo.vivi@intel.com> Acked-by:
Daniel Vetter <daniel.vetter@ffwll.ch>
-
- Feb 07, 2018
-
-
This is for the new drm-tip/maintainer-tools branch only, to make sure that upgrading from drm-intel/maintainer-tools will always be a fast-forward. While still being able to retire the hack once upgraded. Signed-off-by:
Daniel Vetter <daniel.vetter@intel.com> Signed-off-by:
Jani Nikula <jani.nikula@intel.com>
-
Originally I wanted to move it to a completely stand-alone maintainer-tools.git repo. But that has the problem that we need to keep track of, and update, yet another remote. Easy way out it to simply stuff the maintainer-tools branch into drm-tip. The auto-upgrade hack is a bit gross, but shouldn't really cause overhead. I've also pushed out the latest maintainer-tools (without this patch) to drm-tip.git to make sure the patch can be tested. The neat thing here is that this allows us to finally remove drm-intel url hardcoding from dim. v2: Update the docs, I've forgotten about those (Jani) Cc: Jani Nikula <jani.nikula@linux.intel.com> Reviewed-by:
Sean Paul <seanpaul@chromium.org> Signed-off-by:
Daniel Vetter <daniel.vetter@intel.com> Signed-off-by:
Jani Nikula <jani.nikula@intel.com>
-
- Feb 05, 2018
-
-
Sean Paul authored
In addition to tag-next, which is specific to drm-intel-next, add a generic tag-branch which tags any branch. Reviewed-by:
Jani Nikula <jani.nikula@intel.com> Signed-off-by:
Sean Paul <seanpaul@chromium.org>
-
Sean Paul authored
The code for generating a tag name is triplicated, pull it all out into a helper function. Reviewed-by:
Jani Nikula <jani.nikula@intel.com> Signed-off-by:
Sean Paul <seanpaul@chromium.org>
-
Sean Paul authored
Moving these above all call-sites to improve readability when I add functionality later in this series Reviewed-by:
Jani Nikula <jani.nikula@intel.com> Signed-off-by:
Sean Paul <seanpaul@chromium.org>
-
- Jan 31, 2018
-
-
Check the remote for the branch before creating it. Seems like this is a noop if it does exist, aside from creating duplicate entries in the integration config. Signed-off-by:
Sean Paul <seanpaul@chromium.org> Signed-off-by:
Daniel Vetter <daniel.vetter@ffwll.ch>
-
- Jan 30, 2018
-
-
Fix shellcheck: In dim line 1489: echo "$diff_result" | egrep '^[+-]' | egrep -v '^[+-]{3}' ^-- SC2196: egrep is non-standard and deprecated. Use grep -E instead. ^-- SC2196: egrep is non-standard and deprecated. Use grep -E instead. Signed-off-by:
Lucas De Marchi <lucas.demarchi@intel.com> Signed-off-by:
Daniel Vetter <daniel.vetter@ffwll.ch>
-
- Jan 29, 2018
-
-
Jani Nikula authored
Add a brief description of maintainer-tools. Acked-by:
Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by:
Jani Nikula <jani.nikula@intel.com>
-
Jani Nikula authored
Add a brief description of drm-rerere. Acked-by:
Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by:
Jani Nikula <jani.nikula@intel.com>
-
Jani Nikula authored
Just the most basic extraction with minimal stylistic and content changes. Reference the new document from drm-intel and drm-misc documentation. Acked-by:
Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by:
Jani Nikula <jani.nikula@intel.com>
-
Jani Nikula authored
It's a bit harsh to welcome the reader with just contents. Reviewed-by:
Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by:
Jani Nikula <jani.nikula@intel.com>
-
Every rc6, I reread the docs trying to reason about where my patch should go (the answer is basically always "drm-misc-fixes"). Reword the explanation to clarify the role of drm-misc-next-fixes and hopefully point people to drm-misc-fixes. Signed-off-by:
Eric Anholt <eric@anholt.net> Signed-off-by:
Daniel Vetter <daniel.vetter@ffwll.ch>
-
- Jan 27, 2018
-
-
Rodrigo Vivi authored
Like we now allow qf checkout to start from an unknown baseline we should also allow qf rebase. But also qf rebase only starts if there are already quilt patches applied, what doesn't make sense when you need to start a rebase from a clean machine. In reality what happens is that we are using checkout or manual quilt pushes to actually rebase the patches and the rebase function to only validate what we have done. By allowing the rebase to perform from anywhere we are actually fixing the meaning of rebase and making it more useful. Signed-off-by:
Rodrigo Vivi <rodrigo.vivi@intel.com> Reviewed-by:
Lucas De Marchi <lucas.demarchi@intel.com>
-
Rodrigo Vivi authored
Usually when we are at the fetch stage we want to fetch all the related branches. v2: Fetch inside the patches directory only refresh the repos seeing from inside that dir what it is not what we want, so let's fetch all from the right directory. Cc: Lucas De Marchi <lucas.demarchi@intel.com> Signed-off-by:
Rodrigo Vivi <rodrigo.vivi@intel.com> Reviewed-by:
Lucas De Marchi <lucas.demarchi@intel.com>
-
- Jan 23, 2018
-
-
Rodrigo Vivi authored
At this point we are only pulling the branches so in a distributed environment it is expected that you don't have the latest baseline on your environment yet. For years, all qf users were doing the initial pull manually or with other wrap scripts. so, let's fix it now and properly just use qf for initial pull and start the rebase process. Cc: Paulo Zanoni <paulo.r.zanoni@intel.com> Cc: Michel Thierry <michel.thierry@intel.com> Cc: James Ausmus <james.ausmus@intel.com> Cc: Lucas De Marchi <lucas.demarchi@intel.com> Signed-off-by:
Rodrigo Vivi <rodrigo.vivi@intel.com> Reviewed-by:
Lucas De Marchi <lucas.demarchi@intel.com>
-
Rodrigo Vivi authored
Be more strict here in order to make it more failsafe on auto rebases. v2: Add message requested by Lucas, mentioning that qf pull fails if branch cannot be fast forwarded. Cc: Paulo Zanoni <paulo.r.zanoni@intel.com> Cc: Michel Thierry <michel.thierry@intel.com> Cc: James Ausmus <james.ausmus@intel.com> Cc: Lucas De Marchi <lucas.demarchi@intel.com> Signed-off-by:
Rodrigo Vivi <rodrigo.vivi@intel.com> Reviewed-by:
Lucas De Marchi <lucas.demarchi@intel.com>
-
Rodrigo Vivi authored
Copy & Paste from dim.rst. Cc: Paulo Zanoni <paulo.r.zanoni@intel.com> Cc: Michel Thierry <michel.thierry@intel.com> Cc: James Ausmus <james.ausmus@intel.com> Cc: Lucas De Marchi <lucas.demarchi@intel.com> Signed-off-by:
Rodrigo Vivi <rodrigo.vivi@intel.com> Reviewed-by:
Lucas De Marchi <lucas.demarchi@intel.com>
-
Rodrigo Vivi authored
quilt header respect your $EDITOR choices. Cc: Paulo Zanoni <paulo.r.zanoni@intel.com> Cc: Michel Thierry <michel.thierry@intel.com> Cc: James Ausmus <james.ausmus@intel.com> Cc: Lucas De Marchi <lucas.demarchi@intel.com> Signed-off-by:
Rodrigo Vivi <rodrigo.vivi@intel.com> Reviewed-by:
Lucas De Marchi <lucas.demarchi@intel.com>
-
Rodrigo Vivi authored
For a long time I carried my own wiggle scripts here and I couldn't remember why exactly since they exist here on qf already. Now that I'm trying to kill some of my own and internal helper I realized that it was because the extra check for repo at this level is annoying. Let's be more permissive with wiggle magic here. Cc: Paulo Zanoni <paulo.r.zanoni@intel.com> Cc: James Ausmus <james.ausmus@intel.com> Cc: Michel Thierry <michel.thierry@intel.com> Cc: Lucas De Marchi <lucas.demarchi@intel.com> Signed-off-by:
Rodrigo Vivi <rodrigo.vivi@intel.com> Reviewed-by:
Lucas De Marchi <lucas.demarchi@intel.com>
-
- Jan 17, 2018
-
-
Simona Vetter authored
Eventually I guess we should be smarter and maybe parse MAINTAINERS somehow. But for now that should be good enough. v2: Also add dim-tools Acked-by:
Jani Nikula <jani.nikula@intel.com> Signed-off-by:
Daniel Vetter <daniel.vetter@intel.com>
-
- Jan 11, 2018
-
-
Signed-off-by:
Gustavo Padovan <gustavo.padovan@collabora.com> Signed-off-by:
Daniel Vetter <daniel.vetter@ffwll.ch>
-