--- /dev/null
+# This file contains the GitLab handle of the maintainers/reviewers for
+# a given file:
+# https://docs.gitlab.com/ce/user/project/code_owners.html
+#
+# Consider these as the list of people who want to be involved in MRs
+# touching these files/folders, and whom you can ask your questions and
+# tag in issues.
+#
+# As of GitLab 14.3, all features surrounding this file are premium-only,
+# which means this file is only read by humans for now.
+#
+# Paths starting with a `/` are relative to the git root, otherwise they
+# can match any substring of the file's path.
+# If multiple lines match, only the last one applies; there is no
+# accumulation.
+
+
+##################
+# INFRASTRUCTURE #
+##################
+
+# Build system - Meson
+meson.build @dbaker @eric
+/meson_options.txt @dbaker @eric
+/docs/meson.rst @dbaker @eric
+
+# Compatibility headers
+/include/c99* @evelikov
+/include/c11* @eric
+
+# Documentation
+/docs/ @eric @evelikov
+
+
+##########
+# COMMON #
+##########
+
+# NIR
+/src/compiler/nir/ @jekstrand
+
+# Vulkan
+/src/vulkan/ @eric @jekstrand
+/include/vulkan/ @eric @jekstrand
+
+
+#############
+# PLATFORMS #
+#############
+
+# EGL
+/src/egl/ @eric @evelikov
+/include/EGL/ @eric @evelikov
+
+# EGL - Android support
+/src/egl/drivers/dri2/platform_android.c @robh @tfiga
+
+# EGL - Device support
+/src/egl/drivers/dri2/platform_device.c @evelikov
+
+# EGL - Wayland support
+/src/egl/wayland/ @daniels @eric
+/src/egl/drivers/dri2/platform_wayland.c @daniels @eric
+
+# Gallium targets
+/src/gallium/targets/ @evelikov
+
+# GLX
+/src/glx/ @ajax
+/include/GL/glx* @ajax
+
+# GLVND
+/src/egl/main/eglglvnd.c @kbrenneman
+/src/egl/main/egldispatchstubs.* @kbrenneman
+/src/egl/generate/ @kbrenneman
+/src/glx/*glvnd* @kbrenneman
+
+# Haiku
+/include/HaikuGL/ @kallisti5
+/src/egl/drivers/haiku/ @kallisti5
+/src/gallium/frontends/hgl/ @kallisti5
+/src/gallium/targets/haiku-softpipe/ @kallisti5
+/src/gallium/winsys/sw/hgl/ @kallisti5
+/src/hgl/ @kallisti5
+
+# Loader - DRI/classic
+/src/loader/ @evelikov
+
+# Loader - Gallium
+/src/gallium/auxiliary/pipe-loader/ @evelikov
+/src/gallium/auxiliary/target-helpers/ @evelikov
+
+# Vulkan WSI - Display
+/src/vulkan/wsi/wsi_common_display.* @keithp
+/src/*/vulkan/*_wsi_display.c @keithp
+
+
+###########
+# Drivers #
+###########
+
+# Freedreno
+/src/gallium/drivers/freedreno/ @robclark
+
+# VMware
+/src/gallium/drivers/svga/ @brianp @charmainel
+/src/gallium/winsys/svga/ @thomash @drawat
+++ /dev/null
-Overview:
-
- This file is similar in syntax (or more precisly a subset) of what is
- used by the MAINTAINERS file in the linux kernel.
- The purpose is not exactly the same the MAINTAINERS file in the linux
- kernel, as there are not official/formal maintainers of different
- subsystems in mesa, but is meant to give an idea of who to CC for
- various patches for review.
-
-Descriptions of section entries:
-
- R: Designated reviewer: FullName <address@domain>
- These reviewers should be CCed on patches.
- F: Files and directories with wildcard patterns.
- A trailing slash includes all files and subdirectory files.
- F: drivers/net/ all files in and below drivers/net
- F: drivers/net/* all files in drivers/net, but not below
- F: */net/* all files in "any top level directory"/net
- One pattern per line. Multiple F: lines acceptable.
-
-Maintainers List (try to look for most precise areas first)
-
-Note: this is an opt-in system, I have not tried to add anyone who hasn't
-either asked me or sent a patch to add themselves.
-
- -----------------------------------
-
-NIR
-R: Jason Ekstrand <jason@jlekstrand.net>
-F: src/compiler/nir/
-
-DOCUMENTATION
-R: Emil Velikov <emil.l.velikov@gmail.com>
-R: Eric Engestrom <eric@engestrom.ch>
-F: docs/
-
-COMPATIBILITY HEADERS
-R: Emil Velikov <emil.l.velikov@gmail.com>
-F: include/c99*
-
-DRI LOADER
-R: Emil Velikov <emil.l.velikov@gmail.com>
-F: src/loader/
-
-EGL
-R: Eric Engestrom <eric@engestrom.ch>
-R: Emil Velikov <emil.l.velikov@gmail.com>
-F: src/egl/
-F: include/EGL/
-
-HAIKU
-R: Alexander von Gluck IV <kallisti5@unixzen.com>
-F: include/HaikuGL/
-F: src/egl/drivers/haiku/
-F: src/gallium/frontends/hgl/
-F: src/gallium/targets/haiku-softpipe/
-F: src/gallium/winsys/sw/hgl/
-F: src/hgl/
-
-GALLIUM LOADER
-R: Emil Velikov <emil.l.velikov@gmail.com>
-F: src/gallium/auxiliary/pipe-loader/
-F: src/gallium/auxiliary/target-helpers/
-
-GALLIUM TARGETS
-R: Emil Velikov <emil.l.velikov@gmail.com>
-F: src/gallium/targets/
-
-ANDROID BUILD
-R: Emil Velikov <emil.l.velikov@gmail.com>
-R: Rob Herring <robh@kernel.org>
-F: CleanSpec.mk
-F: */Android.*mk
-F: */Makefile.sources
-
-MESON BUILD
-R: Dylan Baker <dylan@pnwbakers.com>
-R: Eric Engestrom <eric@engestrom.ch>
-F: */meson.build
-F: meson.build
-F: meson_options.txt
-
-ANDROID EGL SUPPORT
-R: Rob Herring <robh@kernel.org>
-R: Tomasz Figa <tfiga@chromium.org>
-F: src/egl/drivers/dri2/platform_android.c
-
-WAYLAND EGL SUPPORT
-R: Daniel Stone <daniels@collabora.com>
-F: src/egl/wayland/*
-F: src/egl/drivers/dri2/platform_wayland.c
-
-FREEDRENO
-R: Rob Clark <robclark@freedesktop.org>
-F: src/gallium/drivers/freedreno/
-
-GLX
-R: Adam Jackson <ajax@redhat.com>
-F: src/glx/
-
-VULKAN
-R: Eric Engestrom <eric@engestrom.ch>
-F: src/vulkan/
-F: include/vulkan/
-
-VMWARE DRIVER
-R: Brian Paul <brianp@vmware.com>
-R: Charmaine Lee <charmainel@vmware.com>
-F: src/gallium/drivers/svga/
-
-VMWARE WINSYS CODE
-R: Thomas Hellstrom <thellstrom@vmware.com>
-R: Deepak Rawat <drawat@vmware.com>
-F: src/gallium/winsys/svga/