From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 16 Mar 2016 22:44:34 +0000 (+1100)
Subject: merge_msg: improve the "no action is required" message
X-Git-Url: http://git.ozlabs.org/?a=commitdiff_plain;h=16bdf912de12b1c22c86c492353bf64806d3ae81;p=next-scripts

merge_msg: improve the "no action is required" message

Suggestion from Linus
---

diff --git a/merge_msg b/merge_msg
index e5d80ec..a9695fa 100755
--- a/merge_msg
+++ b/merge_msg
@@ -33,7 +33,12 @@ from the FIXME tree and commit:
 
 from the BRANCH tree.
 
-I fixed it up (see below) and can carry the fix as necessary (no action is required).
+I fixed it up (see below) and can carry the fix as necessary. This
+is now fixed as far as linux-next is concerned, but any non trivial
+conflicts should be mentioned to your upstream maintainer when your tree
+is submitted for merging.  You may also want to consider cooperating
+with the maintainer of the conflicting tree to minimise any particularly
+complex conflicts.
 EOF
 
 exit 0