PENDING: enable hamoa&purwa camss

[Wenmeng Liu (wenmliu)]

No description provided.

[qlijarvis]

🔨 Build Failure Analysis — PR #1690

PR: #1690
Build run: https://github.com/qualcomm-linux/kernel-config/actions/runs/31765525898

#	Error	File:Line	PR-introduced?	Root Cause
1	Merge conflict during automerge	arch/arm64/boot/dts/qcom/hamoa-iot-evk.dts	Yes	PR reverts and re-adds camera DT nodes that conflict with topic/tech/all/dt/hamoa branch
2	Merge conflict during automerge	arch/arm64/boot/dts/qcom/purwa-iot-evk.dts	Yes	PR reverts and re-adds camss node that conflicts with topic/tech/all/dt/hamoa branch

Verdict

This is not a compilation failure. The build failed during the automerge integration step when attempting to merge topic branch topic/tech/all/dt/hamoa. Both merge conflicts are directly caused by this PR's changes to revert FROMLIST patches and re-add them as PENDING patches in the same device tree files.

📎 Detailed analysis: Full report

[qlijarvis]

🔨 Build Failure Analysis — PR #1690

PR: #1690
Build run: https://github.com/qualcomm-linux/kernel-config/actions/runs/31765525898

#	Error	File:Line	PR-introduced?	Root Cause
1	Merge conflict during automerge	arch/arm64/boot/dts/qcom/hamoa-iot-evk.dts	Yes	PR reverts and re-applies camera-related changes that conflict with topic/tech/all/dt/hamoa branch
2	Merge conflict during automerge	arch/arm64/boot/dts/qcom/purwa-iot-evk.dts	Yes	PR reverts and re-applies camss node changes that conflict with topic/tech/all/dt/hamoa branch

Verdict

Both merge conflicts are introduced by this PR's revert-then-reapply workflow conflicting with the integration branch topic/tech/all/dt/hamoa. This is not a compilation error but an integration conflict.

📎 Detailed analysis: Full report

[qlijarvis]

PR #1690 — validate-patch

PR: #1690

Verdict	Issues	Detailed Report
❌	0	Full report

Final Summary

1. Lore link present: No — no lore.kernel.org links found in any of the 8 commits. Commits 1-4 are reverts (should have lore link to original posting being reverted, or explanation why not). Commits 5-8 have PENDING: prefix, so no lore link is expected or required for those.

2. Lore link matches PR commits: N/A — no lore links to compare against. However, the revert commits (1-4) reference specific commit SHAs that were originally FROMLIST commits, suggesting those original commits did have lore links that are now being discarded.

3. Upstream patch status: N/A — commits 5-8 are vendor-only PENDING changes, not posted upstream. Commits 1-4 are reverts of FROMLIST commits, meaning the original upstream postings are being withdrawn (status unknown without checking the original FROMLIST commit lore links).

4. PR present in qcom-next/topics: Fail - 3/8 commit(s) are missing from both qcom-next and topics

Verdict: ❌ — click to expand

🔍 Patch Validation

PR: #1690 - Revert FROMLIST camera patches and re-add as PENDING
Upstream commit: N/A (no lore links found)
Verdict: ❌ FAIL

Commit Message

Commit	Check	Status	Note
1/8 Revert "FROMLIST: hamoa-iot-som pm8010"	Prefix required	❌	Revert commit missing vendor prefix (should be PENDING: Revert or similar)
1/8	Revert justification	⚠️	No explanation why the FROMLIST commit is being reverted
2/8 Revert "FROMLIST: hamoa-iot-evk-camera-imx577"	Prefix required	❌	Revert commit missing vendor prefix
2/8	Revert justification	⚠️	No explanation why the FROMLIST commit is being reverted
3/8 Revert "FROMLIST: purwa camss"	Prefix required	❌	Revert commit missing vendor prefix
3/8	Revert justification	⚠️	No explanation why the FROMLIST commit is being reverted
4/8 Revert "FROMLIST: purwa-iot-evk camss"	Prefix required	❌	Revert commit missing vendor prefix
4/8	Revert justification	⚠️	No explanation why the FROMLIST commit is being reverted
5/8 PENDING: hamoa-iot-som pm8010	Subject	✅	PENDING prefix correct for vendor-only work
5/8	Body	✅	Clear description of regulator purpose
5/8	Authorship	✅	Both authors have Signed-off-by
6/8 PENDING: hamoa-iot-evk-camera-imx577	Subject	✅	PENDING prefix correct
6/8	Body	✅	Clear description of camera enablement
7/8 PENDING: purwa camss	Subject	✅	PENDING prefix correct
7/8	Body	✅	Clear description
8/8 PENDING: purwa-iot-evk camss	Subject	✅	PENDING prefix correct
8/8	Body	✅	Clear description

