Hi,

I’d like to let you know that the following TF-M master branches have been frozen.

• trusted-firmware-m
• tf-m-tests
• tf-m-tools
• tf-m-extras

Please switch to main branches for development.

Please let us know if you meet any trouble with main or master branches.

Can you please help move your pending patches from master to main?

Please try the following manual approaches.

• Click “Move change” from the 3-dot button near the upper-right corner of your gerrit webpage. Fill in “main” as the destination branch.
• If “Move change” doesn’t show, please upload your patches to main branch and abandon the old one on master branch.

TF-M will continue to co-work with gerrit admins to find out alternatives to automatically move pending patches.

Sorry for any inconvenience.

Great thanks to Xinyu and Arthur for supporting this branch switch.

Best regards,

Hu Ziji

From: Anton Komlev via TF-M <tf-m@lists.trustedfirmware.org>
Date: Thursday, September 21, 2023 at 23:00
To: Anton Komlev <Anton.Komlev@arm.com>, Gyorgy Szing <Gyorgy.Szing@arm.com>, Andrej Butok <andrey.butok@nxp.com>, tf-m@lists.trustedfirmware.org <tf-m@lists.trustedfirmware.org>
Cc: nd <nd@arm.com>
Subject: [TF-M] Re: Rename TF-M branches master -> main

Hi,

If there are not more opinions on the topic I propose to follow Gyorgy’s idea and plan to freeze the master branch on Monday, Sep 25 at 01:00 UTC and switch development to the main branch.

Please let me know if you need more time for preparation.

Thanks,

Anton

From: Anton Komlev via TF-M <tf-m@lists.trustedfirmware.org>
Sent: Thursday, September 14, 2023 11:37 AM
To: Gyorgy Szing <Gyorgy.Szing@arm.com>; Andrej Butok <andrey.butok@nxp.com>; tf-m@lists.trustedfirmware.org
Cc: nd <nd@arm.com>
Subject: [TF-M] Re: Rename TF-M branches master -> main

Thanks, Gyorgy.

Make sense to me. Good point in keeping the past releases operational.

From: Gyorgy Szing <Gyorgy.Szing@arm.com>
Sent: Thursday, September 14, 2023 9:31 AM
To: Anton Komlev <Anton.Komlev@arm.com>; Andrej Butok <andrey.butok@nxp.com>; tf-m@lists.trustedfirmware.org
Cc: nd <nd@arm.com>; nd <nd@arm.com>
Subject: RE: Rename TF-M branches master -> main

Hi,

Just my two cents.

I suggest a 4^th option: Leave master as is, and make it read only. Branch off main from it and start contributing to the new branch.
Reasoning:

• Eliminating master is likely to cause pain downstream. If you remove master, any old release which tries to check out a specific SHA from a specific branch (e.g. yocto machinery works like this), will be broken, and building them will become impossible without changes. Certificates bound to such a release may become invalid.
• Refreshing main may create ambiguity and will allow users not migrating to the new branch.
• If the “head” branch in gerrit is set to main, any client cloning without explicit branch specification will get main aniways.  Hence risk of using the obsolete branch is somewhat mitigated.

Thanks!

/George

From: Anton Komlev via TF-M <tf-m@lists.trustedfirmware.org>
Sent: Thursday, September 14, 2023 8:17 AM
To: Andrej Butok <andrey.butok@nxp.com>; tf-m@lists.trustedfirmware.org
Cc: nd <nd@arm.com>
Subject: [TF-M] Re: Rename TF-M branches master -> main

Thanks, Andrew,

Indeed, (1) is the simplest if we all can afford it.

From: Andrej Butok <andrey.butok@nxp.com>
Sent: Wednesday, September 13, 2023 4:48 PM
To: Anton Komlev <Anton.Komlev@arm.com>; tf-m@lists.trustedfirmware.org
Cc: nd <nd@arm.com>
Subject: RE: Rename TF-M branches master -> main

Voting for option (1),

to avoid deletion and confusion with syncing.

From: Anton Komlev via TF-M <tf-m@lists.trustedfirmware.org>
Sent: Wednesday, September 13, 2023 5:22 PM
To: tf-m@lists.trustedfirmware.org
Cc: nd <nd@arm.com>
Subject: [TF-M] Rename TF-M branches master -> main

Hello,

Some time ago we planned to rename our master branch to main in all 6 repositories. There are multiple ways of doing that and I want to discuss with the community the best way suitable for all.
I can see the following options:

1. rename master->main and use the main from one day.
2. Create the main for contribution with main->master sync. Make master R/O and delete it in 3 months.
3. Keep contributing to the master but syncing master->main.
4. Other way?

I suggest option 2 but looking for better alternatives if any.

Thanks,

Anton