From 0bd8a03a2a9d9cc7455f4e9bef70acfdbffe0339 Mon Sep 17 00:00:00 2001
From: Josh Dolitsky <josh@dolit.ski>
Date: Fri, 29 Apr 2022 08:12:41 -0500
Subject: [PATCH 1/2] Add Brandon as maintainer

Signed-off-by: Josh Dolitsky <josh@dolit.ski>
---
 CODEOWNERS  | 2 +-
 MAINTAINERS | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CODEOWNERS b/CODEOWNERS
index 3a867729b..5991e2c1b 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1 +1 @@
-* @brendandburns @jonjohnsonjr @jstarks @jonboulle @stevvooe @vbatts @cyphar
+* @brendandburns @jonjohnsonjr @jstarks @jonboulle @stevvooe @sudo-bmitch @vbatts @cyphar
diff --git a/MAINTAINERS b/MAINTAINERS
index 79b5bed60..54422bbe7 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1,3 +1,4 @@
+Brandon Mitchell <git@bmitch.net> (@sudo-bmitch)
 Brendan Burns <bburns@microsoft.com> (@brendandburns)
 Jon Johnson <jonjohnson@google.com> (@jonjohnsonjr)
 John Starks <jostarks@microsoft.com> (@jstarks)

From 97471344755b846049cf8dbe187dfdcae83471aa Mon Sep 17 00:00:00 2001
From: Josh Dolitsky <josh@dolit.ski>
Date: Fri, 29 Apr 2022 10:52:37 -0500
Subject: [PATCH 2/2] Move inactive maintainers to emeritus

Signed-off-by: Josh Dolitsky <josh@dolit.ski>
---
 CODEOWNERS  | 2 +-
 EMERITUS.md | 2 ++
 MAINTAINERS | 2 --
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CODEOWNERS b/CODEOWNERS
index 5991e2c1b..90027a40f 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -1 +1 @@
-* @brendandburns @jonjohnsonjr @jstarks @jonboulle @stevvooe @sudo-bmitch @vbatts @cyphar
+* @jonjohnsonjr @jonboulle @stevvooe @sudo-bmitch @vbatts @cyphar
diff --git a/EMERITUS.md b/EMERITUS.md
index 52205517e..eef0b44fd 100644
--- a/EMERITUS.md
+++ b/EMERITUS.md
@@ -1,7 +1,9 @@
 We would like to acknowledge previous OCI image spec maintainers and their huge contributions to our collective success:
 
 * Brandon Philips (@philips)
+* Brendan Burns (@brendandburns)
 * Jason Bouzane (@jbouzane)
+* John Starks (@jstarks)
 * Keyang Xie (@xiekeyang)
 
 We thank these members for their service to the OCI community.
diff --git a/MAINTAINERS b/MAINTAINERS
index 54422bbe7..402dd0504 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1,7 +1,5 @@
 Brandon Mitchell <git@bmitch.net> (@sudo-bmitch)
-Brendan Burns <bburns@microsoft.com> (@brendandburns)
 Jon Johnson <jonjohnson@google.com> (@jonjohnsonjr)
-John Starks <jostarks@microsoft.com> (@jstarks)
 Jonathan Boulle <jonathanboulle@gmail.com> (@jonboulle)
 Stephen Day <stevvooe@gmail.com> (@stevvooe)
 Vincent Batts <vbatts@hashbangbash.com> (@vbatts)