From 16bdf912de12b1c22c86c492353bf64806d3ae81 Mon Sep 17 00:00:00 2001 From: Stephen Rothwell Date: Thu, 17 Mar 2016 09:44:34 +1100 Subject: [PATCH] merge_msg: improve the "no action is required" message Suggestion from Linus --- merge_msg | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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 -- 2.39.5