`54820` fix(cpus): remove stray conflict marker in cortex_a77.h

TF-A/trusted-firmware-abranch lts-v2.8owner ldtsOpen in Gerrit Gerrit live

Data as of 29 Oct 2026, 09:00 UTCLast synced:LAVA 29 Oct 2026, 09:00 UTCJenkins 29 Oct 2026, 09:01 UTCS3 export 7 Oct 2026, 09:53 UTC

Run tf-a-lts2.8-gerrit-pipeline #60, 01 Oct 07:47

Gerrit54820/2 Gerrit live
Pipelinetf-a-lts2.8-gerrit-pipeline #60Pipeline live
Builders38 buildsnot captured
LAVA jobs38 jobslive38 still public on LAVA
Log38 logsliveone per board result

0 final failures
0 lab
0 recovered on retry
38 passed without recovery

38 evaluations passed on 3 boards

Board	Verdict	Attempts	Build and log	Detail
Asurada (MT8192)	Pass	01	tf-a-lts2.8-builder #214795 Jenkins not checked LAVA log LAVA public until 31 Oct	Attempt 1: Pass, job 3036309 on asurada-01 def:625750e3c8eff0dd/release
Juno	Pass	01	tf-a-lts2.8-builder #214640 Jenkins not checked LAVA log LAVA public until 31 Oct	Attempt 1: Pass, job 3036296 on laa-00147-juno-r0-01 def:28d50e1d23a2ba26/release
Juno	Pass	04	tf-a-lts2.8-builder #214641 Jenkins not checked LAVA log LAVA public until 31 Oct	Attempt 1: Pass, job 3036297 on laa-00090-juno-r0-04 def:28d50e1d23a2ba26/release
Juno	Pass	02	tf-a-lts2.8-builder #214643 Jenkins not checked LAVA log LAVA public until 31 Oct	Attempt 1: Pass, job 3036298 on laa-00102-juno-r0-02 def:28d50e1d23a2ba26/release
Juno	Pass	05	tf-a-lts2.8-builder #214654 Jenkins not checked LAVA log LAVA public until 31 Oct	Attempt 1: Pass, job 3036299 on laa-00134-juno-r0-05 def:053024c3660fd75a/release
Juno	Pass	02	tf-a-lts2.8-builder #214673 Jenkins not checked LAVA log LAVA public until 31 Oct	Attempt 1: Pass, job 3036300 on laa-00164-juno-r2-02 def:cc8bc605efed3b64/debug
Juno	Pass	03	tf-a-lts2.8-builder #214698 Jenkins not checked LAVA log LAVA public until 31 Oct	Attempt 1: Pass, job 3036301 on laa-00093-juno-r2-03 def:b9d1079669402e11/release
Juno	Pass	03	tf-a-lts2.8-builder #214715 Jenkins not checked LAVA log LAVA public until 31 Oct	Attempt 1: Pass, job 3036302 on laa-00131-juno-r0-03 def:28d50e1d23a2ba26/release
Juno	Pass	01	tf-a-lts2.8-builder #214739 Jenkins not checked LAVA log LAVA public until 31 Oct	Attempt 1: Pass, job 3036303 on laa-00141-juno-r2-01 def:b9d1079669402e11/release
Juno	Pass	02	tf-a-lts2.8-builder #214743 Jenkins not checked LAVA log LAVA public until 31 Oct	Attempt 1: Pass, job 3036305 on laa-00164-juno-r2-02 def:e370ef31f53a20ba/release
Juno	Pass	01	tf-a-lts2.8-builder #214745 Jenkins not checked LAVA log LAVA public until 31 Oct	Attempt 1: Pass, job 3036304 on laa-00149-juno-r1-01 def:b9d1079669402e11/release
Juno	Pass	04	tf-a-lts2.8-builder #214754 Jenkins not checked LAVA log LAVA public until 31 Oct	Attempt 1: Pass, job 3036306 on laa-00090-juno-r0-04 def:11138c014f53845b/release
Juno	Pass	02	tf-a-lts2.8-builder #214766 Jenkins not checked LAVA log LAVA public until 31 Oct	Attempt 1: Pass, job 3036307 on laa-00102-juno-r0-02 def:b9d1079669402e11/release
Juno	Pass	01	tf-a-lts2.8-builder #214776 Jenkins not checked LAVA log LAVA public until 31 Oct	Attempt 1: Pass, job 3036308 on laa-00147-juno-r0-01 def:b9d1079669402e11/release
Juno	Pass	05	tf-a-lts2.8-builder #214799 Jenkins not checked LAVA log LAVA public until 31 Oct	Attempt 1: Pass, job 3036310 on laa-00134-juno-r0-05 def:b9d1079669402e11/release
Juno	Pass	03	tf-a-lts2.8-builder #214806 Jenkins not checked LAVA log LAVA public until 31 Oct	Attempt 1: Pass, job 3036311 on laa-00131-juno-r0-03 def:b9d1079669402e11/release
Juno	Pass	01	tf-a-lts2.8-builder #214830 Jenkins not checked LAVA log LAVA public until 31 Oct	Attempt 1: Pass, job 3036313 on laa-00149-juno-r1-01 def:11138c014f53845b/release
Juno	Pass	03	tf-a-lts2.8-builder #214831 Jenkins not checked LAVA log LAVA public until 31 Oct	Attempt 1: Pass, job 3036312 on laa-00093-juno-r2-03 def:28d50e1d23a2ba26/release
Juno	Pass	01	tf-a-lts2.8-builder #214838 Jenkins not checked LAVA log LAVA public until 31 Oct	Attempt 1: Pass, job 3036314 on laa-00141-juno-r2-01 def:343271dbe3723517/release
Juno	Pass	04	tf-a-lts2.8-builder #214840 Jenkins not checked LAVA log LAVA public until 31 Oct	Attempt 1: Pass, job 3036315 on laa-00090-juno-r0-04 def:28d50e1d23a2ba26/release
Juno	Pass	02	tf-a-lts2.8-builder #214857 Jenkins not checked LAVA log LAVA public until 31 Oct	Attempt 1: Pass, job 3036316 on laa-00164-juno-r2-02 def:b9d1079669402e11/release
Juno	Pass	02	tf-a-lts2.8-builder #214888 Jenkins not checked LAVA log LAVA public until 31 Oct	Attempt 1: Pass, job 3036317 on laa-00102-juno-r0-02 def:b9d1079669402e11/release
Juno	Pass	01	tf-a-lts2.8-builder #214923 Jenkins not checked LAVA log LAVA public until 31 Oct	Attempt 1: Pass, job 3036318 on laa-00147-juno-r0-01 def:b9d1079669402e11/release
Juno	Pass	05	tf-a-lts2.8-builder #214934 Jenkins not checked LAVA log LAVA public until 31 Oct	Attempt 1: Pass, job 3036319 on laa-00134-juno-r0-05 def:b9d1079669402e11/release
Juno	Pass	03	tf-a-lts2.8-builder #214959 Jenkins not checked LAVA log LAVA public until 31 Oct	Attempt 1: Pass, job 3036320 on laa-00093-juno-r2-03 def:b9d1079669402e11/release
Juno	Pass	04	tf-a-lts2.8-builder #215005 Jenkins not checked LAVA log LAVA public until 31 Oct	Attempt 1: Pass, job 3036322 on laa-00090-juno-r0-04 def:b9d1079669402e11/release
Juno	Pass	01	tf-a-lts2.8-builder #215006 Jenkins not checked LAVA log LAVA public until 31 Oct	Attempt 1: Pass, job 3036323 on laa-00141-juno-r2-01 def:b9d1079669402e11/release
Juno	Pass	03	tf-a-lts2.8-builder #215007 Jenkins not checked LAVA log LAVA public until 31 Oct	Attempt 1: Pass, job 3036324 on laa-00131-juno-r0-03 def:b9d1079669402e11/release
Juno	Pass	02	tf-a-lts2.8-builder #215008 Jenkins not checked LAVA log LAVA public until 31 Oct	Attempt 1: Pass, job 3036325 on laa-00102-juno-r0-02 def:b9d1079669402e11/release
Juno	Pass	01	tf-a-lts2.8-builder #215036 Jenkins not checked LAVA log LAVA public until 31 Oct	Attempt 1: Pass, job 3036326 on laa-00147-juno-r0-01 def:053024c3660fd75a/release
Juno	Pass	03	tf-a-lts2.8-builder #215040 Jenkins not checked LAVA log LAVA public until 31 Oct	Attempt 1: Pass, job 3036327 on laa-00093-juno-r2-03 def:b9d1079669402e11/release
Juno	Pass	02	tf-a-lts2.8-builder #215049 Jenkins not checked LAVA log LAVA public until 31 Oct	Attempt 1: Pass, job 3036328 on laa-00164-juno-r2-02 def:b9d1079669402e11/release
Juno	Pass	05	tf-a-lts2.8-builder #215065 Jenkins not checked LAVA log LAVA public until 31 Oct	Attempt 1: Pass, job 3036329 on laa-00134-juno-r0-05 def:28d50e1d23a2ba26/release
Juno	Pass	01	tf-a-lts2.8-builder #215073 Jenkins not checked LAVA log LAVA public until 31 Oct	Attempt 1: Pass, job 3036330 on laa-00149-juno-r1-01 def:28d50e1d23a2ba26/release
Juno	Pass	01	tf-a-lts2.8-builder #215078 Jenkins not checked LAVA log LAVA public until 31 Oct	Attempt 1: Pass, job 3036331 on laa-00141-juno-r2-01 def:343271dbe3723517/release
Juno	Pass	03	tf-a-lts2.8-builder #215098 Jenkins not checked LAVA log LAVA public until 31 Oct	Attempt 1: Pass, job 3036332 on laa-00093-juno-r2-03 def:60b805fe56391fe4/debug
Juno	Pass	03	tf-a-lts2.8-builder #215099 Jenkins not checked LAVA log LAVA public until 31 Oct	Attempt 1: Pass, job 3036333 on laa-00131-juno-r0-03 def:2046da1d3e2970a0/release
N1SDP	Pass	01	tf-a-lts2.8-builder #214973 Jenkins not checked LAVA log LAVA public until 31 Oct	Attempt 1: Pass, job 3036321 on n1sdp-01 def:45ae56123bfaf056/debug

Outcomes are the final attempt of each evaluation. "Changes with a failed boot on this board" counts only +2 runs whose boot failed after retries; the Gerrit vote itself is not collected.

54820 fix(cpus): remove stray conflict marker in cortex_a77.h

Run tf-a-lts2.8-gerrit-pipeline #60, 01 Oct 07:47

38 evaluations passed on 3 boards

`54820` fix(cpus): remove stray conflict marker in cortex_a77.h