|
Joerg Roedel |
ff3ff4 |
Blacklisting Upstream Commit-IDs
|
|
Joerg Roedel |
ff3ff4 |
================================
|
|
Joerg Roedel |
ff3ff4 |
|
|
Joerg Roedel |
ff3ff4 |
We track the git history of the upstream Linux kernel for fixes that we
|
|
Joerg Roedel |
ff3ff4 |
potentially need to backport to our kernel branches. The tooling creates
|
|
Joerg Roedel |
ff3ff4 |
a list of upstream commit-ids that are already part of our kernels and
|
|
Joerg Roedel |
ff3ff4 |
compares the 'Fixes:' tags in upstream commits with that list. If there
|
|
Joerg Roedel |
ff3ff4 |
is a match, we found a fix that might need to be backported.
|
|
Joerg Roedel |
ff3ff4 |
|
|
Joerg Roedel |
ff3ff4 |
If the commit is not needed in our kernels, it can be blacklisted, so
|
|
Joerg Roedel |
ff3ff4 |
that the tools do not report that commit again. There are two ways to
|
|
Joerg Roedel |
ff3ff4 |
blacklist a commit:
|
|
Joerg Roedel |
ff3ff4 |
|
|
Joerg Roedel |
ff3ff4 |
1) Put the commit-id into blacklist.conf. This file exists to
|
|
Joerg Roedel |
ff3ff4 |
blacklist fixes for the base kernel version of the branch.
|
|
Joerg Roedel |
ff3ff4 |
|
|
Joerg Roedel |
ff3ff4 |
2) Use the 'No-Fix:' tag in the patch-files. The format of that
|
|
Joerg Roedel |
ff3ff4 |
tag is the same as for the 'Git-commit:' tag. Only one commit
|
|
Joerg Roedel |
ff3ff4 |
can be blacklisted per tag, you have to use 'No-Fix:' once
|
|
Joerg Roedel |
ff3ff4 |
for each commit to be blacklisted. This option can be used to
|
|
Joerg Roedel |
ff3ff4 |
blacklist fixes for an already backported upstream patch.
|
|
Joerg Roedel |
ff3ff4 |
|
|
Joerg Roedel |
ff3ff4 |
Both options require a full 40-character git commit-id.
|
|
Joerg Roedel |
ff3ff4 |
|
|
Joerg Roedel |
57a57d |
The blacklist.conf file also supports blacklisting by source code path.
|
|
Joerg Roedel |
57a57d |
A list of paths can be put into that file and patches that only touch
|
|
Joerg Roedel |
57a57d |
these paths are automatically blacklisted too.
|
|
Joerg Roedel |
57a57d |
|
|
Joerg Roedel |
ff3ff4 |
Feel free to send any questions and/or suggestions about fixes-tracking
|
|
Joerg Roedel |
ff3ff4 |
and blacklisting to:
|
|
Joerg Roedel |
ff3ff4 |
|
|
Joerg Roedel |
ff3ff4 |
|
|
Joerg Roedel |
ff3ff4 |
Joerg Roedel <jroedel@suse.de>
|
|
Joerg Roedel |
ff3ff4 |
|