Diff

File	Status	Notes
arch/arm64/boot/dts/qcom/hamoa-iot-som.dtsi	⚠️	Reverted in 1/8, re-added in 5/8 with same author - circular change pattern
arch/arm64/boot/dts/qcom/hamoa-iot-evk-camera-imx577.dtso	⚠️	Deleted in 2/8, re-added in 6/8 - circular change pattern
arch/arm64/boot/dts/qcom/purwa.dtsi	⚠️	Reverted in 3/8, re-added in 7/8 - circular change pattern
arch/arm64/boot/dts/qcom/purwa-iot-evk.dts	⚠️	Reverted in 4/8, re-added in 8/8 - circular change pattern

Issues

Critical Issues:

1. Revert commits lack vendor prefix — Commits 1-4 are revert commits but have no prefix (e.g., PENDING:, QCLINUX:). According to the tree's prefix conventions, revert commits should have a prefix before Revert.

2. No justification for reverts — The revert commits (1-4) only state "This reverts commit " without explaining why the FROMLIST commits are being reverted. Best practice for kernel reverts requires a clear explanation of the reason (e.g., "breaks boot on X", "causes regression Y", "needs rework for Z").

3. Circular change pattern — The PR reverts four FROMLIST commits (1-4) and then immediately re-adds nearly identical content as PENDING commits (5-8). This suggests the original FROMLIST commits were posted upstream but are now being withdrawn and re-labeled as vendor-only work. Without explanation, reviewers cannot understand:

   • Why were the upstream postings abandoned?
   • What changed between FROMLIST and PENDING versions?
   • Is this a temporary state or permanent vendor fork?

4. Integration presence failures — Per integration_presence_report.md:

   • Commits 1/8, 3/8, 4/8 are missing from both qcom-next and topics
   • Commits 2/8, 6/8 are partial (incomplete evidence)
   • Only commits 5/8, 7/8, 8/8 are present in qcom-next

   This means the revert commits (1-4) are attempting to revert changes that don't fully exist in the integration branches, which will cause merge conflicts or no-op reverts.

Authorship Issues:

5. Author mismatch on reverts — Commits 1-4 are authored by Wenmeng Liu, but they are reverting commits originally authored by Tingguo Cheng (commit 5/8 shows Tingguo as original author). When reverting someone else's work, the reverter becomes the author, which is correct here, but the lack of justification makes it unclear whether the original author was consulted.

Verdict

Do not merge. This PR has multiple critical issues:

1. Add vendor prefix to revert commits (1-4): PENDING: Revert "FROMLIST: ..." or appropriate prefix
2. Add justification to each revert commit explaining why the FROMLIST version is being withdrawn
3. Resolve integration presence failures — 3 commits are missing from qcom-next/topics, which will cause merge issues
4. Consider squashing the revert+re-add pairs into single commits that explain the FROMLIST→PENDING transition, or provide a cover letter explaining the overall strategy

The circular revert-then-re-add pattern without explanation suggests incomplete planning or miscommunication about upstream status.

Final Summary

1. Lore link present: No — no lore.kernel.org links found in any of the 8 commits. Commits 1-4 are reverts (should have lore link to original posting being reverted, or explanation why not). Commits 5-8 have PENDING: prefix, so no lore link is expected or required for those.

2. Lore link matches PR commits: N/A — no lore links to compare against. However, the revert commits (1-4) reference specific commit SHAs that were originally FROMLIST commits, suggesting those original commits did have lore links that are now being discarded.

3. Upstream patch status: N/A — commits 5-8 are vendor-only PENDING changes, not posted upstream. Commits 1-4 are reverts of FROMLIST commits, meaning the original upstream postings are being withdrawn (status unknown without checking the original FROMLIST commit lore links).

4. PR present in qcom-next/topics: Fail — per integration_presence_report.md: 3/8 commits are missing from both qcom-next and topics (commits 1, 3, 4); 2/8 are partial (commits 2, 6); only 3/8 are present (commits 5, 7, 8). The revert commits are attempting to revert changes that don't exist in the integration branches, which will cause merge conflicts or silent failures.

Deterministic Integration Presence

Integration Presence Report

This report is generated by Jarvis before validate-patch runs.
It is the authoritative source for whether PR changes are already present
in qcom-next or in the kernel topic branches.

Kernel repo: /local/mnt/workspace/sgaud/Qgenie/image_pipeline/kernel
qcom-next ref: 49dbe0dae5cfb7a1eb3434cde6fc7ba37924fe94
topics remote: topics -> https://github.com/qualcomm-linux/kernel-topics
topics fetch: fetched

