diff --git a/commit-access.rst b/commit-access.rst
index 2a26274e5c085746d2c43cd1a9ec071aef4934a1..539a7906e52ab1b08d572af00bbb78cc07038db9 100644
--- a/commit-access.rst
+++ b/commit-access.rst
@@ -104,3 +104,54 @@ reinstated when they come back to the project.
 
 Maintainers and committers should encourage contributors to request commit
 rights.
+
+drm-xe
+---------
+
+Criteria
+~~~~~~~~
+
+Commit rights will be granted to anyone who requests them and fulfills the
+following criteria:
+
+- Has contributed at least 25 patches to the xe driver that have
+  already been merged upstream. Most of the patches must be
+  non-trivial, not just simple spelling or style fixes or code
+  movement.
+
+- Has reviewed at least 25 patches from other developers to the xe
+  driver that have already been merged upstream. Again, most of the
+  reviewed patches must be non-trivial.
+
+- Are actively participating in discussions about their work and areas of
+  expertise on the project communication channels (the intel-xe mailing list,
+  #xe freenode IRC channel, and gitlab.freedesktop.org/drm/xe/kernel
+  issue tracker).
+
+- Has been active in the past year (at least some commits or reviews
+  on the xe driver).
+
+- Will be regularly contributing further patches. This includes regular
+  contributors to other parts of the open source graphics stack who only do the
+  occasional patch within xe itself.
+
+- Agrees to use their commit rights in accordance with the documented merge
+  criteria, tools, processes, and :ref:`code-of-conduct`.
+
+- For the initial list of developers with commit rights, it was also given to
+  i915 developers who have been involved with the xe development regardless
+  of matching the criteria above.
+
+The above criteria are in place to encourage and require committers to
+be actively and broadly engaged upstream, and that they are acquainted
+and comfortable with the open collaboration model we have. To ensure
+the committers have enough experience to gauge reasonably well how
+much review a patch needs, and whether it needs acks from domain
+experts or maintainers before pushing.
+
+Access Request
+~~~~~~~~~~~~~~
+
+Make sure you meet the criteria, then please file an issue with the
+https://gitlab.freedesktop.org/drm/xe/kernel/-/issues, using the label
+"Commit access request"
diff --git a/dim b/dim
index 016ff34a8601fa925084bd0fe6b465c1f0bb8a93..1b293a73b032d320f77ebd1e663a3882d5f6190a 100755
--- a/dim
+++ b/dim
@@ -100,6 +100,9 @@ dim_pull_request_recipients=(
 	-c "Thomas Zimmermann <tzimmermann@suse.de>"
 	-c "Maarten Lankhorst <maarten.lankhorst@linux.intel.com>"
 	-c "Maxime Ripard <mripard@kernel.org>"
+	-c "Thomas Hellström <thomas.hellstrom@linux.intel.com>"
+	-c "Oded Gabbay <ogabbay@kernel.org>"
+	-c "Lucas De Marchi <lucas.demarchi@intel.com>"
 	-c "dri-devel@lists.freedesktop.org"
 	-c "intel-gfx@lists.freedesktop.org"
 	-c "dim-tools@lists.freedesktop.org"
diff --git a/drm-xe.rst b/drm-xe.rst
new file mode 100644
index 0000000000000000000000000000000000000000..d0b3c53c954b01720de841ac28436ae897a2a1b6
--- /dev/null
+++ b/drm-xe.rst
@@ -0,0 +1,60 @@
+.. _drm-xe:
+
+======
+drm-xe
+======
+
+-----------------------------------------------------------
+drm-xe patch and upstream merge flow and timeline explained
+-----------------------------------------------------------
+
+:Copyright: 2015-2023 Intel Corporation
+:Author: Jani Nikula <jani.nikula@intel.com>
+:Author: Thomas Hellström <thomas.hellstrom@linux.intel.com>
+
+Introduction
+============
+
+This document describes the flow and timeline of drm/xe patches to various
+upstream trees.
+
+Rule No. 1
+----------
+
+This document is an eternal draft and simply tries to explain the reality of how
+drm-xe is maintained. If you observe a difference between these rules and
+reality, it is your assumed responsibility to update the rules.
+
+The Relevant Repositories and Branches
+======================================
+
+See :ref:`repositories`.
+
+Patch and Merge Flow
+====================
+
+Features
+--------
+
+Features are picked up and pushed to drm-xe-next by committers and
+maintainers. See :ref:`committer-drm-intel` for details. (The
+drm-intel guidelines apply also for drm-xe).
+
+Fixes
+-----
+
+Fixes are picked up and pushed to drm-xe-next by committers and maintainers,
+just like any other patches. This is to ensure fixes are pushed in a timely
+manner. Fixes that are relevant for stable, current development kernels, or
+drm-xe-next, will be cherry-picked by maintainers to drm-xe-fixes or
+drm-xe-next-fixes.
+
+To make this work, patches should be labeled as fixes using the tags printed by
+"dim fixes <SHA1 of fixed commit>", and extra care should be put into making fixes
+the first patches in series, not depending on preparatory work or cleanup.
+
+Merge Timeline
+==============
+
+For predictions on the future merge windows and releases, see
+https://jnikula.github.io/linux-kernel-tea-leaves/
diff --git a/index.rst b/index.rst
index ecc721ac959b583c61d2147c735e79e203b6b30c..f221a4fc940f60bb5f45d9f70c1cb853a6b7fb64 100644
--- a/index.rst
+++ b/index.rst
@@ -2,15 +2,16 @@ DRM Maintainer Tools
 ====================
 
 This documentation covers the tools and workflows for maintaining and
-contributing to the Linux kernel DRM subsystem's drm-misc and drm-intel
-repositories. The intended audience is primarily the maintainers and committers
-of said repositories, but the workflow documentation may be useful for anyone
-interested in the kernel graphics subsystem development.
+contributing to the Linux kernel DRM subsystem's drm-misc, drm-intel
+and drm-xe repositories. The intended audience is primarily the
+maintainers and committers of said repositories, but the workflow
+documentation may be useful for anyone interested in the kernel
+graphics subsystem development.
 
-Both drm-misc and drm-intel are maintained using the same tools and very similar
-workflows. Both feed to the same testing and integration tree, the drm-tip. The
-documentation here is mostly shared, highlighting the differences in workflows
-where applicable.
+The drm-misc, drm-intel and drm-xe repos are maintained using the same
+tools and very similar workflows. All feed to the same testing and
+integration tree, the drm-tip. The documentation here is mostly
+shared, highlighting the differences in workflows where applicable.
 
 Please see :ref:`contributing` as well as the `project home page`_ for more
 information on how to collaborate on the documentation and tools.
@@ -28,6 +29,7 @@ Contents:
    drm
    drm-misc
    drm-intel
+   drm-xe
    committer-guidelines
    maintainer-guidelines
    commit-access
diff --git a/maintainer-drm-xe.rst b/maintainer-drm-xe.rst
new file mode 100644
index 0000000000000000000000000000000000000000..ccc6feb5054458478ce968fd87741e9e8eb52c45
--- /dev/null
+++ b/maintainer-drm-xe.rst
@@ -0,0 +1,10 @@
+.. _maintainer-drm-xe:
+
+============================
+drm-xe Maintainer Guidelines
+============================
+
+The drm-xe maintainer tasks are initially intended to closely follow the
+:ref:`drm-intel Maintaine Guidelines <maintainer-drm-intel>`. The
+tasks are identical except from operating on the drm-xe repository and
+the drm-xe branches.
diff --git a/maintainer-guidelines.rst b/maintainer-guidelines.rst
index a8391bb09859a7d4520301a5a214a45399faf87a..ffd865aebc742adc69292ca38bbc934f0af2f5ba 100644
--- a/maintainer-guidelines.rst
+++ b/maintainer-guidelines.rst
@@ -11,3 +11,4 @@ This document gathers together maintainer guidelines.
 
    maintainer-drm-misc
    maintainer-drm-intel
+   maintainer-drm-xe
diff --git a/repositories.rst b/repositories.rst
index ce0af63f45e3b50552325efe3954a5dace6250ff..a04f193b5f39d295be0a2ed8faf7b6acc36d34a5 100644
--- a/repositories.rst
+++ b/repositories.rst
@@ -154,6 +154,53 @@ This is the fastest path to getting fixes to Linus' tree. It is generally for
 the regressions, cc:stable, black screens, GPU hangs only, and should pretty
 much follow the stable rules.
 
+The Upstream xe Driver Repository
+-----------------------------------
+
+See  :ref:`drm-xe` and `the drm-xe repository`_ for repository
+details. Maintained by Oded Gabbay, Thomas Hellström and Lucas De Marchi, with a
+large pool of committers. Consists of ``drivers/gpu/drm/xe``,
+``include/drm/xe_*.h`` and ``include/uapi/drm/xe_drm.h``.
+
+.. _the drm-xe repository: https://gitlab.freedesktop.org/drm/xe/kernel
+
+drm-xe-next
+~~~~~~~~~~~
+
+This is the branch where all drm/xe patches, both new features and fixes,
+are applied.
+
+This branch "hides" the merge window from the drm/xe developers; patches are
+applied here regardless of the development phase of Linus' upstream kernel. Pull
+requests to drm-next are sent as needed between -rc1 of the current kernel and
+the drm feature deadline (-rc5/-rc6 of the current kernel).
+
+drm-xe-next-fixes
+~~~~~~~~~~~~~~~~~
+
+This branch contains drm/xe specific fixes to drm-next after the drm/xe
+features have been merged there. Fixes are first applied to drm-xe-next, and
+cherry-picked to drm-xe-next-fixes by maintainers. Valid from drm feature
+deadline (-rc5/-rc6 of the current kernel) to -rc1 of the next kernel.
+
+Pull requests to drm-next are sent as needed, with no particular schedule.
+
+drm-xe-fixes
+~~~~~~~~~~~~
+
+This branch contains fixes to Linus' tree after drm-next has been merged during
+the merge window. The fixes are then merged through drm-fixes.
+Valid from -rc1 to the kernel release.
+
+Usually Linus releases each -rc on a Sunday, and drm-xe-fixes gets rebased on
+that the following Monday. Usually this is a fast-forward. The pull request to
+drm-fixes for new fixes is typically sent on the following Thursday. This is
+repeated until final release of the kernel.
+
+This is the fastest path to getting fixes to Linus' tree. It is generally for
+the regressions, cc:stable, black screens, GPU hangs only, and should pretty
+much follow the stable rules.
+
 topic/core-for-CI
 ~~~~~~~~~~~~~~~~~