Skip to content

dim: Do not skip commits from -fixes if in -next-fixes

Lucas De Marchi requested to merge demarchi/maintainer-tools:tip-cherry-pick-branch into master

If a commit is already in -next-fixes, but it's also a candidate to -fixes, it shouldn't be dropped. Otherwise we are skipping a commit for current release because it's being cherry-picked for the next one.

Eventually the commit will be back to the current via stable backporting, but I believe priority should be given to the current cycle. This happened this week in drm-xe with commit 01e0cfc994be ("drm/xe: Use write-back caching mode for system memory on DGFX") since Rodrigo sent a -next-fixes pull request earlier than me preparing the -fixes pull request.

This also changes the logic for drm-intel as it's currently has the same problem. This can later be simplified/refactored as now we only have 1 branch to consider.

Signed-off-by: Lucas De Marchi lucas.demarchi@intel.com

Merge request reports