Skip to content

Commit

Permalink
Branches: divide branches into categories
Browse files Browse the repository at this point in the history
In preparation for adding topic branches such as `rust-pci`.

Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
  • Loading branch information
ojeda committed Feb 3, 2024
1 parent 9848899 commit fcc3de2
Showing 1 changed file with 11 additions and 5 deletions.
16 changes: 11 additions & 5 deletions src/Branches.md
Original file line number Diff line number Diff line change
@@ -1,24 +1,26 @@
# Branches

Currently we maintain the following branches.
## Main branches

## `rust-next`
Currently we maintain the following main branches.

### `rust-next`

[`rust-next`](https://github.com/Rust-for-Linux/linux/tree/rust-next) is the branch that contains new Rust features to be submitted during the next merge window of the Linux kernel.

Changes to this branch land via patches sent to the mailing list.

It is part of [`linux-next`](https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/).

## `rust-fixes`
### `rust-fixes`

[`rust-fixes`](https://github.com/Rust-for-Linux/linux/tree/rust-fixes) is the branch that contains Rust fixes for the current cycle of the Linux kernel.

Changes to this branch land via patches sent to the mailing list.

It is part of [`linux-next`](https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/).

## `rust-dev`
### `rust-dev`

[`rust-dev`](https://github.com/Rust-for-Linux/linux/tree/rust-dev) is an experimental branch for integration purposes. It is a queue for patches that "look good enough".

Expand All @@ -30,7 +32,11 @@ Its intended use cases are:

Note that this branch may be updated/rebased frequently and it might be gone in the future.

## `rust`
## Past branches

These branches are unmaintained, archived, deprecated, frozen or do not exist anymore in the repository.

### `rust`

[`rust`](https://github.com/Rust-for-Linux/linux/tree/rust) was the original branch where development happened for two years before Rust support was merged into the kernel.

Expand Down

0 comments on commit fcc3de2

Please sign in to comment.