Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions docs/ci.rst
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,24 @@ In these sections there are instructions to bring-up your own continuous integra
either to run locally, in a self-hosted runner or even in a cluster.

Beyond the linear history ``main`` branch, the following upstream mirrors are
provided (``mirror/<remote-name>/<branch>``):
provided (``mirror_ci/<remote-name>/<branch>``):

* | ``mirror/next/linux-next/master``: Patches aimed at the next kernel merge window
* | ``mirror_ci/next/linux-next/master``: Patches aimed at the next kernel merge window
| https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/log/?h=master
* | ``mirror/jic23/iio/testing``: Linux IIO Subsystem (Cameron's branch)
* | ``mirror_ci/jic23/iio/testing``: Linux IIO Subsystem (Cameron's branch)
| https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git/log/?h=testing
* | ``mirror_ci/lee/mfd/for-mfd-next``: MFD Subsystem Tree - Next and Fixes
| https://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git/log/?h=for-mfd-next
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just curious. Why mfd? Not something we really have much work on. For example, I'm fairly sure we're more active in hwmon...

But not that I have any objection :)

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we can track both. someone requested mfd, but I cannot remember who


When upstreaming a driver, target the pull-request against the mirror.

.. attention::

Do **not** base your work on the head of the ``mirror_ci/*``, it is
frequently force pushed either by upstream (they are testing branches after
all). Instead, find a common stable base, for example the previous tag such
as `v6.19-rc1 <https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?h=v6.19-rc1&id=8f0b4cce4481fb22653697cced8d0d04027cb1e8>`__

All of them are mirrors from the links shown with a single commit on top
that includes the CI workflows, :git-linux:`as simple as <ci:.github/workflows/mirror.yml>`:

Expand Down
10 changes: 10 additions & 0 deletions docs/contribute.rst
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,16 @@ conventions, and lifecycle, helping maintain modularity and clarity. For an
up-to-date map of these subsystems and their interfaces, see
:external+upstream:doc:`subsystem-apis`.

When developing for a particular subsystem, look for the appropriate git tree
in the :git-linux:`MAINTAINERS` file to work on. Development branches may be
force pushed. It is reasonable to base you work on top of the current latest
tag, such as `v6.19-rc1
<https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?h=v6.19-rc1&id=8f0b4cce4481fb22653697cced8d0d04027cb1e8>`__
or near it, this avoids unnecessary merge commits when pulling changes.

For some subsystems, CI/CD is automatically applied to developemnt branches as
described at :ref:`ci`.

IIO Subsytem
~~~~~~~~~~~~

Expand Down
Loading