[PATCH] merge_msg: Gather the email addresses for the conflicting tree

[PATCH] merge_msg: Gather the email addresses for the conflicting tree

[Mark Brown]

We have a list of conflicting trees and the contacts file, do the lookup of
the contacts programatically. Skip doing so for the origin tree since it's
not generally too interesting to tell Linus about these things, and rely on
the sending MUA to deduplicate addresses.

Signed-off-by: Mark Brown <broonie@kernel.org>
---
 merge_msg | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/merge_msg b/merge_msg
index f781e0b..e95cbaa 100755
--- a/merge_msg
+++ b/merge_msg
@@ -46,6 +46,16 @@ if [ "${#hb[@]}" -gt 1 ]; then
 	hbs='s'
 fi
 
+# Rely on the sending MUA to dedupe
+for b in "${hb[@]}"; do
+	if [ "${b}" = "origin" ]; done
+		continue
+	fi
+	bc=$(../tools/get_contacts ${b})
+	IFS=',' read -r -a addrs <<< ${bc}
+	cc+=("${addrs[@]}")
+done
+
 printf -v subject 'manual merge of the BRANCH tree with the %s tree%s' \
 	"${hb[*]}" "$hbs"
 printf -v update 'The BRANCH tree acquired a conflict with the %s tree%s'. \
@@ -72,8 +82,7 @@ if [ "$#" -gt 1 ]; then
 fi
 
 "$tools_dir/message_helper" "${branch[@]}" "$subject" "${cc[@]}" <<EOF
-FIXME: Add owner of second tree to To:
-       Add author(s)/SOB of conflicting commits.
+FIXME: Add author(s)/SOB of conflicting commits.
 
 Today's linux-next merge of the BRANCH tree got $conf in:
 
-- 
2.47.3

Re: [PATCH] merge_msg: Gather the email addresses for the conflicting tree

[Breno Leitao]

On Thu, Oct 01, 2026 at 09:49:35PM +0100, Mark Brown wrote:
> +# Rely on the sending MUA to dedupe
> +for b in "${hb[@]}"; do
> +	if [ "${b}" = "origin" ]; done

I am confused about this 'done' here. Shouldn't it be 'then' ?

> +		continue
> +	fi
> +	bc=$(../tools/get_contacts ${b})
> +	IFS=',' read -r -a addrs <<< ${bc}
> +	cc+=("${addrs[@]}")
> +done
> +

Re: [PATCH] merge_msg: Gather the email addresses for the conflicting tree

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 395 bytes --]

On Fri, Oct 02, 2026 at 03:28:24AM -0700, Breno Leitao wrote:
> On Thu, Oct 01, 2026 at 09:49:35PM +0100, Mark Brown wrote:
> > +# Rely on the sending MUA to dedupe
> > +for b in "${hb[@]}"; do
> > +	if [ "${b}" = "origin" ]; done

> I am confused about this 'done' here. Shouldn't it be 'then' ?

Yes, it should be a then - that was a last minute fixup before sending
that I obviously garbled.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]