From 0c3ec15ae09c1e26441a6503f2a96d3a114eef07 Mon Sep 17 00:00:00 2001 From: Matthias Maennich Date: Fri, 7 May 2021 10:12:00 +0000 Subject: [PATCH] Revert "ANDROID: Improve OWNERS file definitions" This reverts commit 7a523ef8d7e077b8962089b80561a0d9b95ab0de. Reason for revert: Seems to break the code-owners plugin Change-Id: I287f159d49d49f42be011b62a1676481a4f636cf --- Documentation/filesystems/OWNERS | 2 +- arch/arm64/OWNERS | 11 +++++++---- arch/x86/OWNERS | 6 +++--- drivers/OWNERS | 13 +++++++------ fs/OWNERS | 3 ++- include/OWNERS | 2 +- include/linux/OWNERS | 4 ++-- include/trace/events/OWNERS | 2 +- include/uapi/linux/OWNERS | 4 ++-- 9 files changed, 26 insertions(+), 21 deletions(-) diff --git a/Documentation/filesystems/OWNERS b/Documentation/filesystems/OWNERS index a63dbf4659f2..52df53b8cfd2 100644 --- a/Documentation/filesystems/OWNERS +++ b/Documentation/filesystems/OWNERS @@ -1 +1 @@ -per-file f2fs**=file:/fs/f2fs/OWNERS +per-file f2fs*=file:/fs/f2fs/OWNERS diff --git a/arch/arm64/OWNERS b/arch/arm64/OWNERS index f362e24fd9cf..06c8286c0bdf 100644 --- a/arch/arm64/OWNERS +++ b/arch/arm64/OWNERS @@ -1,4 +1,7 @@ -per-file crypto/**=file:/crypto/OWNERS -per-file {include,kernel,kvm,lib}/**=mzyngier@google.com,willdeacon@google.com -per-file mm/**=file:/mm/OWNERS -per-file net/**=file:/net/OWNERS +per-file crypto/*=file:/crypto/OWNERS +per-file include/*=mzyngier@google.com,willdeacon@google.com +per-file kernel/*=mzyngier@google.com,willdeacon@google.com +per-file kvm/*=mzyngier@google.com,willdeacon@google.com +per-file lib/*=mzyngier@google.com,willdeacon@google.com +per-file mm/*=file:/mm/OWNERS +per-file net/*=file:/net/OWNERS diff --git a/arch/x86/OWNERS b/arch/x86/OWNERS index f59fa995b361..fdee0d6dd07e 100644 --- a/arch/x86/OWNERS +++ b/arch/x86/OWNERS @@ -1,3 +1,3 @@ -per-file crypto/**=file:/crypto/OWNERS -per-file mm/**=file:/mm/OWNERS -per-file net/**=file:/net/OWNERS +per-file crypto/*=file:/crypto/OWNERS +per-file mm/*=file:/mm/OWNERS +per-file net/*=file:/net/OWNERS diff --git a/drivers/OWNERS b/drivers/OWNERS index c13fa056367d..692846a98b37 100644 --- a/drivers/OWNERS +++ b/drivers/OWNERS @@ -1,6 +1,7 @@ -per-file base/**=gregkh@google.com,saravanak@google.com -per-file block/**=akailash@google.com -per-file md/**=akailash@google.com,paullawrence@google.com -per-file net/**=file:/net/OWNERS -per-file scsi/**=bvanassche@google.com,jaegeuk@google.com -per-file {tty,usb}/**=gregkh@google.com +per-file base/*=gregkh@google.com,saravanak@google.com +per-file block/*=akailash@google.com +per-file md/*=akailash@google.com,palmerdabbelt@google.com,paullawrence@google.com +per-file net/*=file:/net/OWNERS +per-file scsi/*=bvanassche@google.com,jaegeuk@google.com +per-file tty/*=gregkh@google.com +per-file usb/*=gregkh@google.com diff --git a/fs/OWNERS b/fs/OWNERS index 7780f6be0335..09d26b6cd7ae 100644 --- a/fs/OWNERS +++ b/fs/OWNERS @@ -1 +1,2 @@ -per-file {crypto,verity}/**=ebiggers@google.com +per-file crypto/*=ebiggers@google.com +per-file verity/*=ebiggers@google.com diff --git a/include/OWNERS b/include/OWNERS index 4b815c212f9d..ca3b4045a095 100644 --- a/include/OWNERS +++ b/include/OWNERS @@ -1 +1 @@ -per-file net/**=file:/net/OWNERS +per-file net=file:/net/OWNERS diff --git a/include/linux/OWNERS b/include/linux/OWNERS index 68b6dedea64f..d5613e51cf80 100644 --- a/include/linux/OWNERS +++ b/include/linux/OWNERS @@ -1,4 +1,4 @@ per-file bio.h=file:/block/OWNERS per-file blk*.h=file:/block/OWNERS -per-file f2fs**=file:/fs/f2fs/OWNERS -per-file net**=file:/net/OWNERS +per-file f2fs*=file:/fs/f2fs/OWNERS +per-file net*=file:/net/OWNERS diff --git a/include/trace/events/OWNERS b/include/trace/events/OWNERS index a63dbf4659f2..52df53b8cfd2 100644 --- a/include/trace/events/OWNERS +++ b/include/trace/events/OWNERS @@ -1 +1 @@ -per-file f2fs**=file:/fs/f2fs/OWNERS +per-file f2fs*=file:/fs/f2fs/OWNERS diff --git a/include/uapi/linux/OWNERS b/include/uapi/linux/OWNERS index 1ee1fe217b50..c37993a57df4 100644 --- a/include/uapi/linux/OWNERS +++ b/include/uapi/linux/OWNERS @@ -1,2 +1,2 @@ -per-file f2fs**=file:/fs/f2fs/OWNERS -per-file net**=file:/net/OWNERS +per-file f2fs*=file:/fs/f2fs/OWNERS +per-file net*=file:/net/OWNERS