only put the FIXME text in the merge fix messages

diff --git a/merge_msg b/merge_msg
index 201442612f5ffb39497f3cdfd46662deb0ad4e01..62227bdd2f84df0590fb4294688837366e613308 100755 (executable)
--- a/merge_msg
+++ b/merge_msg
@@ -21,6 +21,9 @@ conf="a conflict"
 subject="manual merge of the BRANCH tree with the FIXME tree"
 
 $(dirname $0)/message_helper $branch "$subject" <<EOF
+FIXME: Add owner of second tree to To:
+       Add author(s)/SOB of conflicting commits.
+
 Today's linux-next merge of the BRANCH tree got $conf in:
 
   $file

diff --git a/send_email b/send_email
index 37e5c349d39eb475f24f84be031ad46f5e3584fa..475a9538aa754e77d24b9831510dd8393056cb58 100755 (executable)
--- a/send_email
+++ b/send_email
@@ -12,9 +12,6 @@ To: $to
 Cc: $cc
 Subject: $subject
 
-FIXME: Add owner of second tree to To:
-       Add author(s)/SOB of conflicting commits.
-
 EOF
        cat
 ) > $TARGET