Skip to content

Commit fcc3de2

Browse files
committed
Branches: divide branches into categories
In preparation for adding topic branches such as `rust-pci`. Signed-off-by: Miguel Ojeda <[email protected]>
1 parent 9848899 commit fcc3de2

File tree

1 file changed

+11
-5
lines changed

1 file changed

+11
-5
lines changed

src/Branches.md

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,26 @@
11
# Branches
22

3-
Currently we maintain the following branches.
3+
## Main branches
44

5-
## `rust-next`
5+
Currently we maintain the following main branches.
6+
7+
### `rust-next`
68

79
[`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.
810

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

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

13-
## `rust-fixes`
15+
### `rust-fixes`
1416

1517
[`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.
1618

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

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

21-
## `rust-dev`
23+
### `rust-dev`
2224

2325
[`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".
2426

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

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

33-
## `rust`
35+
## Past branches
36+
37+
These branches are unmaintained, archived, deprecated, frozen or do not exist anymore in the repository.
38+
39+
### `rust`
3440

3541
[`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.
3642

0 commit comments

Comments
 (0)