diff --git a/notify/jira/comment-template.txt b/notify/jira/comment-template.txt
index 224d20dcf..574cb3f1e 100644
--- a/notify/jira/comment-template.txt
+++ b/notify/jira/comment-template.txt
@@ -1,4 +1,3 @@
 [LLVM-647]
-https://linaro.atlassian.net/browse/LLVM-1005
 Failure
 Details: https://ci.linaro.org/job/tcwg_kernel--llvm-master-arm-next-allmodconfig-build/138/artifact/artifacts/notify/mail-body.txt/*view*/
diff --git a/notify/mail-body.txt b/notify/mail-body.txt
index 8b5c0405f..a4ad08ed8 100644
--- a/notify/mail-body.txt
+++ b/notify/mail-body.txt
@@ -1,81 +1,63 @@
-Dear contributor, our automatic CI has detected problems related to your patch(es).  Please find some details below.  If you have any questions, please follow up on linaro-toolchain@lists.linaro.org mailing list, Libera's #linaro-tcwg channel, or ping your favourite Linaro toolchain developer on the usual project channel.
-
-We appreciate that it might be difficult to find the necessary logs or reproduce the issue locally. If you can't get what you need from our CI within minutes, let us know and we will be happy to help.
-
-We track this report status in https://linaro.atlassian.net/browse/LLVM-1005 , please let us know if you are looking at the problem and/or when you have a fix.
-
-In CI config tcwg_kernel/llvm-master-arm-next-allmodconfig after:
-
-  | commit v6.6-rc1-17-ge0750d9473522
-  | Author: Kent Overstreet <kent.overstreet@gmail.com>
-  | Date:   Thu Mar 16 22:18:50 2017 -0800
+Dear contributor,
+
+Our automatic CI has detected problems related to your patch(es). Please find some details below.
+
+In tcwg_kernel/llvm-master-arm-next-allmodconfig, after:
+  | 0 commits in linux
+
+Produces Failure:
+  | Results changed to
+  | # reset_artifacts:
+  | -10
+  | # build_abe binutils:
+  | -9
+  | # build_kernel_llvm:
+  | -5
+  | # build_abe qemu:
+  | -2
+  | # linux_n_obj:
+  | 23730
+  | # First few build errors in logs:
   | 
-  |     bcachefs: Initial commit
-  |     
-  |     Initially forked from drivers/md/bcache, bcachefs is a new copy-on-write
-  |     filesystem with every feature you could possibly want.
-  |     
-  |     Website: https://bcachefs.org
-  |     
-  | ... 1 lines of the commit log omitted.
-
-Results changed to
-# reset_artifacts:
--10
-# build_abe binutils:
--9
-# build_kernel_llvm:
--5
-# build_abe qemu:
--2
-# linux_n_obj:
-23730
-# First few build errors in logs:
+  | # 01:05:32 fs/bcachefs/btree_cache.h:45:43: error: array index 0 is past the end of the array (that has type 'const __u64[0]' (aka 'const unsigned long long[0]')) [-Werror,-Warray-bounds]
+  | # 01:05:33 fs/bcachefs/alloc.c:332:9: error: call to undeclared function 'COUNT_ARGS'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
+  | # 01:05:33 make[4]: *** [scripts/Makefile.build:243: fs/bcachefs/alloc.o] Error 1
+  | # 01:05:45 fs/bcachefs/btree_cache.h:45:43: error: array index 0 is past the end of the array (that has type 'const __u64[0]' (aka 'const unsigned long long[0]')) [-Werror,-Warray-bounds]
+  | # 01:05:45 make[4]: *** [scripts/Makefile.build:243: fs/bcachefs/bset.o] Error 1
+  | # 01:05:49 fs/bcachefs/btree_cache.h:45:43: error: array index 0 is past the end of the array (that has type 'const __u64[0]' (aka 'const unsigned long long[0]')) [-Werror,-Warray-bounds]
+  | # 01:05:49 fs/bcachefs/btree_cache.c:67:9: error: array index 0 is past the end of the array (that has type 'const __u64[0]' (aka 'const unsigned long long[0]')) [-Werror,-Warray-bounds]
+  | # 01:05:49 fs/bcachefs/btree_cache.c:120:2: error: array index 0 is past the end of the array (that has type '__u64[0]' (aka 'unsigned long long[0]')) [-Werror,-Warray-bounds]
+  | # 01:05:49 fs/bcachefs/btree_cache.c:201:6: error: array index 0 is past the end of the array (that has type 'const __u64[0]' (aka 'const unsigned long long[0]')) [-Werror,-Warray-bounds]
+  | # 01:05:49 fs/bcachefs/btree_cache.c:607:3: error: array index 0 is past the end of the array (that has type '__u64[0]' (aka 'unsigned long long[0]')) [-Werror,-Warray-bounds]
+  | # First few build errors in logs:
+  | 
+  | From
+  | # reset_artifacts:
+  | -10
+  | # build_abe binutils:
+  | -9
+  | # build_kernel_llvm:
+  | -5
+  | # build_abe qemu:
+  | -2
+  | # linux_n_obj:
+  | 32815
+  | # linux build successful:
+  | all
+  | # linux boot successful:
+  | boot
+
+Used configuration :
+ tcwg_kernel/llvm-master-arm-next-allmodconfig
+
+If you have any questions regarding this report, please ask on linaro-toolchain@lists.linaro.org mailing list.
 