Commit	Subject	qcom-next	topics	Final
1/8	[PATCH 1/8] Revert "FROMLIST: arm64: dts: qcom: hamoa-iot-som: Add	missing - no subject, patch-id, or full tree-content match found	missing - no subject, patch-id, or full tree-content match found	missing
2/8	[PATCH 2/8] Revert "FROMLIST: arm64: dts: qcom:	missing - no subject, patch-id, or full tree-content match found	partial - subject or partial tree evidence found, but full change was not verified	partial
3/8	[PATCH 3/8] Revert "FROMLIST: arm64: dts: qcom: purwa: Add camss	missing - no subject, patch-id, or full tree-content match found	missing - no subject, patch-id, or full tree-content match found	missing
4/8	[PATCH 4/8] Revert "FROMLIST: arm64: dts: qcom: purwa-iot-evk: Add	missing - no subject, patch-id, or full tree-content match found	missing - no subject, patch-id, or full tree-content match found	missing
5/8	[PATCH 5/8] PENDING: arm64: dts: qcom: hamoa-iot-som: Add pm8010 L4M	present - exact patch-id match at 2608155	skipped - not checked because qcom-next already contains the change	present
6/8	[PATCH 6/8] PENDING: arm64: dts: qcom: hamoa-iot-evk-camera-imx577:	partial - subject or partial tree evidence found, but full change was not verified	partial - subject or partial tree evidence found, but full change was not verified	partial
7/8	[PATCH 7/8] PENDING: arm64: dts: qcom: purwa: Add camss node	present - all checked added lines are present	skipped - not checked because qcom-next already contains the change	present
8/8	[PATCH 8/8] PENDING: arm64: dts: qcom: purwa-iot-evk: Add camss node	present - exact patch-id match at 530d271	skipped - not checked because qcom-next already contains the change	present

Final Status

overall_status: FAIL
present_commits: 3/8
partial_commits: 2/8
missing_commits: 3/8
topics_checked_for_commits: 5/8
final_summary: PR present in qcom-next/topics: Fail - 3/8 commit(s) are missing from both qcom-next and topics

[qlijarvis]

PR #1690 — checker-log-analyzer

PR: #1690
Checker run: https://github.com/qualcomm-linux/kernel-config/actions/runs/31765525250

Checker	Result	Summary
Checker	Result	Summary
checkpatch	❌	Automerge conflict - did not run
dt-binding-check	❌	Automerge conflict - did not run
dtb-check	❌	Automerge conflict - did not run
sparse-check	❌	Automerge conflict - did not run
check-uapi-headers	❌	Automerge conflict - did not run
check-patch-compliance	❌	Automerge conflict - did not run
tag-check	⚠️	Subject prefix issues detected (see below)
qcom-next-check	N/A	Not applicable for topic branches

Detailed report: Full report

Checker analysis — click to expand

🤖 CI Checker Analysis (checker-log-analyzer)

PR: #1690 - Revert and re-apply hamoa/purwa camera DTS changes
Source: https://github.com/qualcomm-linux/kernel-config/actions/runs/31765525250
Target branch: tech/all/dt/hamoa (topic branch in kernel-topics)

Checker	Result	Summary
checkpatch	❌	Automerge conflict - did not run
dt-binding-check	❌	Automerge conflict - did not run
dtb-check	❌	Automerge conflict - did not run
sparse-check	❌	Automerge conflict - did not run
check-uapi-headers	❌	Automerge conflict - did not run
check-patch-compliance	❌	Automerge conflict - did not run
tag-check	⚠️	Subject prefix issues detected (see below)
qcom-next-check	N/A	Not applicable for topic branches

---

❌ Automerge Failure (All Checkers)

Root cause: Merge conflicts during automerge integration of topic branch tech/all/dt/hamoa with qcom-next baseline.

Failure details:

CONFLICT (content): Merge conflict in arch/arm64/boot/dts/qcom/hamoa-iot-evk.dts
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/qcom/purwa-iot-evk.dts
Automatic merge failed; fix conflicts and then commit the result.
automerge returned non-zero; check logs for conflicts

Analysis:

The CI workflow attempts to:

1. Checkout qcom-next baseline
2. Run automerge to integrate topic branch tech/all/dt/hamoa on top of qcom-next
3. Merge PR PENDING: enable hamoa&purwa camss #1690 commits on top of the integrated tree
4. Run checkers on the final result

The automerge step (step 2) failed with merge conflicts in two DTS files:

• arch/arm64/boot/dts/qcom/hamoa-iot-evk.dts
• arch/arm64/boot/dts/qcom/purwa-iot-evk.dts

This means the topic branch tech/all/dt/hamoa has diverged from qcom-next in these files, and the changes cannot be automatically merged.

Why this happened:

The PR contains 8 commits:

