Re: v2.7.2-rc1 April 15 / v2.7.2 April 22


Christopher Friedt
 

Hi Venkatesh,

On Wed, Apr 13, 2022 at 2:09 PM Venkatesh Sukumaran
<venkatesh.sukumaran@...> wrote:
How do I make sure the following commits are picked up and merged to v2.7.2?
Great question!

Generally, we prefer to do this via PRs rather than commits.

1. Search for the commit ID in github
2. Find the PR associated with the commit
3. Check to see if the PR was categorized as a bug with medium or high priority
4. If not, it is not eligible to be backported at this time. If you
would like to discuss that, please do so in the appropriate channel on
Discord.
5. Check to see if it already has a "backport: v2.7-branch" label.
6. Look at the associated metadata to see if the automatic backport
was successful or if there was a manual backport. Please keep in mind,
the Release Team does disapprove backports from time to time if they
do not meet the criteria.

Until this week, automated backports were merged with a separate commit id.

However, they are being cherry-picked going forward. So in the future,
this will be possible with "git log --cherry" and a search for the
original commit id.

Using your first query below:

kernel: Reset the switch_handler only in the arch code
https://github.com/zephyrproject-rtos/zephyr/commit/47e4a4487f956a0419b852c6e1136c802f65205c
For the time being, to look at whether a specific commit has been
backported, I would generally do the following.

$ git log --oneline origin/v2.7-branch $(git merge-base main
v2.7-branch).. | grep "kernel: Reset the switch_handler only in the
arch code"
3cb83d1bbe kernel: Reset the switch_handler only in the arch code

So that particular commit is included in v2.7-branch.

Again, we will be switching to cherry-picked backports after this, so
you will be able to search by cherry-picked commit ids.

Thanks for asking!

C

Join devel@lists.zephyrproject.org to automatically receive all group messages.