Home

Branch and tag names

For each tagged upstream (linus, stable) release we have branch which includes our local commits:

Upsteam Tag	Our branch
v5.10.100	linux-5.10.100-mpi
v5.10.101	linux-5.10.101-mpi
e.t.c.	e.t.c.
v5.17-rc5	linux-5.17-rc5-mpi
v5.17-rc4	linux-5.17-rc4-mpi
v5.17-rc3	linux-5.17-rc3-mpi
v5.17-rc2	linux-5.17-rc2-mpi
v5.17-rc1	linux-5.17-rc1-mpi
v5.17	linux-5.17-mpi
v5.17.1	linux-5.17-1-mpi
v5.17.2	linux-5.17-rc4-mpi
e.t.c.	e.t.c.
v5.18-rc1	linux-5.18-rc1-mpi
v5.18-rc2	linux-5.18-rc2-mpi
v5.18-rc3	linux-5.18-rc3-mpi
e.t.c.	e.t.c.

These branches are created automatically whenever a new release is published upstream.

To build a kernel with bee, we first create a tag in this repository, e.g. mariux-5.10.110-433 for linux-5.10.110-433.bee.

Note: Tags of the form vVERSION-mpi.0 are obsoleted. The following tags have been used in bee files and should bee kept: v5.10.103-mpi.0, v5.10.107-mpi.0, v5.10.108-mpi.0, v5.10.109-mpi.0

Some useful commands

List our branches: git branch -a|grep -- -mpi
Show out commits: git log --oneline --no-merges --no-decorate mariux64/linux-VERSION-mpi ^vVERSION

Build a kernel

git checkput linux-VERSION-mpi
cp  config-mpi .config
make olddefconfig
make -j $(nrpoc)

Install and select it as a test kernel for the next reboot: sudo install.sh

Change the config

loop:

make menuconfig              # make your changes
make savedefconfig
diff config-mpi defconfig    # review your changes

when done:

cp defconfig config-mpi
git commit -v config-mpi

Create a new build tag for a bee file

git checkout linux-VERSION-mpi
git tag mariux-VERSION-BUILDNUMBER
git push mariux64 mariux-VERSION-BUILDNUMBER

Cherry-pick config changes from another mpi branch

git checkout linux-VERSION-mpi    # or whatever target branch.

# for each commit:
git cherry-pick XXXXXXX        # if this fails,, see below
cp config-mpi .config && make olddefconfig && make savedefconfig && diff config-mpi defconfig
cp defconfig config-mpi && git commit --amend config-mpi      # only if there are differences

If cherry-pick fails

git restore -s HEAD config-mpi && cp config-mpi .config && make olddefconfig
make menuconfig               # do it manually
make savedefconfig && cp defconfig config-mpi && git add config-mpi && git cherry-pick --continue

when done: git push mariux64 # or whatever your remote git@github.molgen.mpg.de:mariux64/linux.git is called

Fix "warning: inexact rename detection was skipped due to too many files."

git config merge.renamelimit 10000