Thanks Joanna. Yes, this approach worked with Github.

If this is acceptable, I plan to create intermediate branches and merge all these pending commits in batches. Will wait for the guidance.

From: Joanna Farley Joanna.Farley@arm.com Sent: Thursday, August 22, 2019 1:02 AM To: Varun Wadekar vwadekar@nvidia.com; Soby Mathew Soby.Mathew@arm.com Cc: tf-a@lists.trustedfirmware.org Subject: Re: Merge Tegra platform changes

Hi Varun,

So you want to create a branch with all your new platform files and merge that in rather than individually create patches for each file given the large number of files? If we supported that with Github I’m sure we can work out how to more efficiently pull your changes in via the new Gerrit system. Let us look into it, please be aware that we are very short staffed for the next week or so given holidays, business travel and other distractions but we should be back to full strength week after next if nobody can assist before then.

Thanks

Joanna

From: Varun Wadekar <vwadekar@nvidia.commailto:vwadekar@nvidia.com> Date: Wednesday, 21 August 2019 at 23:21 To: Soby Mathew <Soby.Mathew@arm.commailto:Soby.Mathew@arm.com>, Joanna Farley <Joanna.Farley@arm.commailto:Joanna.Farley@arm.com> Cc: "tf-a@lists.trustedfirmware.orgmailto:tf-a@lists.trustedfirmware.org" <tf-a@lists.trustedfirmware.orgmailto:tf-a@lists.trustedfirmware.org> Subject: Merge Tegra platform changes

Hello Soby/Joanna,

We would like to upstream support for a new Tegra platform along with some other changes. The last time I checked, there were more than 400 changes waiting to be upstreamed.

Can someone help me with the best/fastest approach to start upstreaming? Previously, we would upstream changes in big chunks (as branches) but I don’t know if that approach still works.

Thanks. ________________________________ This email message is for the sole use of the intended recipient(s) and may contain confidential information. Any unauthorized review, use, disclosure or distribution is prohibited. If you are not the intended recipient, please contact the sender by reply email and destroy all copies of the original message. ________________________________ IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.

Thanks Soby.

...

I suggest you to push only a subset of the patches initially for review (say around 50)

Just so that I understand, you suggest pushing individual patches to gerrit for review, instead of pushing a branch and then reviewing the merge commit (?)

-----Original Message----- From: Soby Mathew Soby.Mathew@arm.com Sent: Thursday, September 5, 2019 5:40 AM To: Joanna Farley Joanna.Farley@arm.com; Varun Wadekar vwadekar@nvidia.com Cc: tf-a@lists.trustedfirmware.org Subject: Re: Merge Tegra platform changes

On 22/08/2019 09:02, Joanna Farley wrote:

Hi Varun,

So you want to create a branch with all your new platform files and merge that in rather than individually create patches for each file given the large number of files? If we supported that with Github I’m sure we can work out how to more efficiently pull your changes in via the new Gerrit system. Let us look into it, please be aware that we are very short staffed for the next week or so given holidays, business travel and other distractions but we should be back to full strength week after next if nobody can assist before then.

Thanks

Joanna

*From: *Varun Wadekar vwadekar@nvidia.com *Date: *Wednesday, 21 August 2019 at 23:21 *To: *Soby Mathew Soby.Mathew@arm.com, Joanna Farley Joanna.Farley@arm.com *Cc: *"tf-a@lists.trustedfirmware.org" tf-a@lists.trustedfirmware.org *Subject: *Merge Tegra platform changes

Hello Soby/Joanna,

We would like to upstream support for a new Tegra platform along with some other changes. The last time I checked, there were more than 400 changes waiting to be upstreamed.

Can someone help me with the best/fastest approach to start upstreaming? Previously, we would upstream changes in big chunks (as branches) but I don’t know if that approach still works.

Hi Varun, Similar to PRs on github, you can push your branch to gerrit and it will appear as such in gerrit review. Because gerrit allows to merge patches without merging the whole branch, it does not make much difference if the patches are on separate branches or not. But 400 patches is a lot and I suggest you to push only a subset of the patches initially for review (say around 50). Otherwise it will just clog up the gerrit dashboard making life difficult for reviewers.

Also, if there are changes to generic code i.e non-platform specific code, keep them as separate patches and, if possible, at the top of the patch stack. This will allow the merge of platform specific code without having to wait for rework of comments on generic code changes.

It will take sometime for all of the patches to be reviewed and you have to be prepared for the long haul.

Best Regards Soby Mathew

Thanks.

---

--

This email message is for the sole use of the intended recipient(s) and may contain confidential information. Any unauthorized review, use, disclosure or distribution is prohibited. If you are not the intended recipient, please contact the sender by reply email and destroy all copies of the original message.

---

--

IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.

Understood. Thanks.

-----Original Message----- From: Soby Mathew Soby.Mathew@arm.com Sent: Friday, September 6, 2019 1:56 AM To: Varun Wadekar vwadekar@nvidia.com; Joanna Farley Joanna.Farley@arm.com Cc: tf-a@lists.trustedfirmware.org Subject: Re: Merge Tegra platform changes

On 05/09/2019 17:08, Varun Wadekar wrote:

Thanks Soby.

...

...

I suggest you to push only a subset of the patches initially for review (say around 50)

Just so that I understand, you suggest pushing individual patches to gerrit for review, instead of pushing a branch and then reviewing the merge commit (?)

Hi Varun, Please push a topic branch to gerrit, but restrict the number of patches for review to < 50 on that branch. The branch should compile and all the new files added should be part of the build.

git push origin <branch-name>:refs/for/integration/<branch-name>

Once that branch is merged, you can sent the next batch of patches for review.

Best Regards Soby Mathew IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.

----------------------------------------------------------------------------------- This email message is for the sole use of the intended recipient(s) and may contain confidential information. Any unauthorized review, use, disclosure or distribution is prohibited. If you are not the intended recipient, please contact the sender by reply email and destroy all copies of the original message. -----------------------------------------------------------------------------------