Branches and History

Premise: The cf-linux-rolling-stable branch keeps track of the linux-rolling-stable branch.

o
| <- zeta (commit)
| <- linux-rolling-stable, cf-linux-rolling-stable
|
=

Definitions:

• Zeta: Auxiliary commits for devel/testing (do not touch the kernel code).
• hacl: These are the commits that include new cryptographic code from hacl.

o
| <- hacl-hash (commits)
| <- cf-zeta (commits)
| <- linux-rolling-stable, cf-linux-rolling-stable,
|
=

Naturally, the linux-rolling-stable branch moves due to the upstream activity.

o
| <- linux-rolling-stable
|
|   o
|   | <- hacl-hash (commits)
|   | <- cf-zeta (commit)
|---/ <- cf-linux-rolling-stable,
|
=

Rebase. To catch up with upstream, commits must be rebased. It is expected that this is an easy rebase (merge strategy), because the contributed files will barely touch the kernel code. Thus, we aim for a linear history.

                            o
                            | <- hacl-hash (commits)
o                           | <- cf-zeta (commit)
| <- linux-rolling-stable---/ <- cf-linux-rolling-stable,
|
|
=