From d0a88ae4797e79d01ad98e88d0bae9e6a977dbf9 Mon Sep 17 00:00:00 2001 From: Matthias Maennich Date: Wed, 21 Jul 2021 20:51:47 +0100 Subject: [PATCH] ANDROID: Enable GKI Dr. No Enforcement This effectively locks down OWNERS approval to a small group to guard the code base against unintentional breakages. Bug: 194314089 Signed-off-by: Matthias Maennich Change-Id: Ifd1ea97639a622320ea83f901f6451e2e52b38d4 --- Documentation/ABI/testing/OWNERS | 2 -- Documentation/filesystems/OWNERS | 2 -- OWNERS | 17 +++++++++++++++-- android/OWNERS | 12 ------------ arch/arm/OWNERS | 2 -- arch/arm64/OWNERS | 2 -- arch/x86/OWNERS | 2 -- block/OWNERS | 2 -- crypto/OWNERS | 2 -- drivers/OWNERS | 2 -- fs/OWNERS | 2 -- fs/f2fs/OWNERS | 2 -- fs/fuse/OWNERS | 2 -- fs/incfs/OWNERS | 2 -- include/OWNERS | 2 -- include/linux/OWNERS | 2 -- include/trace/events/OWNERS | 2 -- include/uapi/linux/OWNERS | 2 -- kernel/sched/OWNERS | 2 -- mm/OWNERS | 2 -- net/OWNERS | 2 -- .../testing/selftests/filesystems/incfs/OWNERS | 2 -- 22 files changed, 15 insertions(+), 54 deletions(-) delete mode 100644 Documentation/ABI/testing/OWNERS delete mode 100644 Documentation/filesystems/OWNERS delete mode 100644 android/OWNERS delete mode 100644 arch/arm/OWNERS delete mode 100644 arch/arm64/OWNERS delete mode 100644 arch/x86/OWNERS delete mode 100644 block/OWNERS delete mode 100644 crypto/OWNERS delete mode 100644 drivers/OWNERS delete mode 100644 fs/OWNERS delete mode 100644 fs/f2fs/OWNERS delete mode 100644 fs/fuse/OWNERS delete mode 100644 fs/incfs/OWNERS delete mode 100644 include/OWNERS delete mode 100644 include/linux/OWNERS delete mode 100644 include/trace/events/OWNERS delete mode 100644 include/uapi/linux/OWNERS delete mode 100644 kernel/sched/OWNERS delete mode 100644 mm/OWNERS delete mode 100644 net/OWNERS delete mode 100644 tools/testing/selftests/filesystems/incfs/OWNERS diff --git a/Documentation/ABI/testing/OWNERS b/Documentation/ABI/testing/OWNERS deleted file mode 100644 index 75edfd5b3a32..000000000000 --- a/Documentation/ABI/testing/OWNERS +++ /dev/null @@ -1,2 +0,0 @@ -# include OWNERS from the authoritative android-mainline branch -include kernel/common:android-mainline:/Documentation/ABI/testing/OWNERS diff --git a/Documentation/filesystems/OWNERS b/Documentation/filesystems/OWNERS deleted file mode 100644 index 5b6ec532f1e2..000000000000 --- a/Documentation/filesystems/OWNERS +++ /dev/null @@ -1,2 +0,0 @@ -# include OWNERS from the authoritative android-mainline branch -include kernel/common:android-mainline:/Documentation/filesystems/OWNERS diff --git a/OWNERS b/OWNERS index 2b5ccceaf513..6254ca3531e3 100644 --- a/OWNERS +++ b/OWNERS @@ -1,2 +1,15 @@ -# include OWNERS from the authoritative android-mainline branch -include kernel/common:android-mainline:/OWNERS +set noparent + +# GKI Dr. No Enforcement is active on this branch. Approval of one of the +# following persons is required following a regular CodeReview+2 vote of a code +# reviewer. +# +# See the GKI release documentation (go/gki-dr-no) for further details. + +adelva@google.com +maennich@google.com +malchev@google.com +saravanak@google.com +smuckle@google.com +sspatil@google.com +tkjos@google.com diff --git a/android/OWNERS b/android/OWNERS deleted file mode 100644 index 15daab5460ab..000000000000 --- a/android/OWNERS +++ /dev/null @@ -1,12 +0,0 @@ -# If we ever add another OWNERS above this directory, it's likely to be -# more permissive, so don't inherit from it -set noparent -adelva@google.com -maennich@google.com -saravanak@google.com -sspatil@google.com -tkjos@google.com -willmcvicker@google.com -# Downstream boards maintained directly in this manifest branch -per-file abi_gki_aarch64_cuttlefish = adelva@google.com, rammuthiah@google.com -per-file abi_gki_aarch64_goldfish = rkir@google.com diff --git a/arch/arm/OWNERS b/arch/arm/OWNERS deleted file mode 100644 index 1e390c75956e..000000000000 --- a/arch/arm/OWNERS +++ /dev/null @@ -1,2 +0,0 @@ -# include OWNERS from the authoritative android-mainline branch -include kernel/common:android-mainline:/arch/arm/OWNERS diff --git a/arch/arm64/OWNERS b/arch/arm64/OWNERS deleted file mode 100644 index 257f4cf26809..000000000000 --- a/arch/arm64/OWNERS +++ /dev/null @@ -1,2 +0,0 @@ -# include OWNERS from the authoritative android-mainline branch -include kernel/common:android-mainline:/arch/arm64/OWNERS diff --git a/arch/x86/OWNERS b/arch/x86/OWNERS deleted file mode 100644 index ae2c29f6c3b7..000000000000 --- a/arch/x86/OWNERS +++ /dev/null @@ -1,2 +0,0 @@ -# include OWNERS from the authoritative android-mainline branch -include kernel/common:android-mainline:/arch/x86/OWNERS diff --git a/block/OWNERS b/block/OWNERS deleted file mode 100644 index 7786d734d5c6..000000000000 --- a/block/OWNERS +++ /dev/null @@ -1,2 +0,0 @@ -# include OWNERS from the authoritative android-mainline branch -include kernel/common:android-mainline:/block/OWNERS diff --git a/crypto/OWNERS b/crypto/OWNERS deleted file mode 100644 index f74b7ed228f7..000000000000 --- a/crypto/OWNERS +++ /dev/null @@ -1,2 +0,0 @@ -# include OWNERS from the authoritative android-mainline branch -include kernel/common:android-mainline:/crypto/OWNERS diff --git a/drivers/OWNERS b/drivers/OWNERS deleted file mode 100644 index 22c7eece228f..000000000000 --- a/drivers/OWNERS +++ /dev/null @@ -1,2 +0,0 @@ -# include OWNERS from the authoritative android-mainline branch -include kernel/common:android-mainline:/drivers/OWNERS diff --git a/fs/OWNERS b/fs/OWNERS deleted file mode 100644 index a838344a1137..000000000000 --- a/fs/OWNERS +++ /dev/null @@ -1,2 +0,0 @@ -# include OWNERS from the authoritative android-mainline branch -include kernel/common:android-mainline:/fs/OWNERS diff --git a/fs/f2fs/OWNERS b/fs/f2fs/OWNERS deleted file mode 100644 index f981f44fbffd..000000000000 --- a/fs/f2fs/OWNERS +++ /dev/null @@ -1,2 +0,0 @@ -# include OWNERS from the authoritative android-mainline branch -include kernel/common:android-mainline:/fs/f2fs/OWNERS diff --git a/fs/fuse/OWNERS b/fs/fuse/OWNERS deleted file mode 100644 index 6c04da7a65d5..000000000000 --- a/fs/fuse/OWNERS +++ /dev/null @@ -1,2 +0,0 @@ -# include OWNERS from the authoritative android-mainline branch -include kernel/common:android-mainline:/fs/fuse/OWNERS diff --git a/fs/incfs/OWNERS b/fs/incfs/OWNERS deleted file mode 100644 index 17131f337364..000000000000 --- a/fs/incfs/OWNERS +++ /dev/null @@ -1,2 +0,0 @@ -# include OWNERS from the authoritative android-mainline branch -include kernel/common:android-mainline:/fs/incfs/OWNERS diff --git a/include/OWNERS b/include/OWNERS deleted file mode 100644 index ab8142b271b4..000000000000 --- a/include/OWNERS +++ /dev/null @@ -1,2 +0,0 @@ -# include OWNERS from the authoritative android-mainline branch -include kernel/common:android-mainline:/include/OWNERS diff --git a/include/linux/OWNERS b/include/linux/OWNERS deleted file mode 100644 index c88808c07797..000000000000 --- a/include/linux/OWNERS +++ /dev/null @@ -1,2 +0,0 @@ -# include OWNERS from the authoritative android-mainline branch -include kernel/common:android-mainline:/include/linux/OWNERS diff --git a/include/trace/events/OWNERS b/include/trace/events/OWNERS deleted file mode 100644 index de3838b6df38..000000000000 --- a/include/trace/events/OWNERS +++ /dev/null @@ -1,2 +0,0 @@ -# include OWNERS from the authoritative android-mainline branch -include kernel/common:android-mainline:/include/trace/events/OWNERS diff --git a/include/uapi/linux/OWNERS b/include/uapi/linux/OWNERS deleted file mode 100644 index 113046844b1c..000000000000 --- a/include/uapi/linux/OWNERS +++ /dev/null @@ -1,2 +0,0 @@ -# include OWNERS from the authoritative android-mainline branch -include kernel/common:android-mainline:/include/uapi/linux/OWNERS diff --git a/kernel/sched/OWNERS b/kernel/sched/OWNERS deleted file mode 100644 index fc027b64b61b..000000000000 --- a/kernel/sched/OWNERS +++ /dev/null @@ -1,2 +0,0 @@ -# include OWNERS from the authoritative android-mainline branch -include kernel/common:android-mainline:/kernel/sched/OWNERS diff --git a/mm/OWNERS b/mm/OWNERS deleted file mode 100644 index f89766e706e0..000000000000 --- a/mm/OWNERS +++ /dev/null @@ -1,2 +0,0 @@ -# include OWNERS from the authoritative android-mainline branch -include kernel/common:android-mainline:/mm/OWNERS diff --git a/net/OWNERS b/net/OWNERS deleted file mode 100644 index ddb7653770ec..000000000000 --- a/net/OWNERS +++ /dev/null @@ -1,2 +0,0 @@ -# include OWNERS from the authoritative android-mainline branch -include kernel/common:android-mainline:/net/OWNERS diff --git a/tools/testing/selftests/filesystems/incfs/OWNERS b/tools/testing/selftests/filesystems/incfs/OWNERS deleted file mode 100644 index 5eb371e1a5a3..000000000000 --- a/tools/testing/selftests/filesystems/incfs/OWNERS +++ /dev/null @@ -1,2 +0,0 @@ -# include OWNERS from the authoritative android-mainline branch -include kernel/common:android-mainline:/tools/testing/selftests/filesystems/incfs/OWNERS