-# 01:05:32 fs/bcachefs/btree_cache.h:45:43: error: array index 0 is past the end of the array (that has type 'const __u64[0]' (aka 'const unsigned long long[0]')) [-Werror,-Warray-bounds]
-# 01:05:33 fs/bcachefs/alloc.c:332:9: error: call to undeclared function 'COUNT_ARGS'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
-# 01:05:33 make[4]: *** [scripts/Makefile.build:243: fs/bcachefs/alloc.o] Error 1
-# 01:05:45 fs/bcachefs/btree_cache.h:45:43: error: array index 0 is past the end of the array (that has type 'const __u64[0]' (aka 'const unsigned long long[0]')) [-Werror,-Warray-bounds]
-# 01:05:45 make[4]: *** [scripts/Makefile.build:243: fs/bcachefs/bset.o] Error 1
-# 01:05:49 fs/bcachefs/btree_cache.h:45:43: error: array index 0 is past the end of the array (that has type 'const __u64[0]' (aka 'const unsigned long long[0]')) [-Werror,-Warray-bounds]
-# 01:05:49 fs/bcachefs/btree_cache.c:67:9: error: array index 0 is past the end of the array (that has type 'const __u64[0]' (aka 'const unsigned long long[0]')) [-Werror,-Warray-bounds]
-# 01:05:49 fs/bcachefs/btree_cache.c:120:2: error: array index 0 is past the end of the array (that has type '__u64[0]' (aka 'unsigned long long[0]')) [-Werror,-Warray-bounds]
-# 01:05:49 fs/bcachefs/btree_cache.c:201:6: error: array index 0 is past the end of the array (that has type 'const __u64[0]' (aka 'const unsigned long long[0]')) [-Werror,-Warray-bounds]
-# 01:05:49 fs/bcachefs/btree_cache.c:607:3: error: array index 0 is past the end of the array (that has type '__u64[0]' (aka 'unsigned long long[0]')) [-Werror,-Warray-bounds]
+-----------------8<--------------------------8<--------------------------8<--------------------------
 
-From
-# reset_artifacts:
--10
-# build_abe binutils:
--9
-# build_kernel_llvm:
--5
-# build_abe qemu:
--2
-# linux_n_obj:
-32815
-# linux build successful:
-all
-# linux boot successful:
-boot
+The information below contains the details of the failures, and the ways to reproduce a debug environment:
 
-The configuration of this build is:
-CI config tcwg_kernel/llvm-master-arm-next-allmodconfig
 
------------------8<--------------------------8<--------------------------8<--------------------------
-The information below can be used to reproduce a debug environment:
 
 Current build   : https://ci.linaro.org/job/tcwg_kernel--llvm-master-arm-next-allmodconfig-build/138/artifact/artifacts
 Reference build : https://ci.linaro.org/job/tcwg_kernel--llvm-master-arm-next-allmodconfig-build/137/artifact/artifacts
 
-Reproduce last good and first bad builds: https://git-us.linaro.org/toolchain/ci/interesting-commits.git/plain/linux/sha1/e0750d9473522d076b33ee257a21e27a5dd75031/tcwg_kernel/llvm-master-arm-next-allmodconfig/reproduction_instructions.txt
-
-Full commit : https://git.linaro.org/kernel-org/linux-next.git/commit/?id=e0750d9473522d076b33ee257a21e27a5dd75031
-
-List of configurations that regressed due to this commit :
-* tcwg_kernel
-** llvm-master-arm-next-allmodconfig
-*** Failure
-*** https://git-us.linaro.org/toolchain/ci/interesting-commits.git/plain/linux/sha1/e0750d9473522d076b33ee257a21e27a5dd75031/tcwg_kernel/llvm-master-arm-next-allmodconfig/details.txt
-*** https://ci.linaro.org/job/tcwg_kernel--llvm-master-arm-next-allmodconfig-build/138/artifact/artifacts
-
diff --git a/notify/mail-subject.txt b/notify/mail-subject.txt
index e359a31a7..64323f4c1 100644
--- a/notify/mail-subject.txt
+++ b/notify/mail-subject.txt
@@ -1 +1 @@
-[Linaro-TCWG-CI] v6.6-rc1-17-ge0750d9473522: Failure on arm
+[Linaro-TCWG-CI] 0 commits in linux: Failure on arm