• Commits 1-4: Revert four FROMLIST patches
• Commits 5-8: Re-apply the same changes with PENDING prefix

This revert-and-reapply pattern suggests the upstream patches were modified or the topic branch has conflicting changes that prevent clean integration with qcom-next.

Fix:

The topic branch tech/all/dt/hamoa needs to be rebased on the latest qcom-next to resolve the conflicts before this PR can be tested by CI.

Steps to resolve:

# In the kernel-topics repository
git fetch origin qcom-next
git checkout tech/all/dt/hamoa
git rebase origin/qcom-next

# Resolve conflicts in:
#   - arch/arm64/boot/dts/qcom/hamoa-iot-evk.dts
#   - arch/arm64/boot/dts/qcom/purwa-iot-evk.dts

git add <resolved-files>
git rebase --continue

# Force push the rebased topic branch
git push origin tech/all/dt/hamoa --force-with-lease

After the topic branch is rebased, re-trigger the CI run for PR #1690.

Reproduce locally:

git clone https://github.com/qualcomm-linux/kernel.git
cd kernel
git fetch origin qcom-next
git checkout qcom-next
git reset --hard origin/qcom-next

# Clone automerge tool
cd ..
git clone https://github.com/qualcomm-linux/automerge.git

# Create merge.conf
cat > merge.conf <<EOF
baseline https://github.com/qualcomm-linux/kernel.git qcom-next
topic https://github.com/qualcomm-linux/kernel-topics.git tech/all/dt/hamoa
EOF

# Run automerge
cd kernel
../automerge/ci-merge -f ../merge.conf -t head -n

---

⚠️ tag-check — Subject Prefix Issues

Root cause: Commits 1-4 use Revert "FROMLIST: ..." without a prefix before Revert.

Analysis:

The target branch is tech/all/dt/hamoa, which is a topic branch (not qcom-next or qcom-next-staging). According to the tag-check rules, all commits targeting branches other than qcom-next or qcom-next-staging must start with a valid prefix.

Commits with missing prefix:

1. Commit b8baecb - Revert "FROMLIST: arm64: dts: qcom: hamoa-iot-som: Add pm8010 L4M regulator"
2. Commit 2b206e5 - Revert "FROMLIST: arm64: dts: qcom: hamoa-iot-evk-camera-imx577: Add DT overlay"
3. Commit 3057dfb - Revert "FROMLIST: arm64: dts: qcom: purwa: Add camss node"
4. Commit bda3e0b - Revert "FROMLIST: arm64: dts: qcom: purwa-iot-evk: Add camss node"

All four revert commits lack a prefix before the word Revert.

Valid prefixes: FROMLIST:, FROMGIT:, UPSTREAM:, BACKPORT:, QCLINUX:, PENDING:, WORKAROUND:

Fix:

Add a prefix before Revert in each commit subject. Since these are reverting FROMLIST patches that were likely posted upstream but are being reverted for rework, the appropriate prefix is PENDING: or WORKAROUND: (depending on intent).

Example fix for commit 1:

git rebase -i <base_sha>   # mark commit b8baecb8 as 'edit'
git commit --amend -m 'PENDING: Revert "FROMLIST: arm64: dts: qcom: hamoa-iot-som: Add pm8010 L4M regulator"'
git rebase --continue

Repeat for commits 2-4.

Alternative: If these reverts are temporary workarounds:

WORKAROUND: Revert "FROMLIST: arm64: dts: qcom: hamoa-iot-som: Add pm8010 L4M regulator"

Note on commits 5-8:

Commits 5-8 correctly use the PENDING: prefix. However, be aware that PENDING: is not accepted by the check-patch-compliance checker (which enforces only FROMLIST:, FROMGIT:, UPSTREAM:, BACKPORT:). This is a known limitation for vendor-only or work-in-progress commits.

---

Verdict

Cannot merge — Two blockers must be resolved:

1. Critical: Topic branch tech/all/dt/hamoa has merge conflicts with qcom-next baseline. The topic branch must be rebased before CI can run.

2. Required: Four revert commits (1-4) are missing subject-line prefixes. Add PENDING: or WORKAROUND: before Revert in each commit subject.

Recommended action:

1. Rebase the topic branch tech/all/dt/hamoa on qcom-next to resolve automerge conflicts
2. Amend commits 1-4 to add PENDING: prefix before Revert
3. Re-trigger CI after both fixes are applied

Note: Even after fixing the prefix issue, commits 5-8 (with PENDING: prefix) will fail check-patch-compliance because that checker only accepts upstream-linkable prefixes (FROMLIST:, FROMGIT:, UPSTREAM:, BACKPORT:). This is expected for work-in-progress commits and can be acknowledged as a known limitation.