Nowadays our process relies on the Fixes: line, and Cc: drm-intel-fixes
is redundant. Stop adding and using it.
Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx>
---
dim | 17 +----------------
1 file changed, 1 insertion(+), 16 deletions(-)
diff --git a/dim b/dim
index 85866488e0e0..0f70c76f103b 100755
--- a/dim
+++ b/dim
@@ -979,7 +979,6 @@ function dim_cherry_pick
function git_list_fixes
{
git log --reverse --format=format:%H --regexp-ignore-case \
- --grep="^Cc:.*drm-intel-fixes@lists\.freedesktop\.org" \
--grep="^Cc:.*stable@vger\.kernel\.org" \
--grep="^Fixes: " \
"$@"
@@ -1935,23 +1934,9 @@ function dim_fixes
tag=$(git tag --contains $sha1 | grep ^v | sort -V | head -n 1)
if [[ -n "$tag" ]]; then
- if echo "$tag" | grep -q -e "-rc" ; then
- echo "Cc: <drm-intel-fixes@xxxxxxxxxxxxxxxxxxxxx> # ${tag}+"
- else
+ if ! echo "$tag" | grep -q -e "-rc"; then
echo "Cc: <stable@xxxxxxxxxxxxxxx> # ${tag}+"
fi
- else
- git_fetch_helper $DIM_DRM_INTEL_REMOTE
- # Check whether it's already in a feature pile tag
- if git merge-base --is-ancestor $sha1 $DIM_DRM_INTEL_REMOTE/drm-intel-next ; then
- # Make sure we're in the critical window where we might
- # need to cherry-pick to dinf. critical window is -rc5
- # up to end of merge window, hence exclude if in -rc1
- # through rc-4.
- if ! git tag | grep ^v | sort -V | tail -n1 | grep -q -e "-rc[1-4]$" ; then
- echo "Cc: <drm-intel-fixes@xxxxxxxxxxxxxxxxxxxxx>"
- fi
- fi
fi
}
--
2.11.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
