diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-06 20:52:49 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-06 20:52:49 +0000 |
| commit | 1d4a3be615bde2ff311fece1ab3225cb0a0cb65d (patch) | |
| tree | 76d9e0cabe45c1ed6d9ea87a5deb9c75c4345653 /docs/process/faq.rst | |
| parent | 3397754200ec130e8c0ca9e25d47dd2db6350493 (diff) | |
| parent | 780068d4eec8e880d55d58eb348bee2d71580e83 (diff) | |
| download | platform_external_arm-trusted-firmware-1d4a3be615bde2ff311fece1ab3225cb0a0cb65d.tar.gz platform_external_arm-trusted-firmware-1d4a3be615bde2ff311fece1ab3225cb0a0cb65d.tar.bz2 platform_external_arm-trusted-firmware-1d4a3be615bde2ff311fece1ab3225cb0a0cb65d.zip | |
Merge '5f62213e684dbea03b5a2bb732405a03ccc1a815' into master am: 5dfd96a0b3 am: 780068d4ee
Change-Id: Ib5aa59c512fa91a23f84e24cc87b301d27e0e4e8
Diffstat (limited to 'docs/process/faq.rst')
| -rw-r--r-- | docs/process/faq.rst | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/docs/process/faq.rst b/docs/process/faq.rst index 6aa04f0a8..2c3658480 100644 --- a/docs/process/faq.rst +++ b/docs/process/faq.rst @@ -37,7 +37,7 @@ This can vary a lot, depending on: conflict between the topics. * If there is a code freeze in place in preparation for the release. Please - refer the `release information`_ for more details. + refer the :ref:`Release Processes` document for more details. * The workload of the TF maintainers. @@ -55,9 +55,9 @@ receiving patches that will not be merged into the release. In this case, the patches will be merged onto ``integration``, which will temporarily diverge from the release branch. The ``integration`` branch will be rebased onto ``master`` after the release, and then ``master`` will be fast-forwarded to ``integration`` -1-2 days later. This whole process could take up 4 weeks. Please refer the -`release information`_ for code freeze dates. The TF maintainers will inform the -patch owner if this is going to happen. +1-2 days later. This whole process could take up 4 weeks. Please refer to the +:ref:`Release Processes` document for code freeze dates. The TF maintainers +will inform the patch owner if this is going to happen. It is OK to create a patch based on commits that are only available in ``integration`` or another patch set, rather than ``master``. There is a risk @@ -73,7 +73,10 @@ but would be after the CI has been transitioned to `trustedfirmware.org`_. Please refer to https://github.com/ARM-software/tf-issues/issues/681 for more details on the timelines. -.. _release information: release-information.rst +-------------- + +*Copyright (c) 2019, Arm Limited. All rights reserved.* + .. _Gerrit Upload Patch Set documentation: https://review.trustedfirmware.org/Documentation/intro-user.html#upload-patch-set .. _Gerrit Replace Changes documentation: https://review.trustedfirmware.org/Documentation/user-upload.html#push_replace .. _trustedfirmware.org: https://www.trustedfirmware.org/ |