From 0ce079bd9401a5612b56d67f4c2e9ab00e1760b6 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 12 Mar 2021 12:41:44 +0100 Subject: [PATCH] scripts/mbox2send: handle the 5.x queue properly for the X-KernelTest-* fields MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Turns out we hard-coded 4.x in the mail headers. Took people long enough to notice it :) Reported-by: Daniel Díaz Signed-off-by: Greg Kroah-Hartman --- scripts/mbox2send | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/mbox2send b/scripts/mbox2send index 58f87a39aa2..7cc902ed77a 100755 --- a/scripts/mbox2send +++ b/scripts/mbox2send @@ -32,6 +32,8 @@ if ($mbox eq "") { die; } +my $major_version = substr($root_version, 0, 1); + my $date=`date -u --iso-8601=minutes --date="2 days"`; chomp($date); @@ -71,7 +73,7 @@ while ($line = ) { if ($tags_written eq "false") { if ($line =~ m/^Subject:/) { # write out our own X-KernelTest tags to make automated tools's lives easier - print FILE "X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v4.x/stable-review/patch-$full_version.gz\n"; + print FILE "X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v$major_version.x/stable-review/patch-$full_version.gz\n"; print FILE "X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git\n"; print FILE "X-KernelTest-Branch: linux-$root_version.y\n"; print FILE "X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git\n"; -- 2.47.3