>From 82bd0d1dcfc5d17d1b72e12b2da3c9bb51e09a48 Mon Sep 17 00:00:00 2001
From: Don Slutz <address@hidden>
Date: Mon, 20 Oct 2014 16:06:35 -0400
Subject: [PATCH] get_maintainer.pl: Add 'THE REST'

Signed-off-by: Don Slutz <address@hidden>
---
 MAINTAINERS               |  8 ++++++++
 scripts/get_maintainer.pl | 15 +++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/MAINTAINERS b/MAINTAINERS
index 206bf7e..527227a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1018,3 +1018,11 @@ M: Chrysostomos Nanakos <address@hidden>
 M: Chrysostomos Nanakos <address@hidden>
 S: Maintained
 F: block/archipelago.c
+
+THE REST
+M: Michael S. Tsirkin <address@hidden>
+M: Peter Maydell <address@hidden>
+L: address@hidden
+S: Supported
+F: *
+F: */
diff --git a/scripts/get_maintainer.pl b/scripts/get_maintainer.pl
index 38334de..eef16ee 100755
--- a/scripts/get_maintainer.pl
+++ b/scripts/get_maintainer.pl
@@ -37,6 +37,7 @@ my $email_hg_since = "-365";
 my $interactive = 0;
 my $email_remove_duplicates = 1;
 my $email_use_mailmap = 1;
+my $email_drop_the_rest_supporter_if_supporter_found = 1;
 my $output_multiline = 1;
 my $output_separator = ", ";
 my $output_roles = 0;
@@ -196,6 +197,7 @@ if (!GetOptions(
 		'i|interactive!' => \$interactive,
 		'remove-duplicates!' => \$email_remove_duplicates,
 		'mailmap!' => \$email_use_mailmap,
+		'drop_the_rest_supporter!' => \$email_drop_the_rest_supporter_if_supporter_found,
 		'm!' => \$email_maintainer,
 		'n!' => \$email_usename,
 		'l!' => \$email_list,
@@ -647,6 +649,19 @@ sub get_maintainers {
 	}
     }
 
+    if ($email_drop_the_rest_supporter_if_supporter_found && $#email_to > 0) {
+        my @email_new;
+        my $do_replace = 0;
+        foreach my $email (@email_to) {
+            if ($email->[1] ne 'supporter:THE REST') {
+                $do_replace = 1;
+                push @email_new, $email;
+            }
+        }
+        @email_to = @email_new
+            if $do_replace;
+    }
+
     foreach my $email (@email_to, @list_to) {
 	$email->[0] = deduplicate_email($email->[0]);
     }
-- 
1.8.4