FROMLIST: arm64: dts: qcom: monaco-evk: Extract common EVK hardware into independent board files

[Faruque Ansari (faruque-ansari)]

Rebasing to v5 of the monaco-ac EVK series, which drops the shared
monaco-evk-common.dtsi in favor of fully independent monaco-evk.dts
and monaco-ac-evk.dts board files. Fold the dtsi's shared hardware
description directly into each board file and delete the dtsi.

[qlijarvis]

🔨 Build Failure Analysis — PR #1852

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

#	Error	File:Line	PR-introduced?	Root Cause
1	Merge conflict during automerge	Documentation/devicetree/bindings/arm/qcom,coresight-ctcu.yaml	No	Pre-existing conflict between baseline qcom-next and PR branch tech/all/dt/qcs8300 in a file not touched by this PR

Verdict

This is NOT a build failure caused by the PR. The failure occurred during the automerge step when merging the PR branch with the baseline. The merge conflict is in a file (qcom,coresight-ctcu.yaml) that is not modified by this PR. The PR only modifies Monaco EVK device tree files.

📎 Detailed analysis: Full report

[qlijarvis]

🔨 Build Failure Analysis — PR #1852

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

#	Error	File:Line	PR-introduced?	Root Cause
1	Merge conflict during automerge	arch/arm64/boot/dts/qcom/Makefile	Yes	PR modifies Makefile; conflicts with topic branch topic/tech/all/dt/qcs8300
2	146 additional merge conflicts	Various DT bindings and source files	No	Pre-existing conflicts between baseline and topic branch, unrelated to PR changes

Verdict

The build failed during the automerge/integration phase, not during compilation. 1 of 147 merge conflicts involves a file modified by this PR (arch/arm64/boot/dts/qcom/Makefile). The remaining 146 conflicts are between the integration baseline and the topic branch topic/tech/all/dt/qcs8300, and are unrelated to this PR. No compilation errors were encountered because the build never reached the compilation stage.

📎 Detailed analysis: Full report

[qlijarvis]

PR #1852 — validate-patch

PR: #1852

Verdict	Issues	Detailed Report
❌	0	Full report

Final Summary

1. Lore link present:

   • Commit 1: Yes, but links to cover letter (0/2), not a patch — invalid for validation
   • Commit 2: Yes — https://lore.kernel.org/all/20260626111301.3479559-4-umang.chheda@oss.qualcomm.com/ (patch 3/3)

2. Lore link matches PR commits:

   • Commit 1: No — PR performs a refactoring (delete monaco-evk-common.dtsi, modify monaco-evk.dts and monaco-ac-evk.dts) that is not present in the upstream v5 series. The upstream patch 2/3 creates monaco-ac-evk.dts as a new file and does not touch the other files.
   • Commit 2: Yes — diff content matches lore patch 3/3 (Makefile reordering)

3. Upstream patch status:

   • Both patches: ⏳ Decision Pending — posted 2026-06-26; no maintainer merge or NAK signal found in the lore thread as of this analysis.

4. PR present in qcom-next/topics: Partial - 1/2 commit(s) only have partial integration evidence

   • Partial — Commit 1 has only partial integration evidence; Commit 2 is fully present in qcom-next.

Verdict: ❌ — click to expand

🔍 Patch Validation

PR: #1852 - "FROMLIST: arm64: dts: qcom: monaco-evk: Extract common EVK hardware into independent board files" + "FROMLIST: arm64: dts: qcom: monaco: Align IFP mezzanine hunk position with upstream v5"

Upstream commit:

• Commit 1/2: https://lore.kernel.org/all/20260626111301.3479559-1-umang.chheda@oss.qualcomm.com/ (cover letter)
• Commit 2/2: https://lore.kernel.org/all/20260626111301.3479559-4-umang.chheda@oss.qualcomm.com/ (patch 3/3)

Verdict: ❌ FAIL

Commit Message

Commit 1/2:

Check	Status	Note
Subject matches upstream	❌	PR subject describes "Extract common EVK hardware" but links to cover letter of a series that adds monaco-ac-evk.dts as a new file
Body preserves rationale	❌	PR body mentions "Rebasing to v5" and "drops the shared monaco-evk-common.dtsi" — but the upstream v5 series does NOT touch monaco-evk-common.dtsi at all
Fixes tag present/correct	N/A	No Fixes tag in either version
Authorship preserved	⚠️	PR From: is Faruque Ansari; lore patch 2/3 has Co-developed-by: Faruque Ansari + Signed-off-by: Umang Chheda (primary author). For FROMLIST, original author's SOB must be present — Umang Chheda's SOB is missing from PR commit
Backport note (if applicable)	N/A	FROMLIST prefix used correctly

Commit 2/2:

Check	Status	Note
Subject matches upstream	✅	Subject accurately describes the Makefile reordering
Body preserves rationale	✅	Body correctly explains moving the hunk position
Fixes tag present/correct	N/A	No Fixes tag needed
Authorship preserved	⚠️	PR From: is Faruque Ansari; lore patch 3/3 From: is Umang Chheda. Original author's SOB is missing from PR commit
Backport note (if applicable)	N/A	FROMLIST prefix used correctly

Diff

Commit 1/2:

File	Status	Notes
monaco-ac-evk.dts	❌	PR modifies existing file (+251 lines); lore patch 2/3 creates new file (+939 lines). Completely different operation.
monaco-evk-common.dtsi	❌	PR deletes this file (−904 lines); lore series does NOT touch this file at all.
monaco-evk.dts	❌	PR modifies this file (+1079 lines); lore series does NOT touch this file at all.

Commit 2/2:

File	Status	Notes
Makefile	✅	Hunk matches lore patch 3/3 — moves monaco-ac-evk-ifp-mezzanine above monaco-evk-el2

Issues

Commit 1/2 — Critical mismatch:

1. Wrong lore link: The PR links to the cover letter (20260626111301.3479559-1-umang.chheda@oss.qualcomm.com) instead of a specific patch. Cover letters (0/N) are not patches and cannot be validated.

2. Completely different change:

   • Lore patch 2/3 (the actual monaco-ac-evk patch in the series): Creates monaco-ac-evk.dts as a new file with 939 lines. Does not touch monaco-evk-common.dtsi or monaco-evk.dts.
   • PR commit 1: Modifies existing monaco-ac-evk.dts (+251), deletes monaco-evk-common.dtsi (−904), and modifies monaco-evk.dts (+1079).

   The PR is performing a refactoring (extracting common code from a shared .dtsi into independent board files) that is not present in the upstream v5 series at all.

3. Missing original author's Signed-off-by: For FROMLIST: commits, the original lore author (Umang Chheda) must appear in Signed-off-by: even if the submitter (Faruque Ansari) is in From:. The PR commit message does not include Umang Chheda's SOB.

4. Misleading commit message: The PR body states "Rebasing to v5 of the monaco-ac EVK series, which drops the shared monaco-evk-common.dtsi" — but the v5 series does NOT drop monaco-evk-common.dtsi. This appears to be a local refactoring being incorrectly attributed to the upstream series.

Commit 2/2 — Authorship issue:

5. Missing original author's Signed-off-by: Lore patch 3/3 author is Umang Chheda, but PR commit From: is Faruque Ansari. Umang Chheda's SOB is missing from the PR commit message.

Upstream Patch Status

Commit	Community Verdict
[PATCH v5 2/3] arm64: dts: qcom: monaco: Add monaco-ac EVK board	⏳ Decision Pending — posted 2026-06-26; Sashiko bot review present; no maintainer merge/NAK signal found in thread
[PATCH v5 3/3] arm64: dts: qcom: monaco-ac-evk: Add IFP mezzanine	⏳ Decision Pending — posted 2026-06-26; no maintainer merge/NAK signal found in thread

Dependency Check

• ❌ Commit 1 dependency mismatch: The PR commit 1 assumes monaco-ac-evk.dts already exists (it modifies it), but the upstream series creates it as a new file. The PR appears to be applying changes on top of a local tree that already has monaco-ac-evk.dts, which is inconsistent with the upstream series structure.
• ✅ Commit 2 dependency: Correctly assumes monaco-ac-evk.dts exists (which would be true after patch 2/3 is applied).

qcom-next Presence

From integration_presence_report.md:

Commit	Status
1/2	⚠️ Partial — subject or partial tree evidence found, but full change was not verified in qcom-next or topics
2/2	✅ Present — all checked added lines are present in qcom-next

Verdict

❌ REJECT — Do not merge without major corrections.

Commit 1/2 is fundamentally misattributed:

• The lore link points to a cover letter, not a patch.
• The actual change (deleting monaco-evk-common.dtsi and inlining it into monaco-evk.dts and monaco-ac-evk.dts) is not present in the upstream v5 series.
• This appears to be a local refactoring that should either:
  • Use QCLINUX: prefix (if it's vendor-only and not going upstream), or
  • Link to a different lore series that actually performs this refactoring, or
  • Be split into separate commits: one faithful FROMLIST: of the upstream patch 2/3 (creating monaco-ac-evk.dts), and one QCLINUX: commit for the local refactoring.

Commit 2/2 has correct diff content but missing authorship attribution (original author's SOB).

Recommendation

For Commit 1/2:

1. If the intent is to apply the upstream patch 2/3 faithfully, replace this commit with a faithful cherry-pick of lore patch 2/3:

   • Link: https://lore.kernel.org/all/20260626111301.3479559-3-umang.chheda@oss.qualcomm.com/
   • This creates monaco-ac-evk.dts as a new file.
   • Add Signed-off-by: Umang Chheda <umang.chheda@oss.qualcomm.com> to preserve original authorship.

2. If the refactoring (deleting monaco-evk-common.dtsi) is needed, add it as a separate commit with:

   • Prefix: QCLINUX: (if vendor-only) or FROMLIST: (if it corresponds to a different upstream series — provide that link).
   • Subject: Clearly describe the refactoring (e.g., "arm64: dts: qcom: monaco: Inline monaco-evk-common.dtsi into board files").
   • Do NOT conflate it with the upstream monaco-ac-evk addition.

For Commit 2/2:

1. Add Signed-off-by: Umang Chheda <umang.chheda@oss.qualcomm.com> to the commit message to preserve original authorship.
2. Optionally update From: to Umang Chheda if Faruque Ansari is only the submitter, not a co-author.

Final Summary

1. Lore link present:

   • Commit 1: Yes, but links to cover letter (0/2), not a patch — invalid for validation
   • Commit 2: Yes — https://lore.kernel.org/all/20260626111301.3479559-4-umang.chheda@oss.qualcomm.com/ (patch 3/3)

2. Lore link matches PR commits:

   • Commit 1: No — PR performs a refactoring (delete monaco-evk-common.dtsi, modify monaco-evk.dts and monaco-ac-evk.dts) that is not present in the upstream v5 series. The upstream patch 2/3 creates monaco-ac-evk.dts as a new file and does not touch the other files.
   • Commit 2: Yes — diff content matches lore patch 3/3 (Makefile reordering)

3. Upstream patch status:

   • Both patches: ⏳ Decision Pending — posted 2026-06-26; no maintainer merge or NAK signal found in the lore thread as of this analysis.

4. PR present in qcom-next/topics:

   • Partial — Commit 1 has only partial integration evidence; Commit 2 is fully present in qcom-next.

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: d49c33864d06e9672dce57738be8851384578fcf
topics remote: topics -> https://github.com/qualcomm-linux/kernel-topics
topics fetch: fetched

Commit	Subject	qcom-next	topics	Final
1/2	[PATCH 1/2] FROMLIST: arm64: dts: qcom: monaco-evk: Extract common	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
2/2	[PATCH 2/2] FROMLIST: arm64: dts: qcom: monaco: Align IFP mezzanine	present - all checked added lines are present	skipped - not checked because qcom-next already contains the change	present

Final Status

overall_status: PARTIAL
present_commits: 1/2
partial_commits: 1/2
missing_commits: 0/2
topics_checked_for_commits: 1/2
final_summary: PR present in qcom-next/topics: Partial - 1/2 commit(s) only have partial integration evidence

[qlijarvis]

PR #1852 — checker-log-analyzer

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

Checker	Result	Summary
Checker	Result	Summary
checkpatch	⏭️	Skipped - automerge failed
dt-binding-check	⏭️	Skipped - automerge failed
dtb-check	⏭️	Skipped - automerge failed
sparse-check	⏭️	Skipped - automerge failed
check-uapi-headers	⏭️	Skipped - automerge failed
check-patch-compliance	⏭️	Skipped - automerge failed
tag-check	✅	Both commits have valid FROMLIST: prefix

Detailed report: Full report

Checker analysis — click to expand

🤖 CI Checker Analysis (checker-log-analyzer)

PR: #1852 - FROMLIST: arm64: dts: qcom: monaco-evk: Extract common EVK hardware into independent board files
Source: https://github.com/qualcomm-linux/kernel-config/actions/runs/35209335465

Checker	Result	Summary
checkpatch	⏭️	Skipped - automerge failed
dt-binding-check	⏭️	Skipped - automerge failed
dtb-check	⏭️	Skipped - automerge failed
sparse-check	⏭️	Skipped - automerge failed
check-uapi-headers	⏭️	Skipped - automerge failed
check-patch-compliance	⏭️	Skipped - automerge failed
tag-check	✅	Both commits have valid FROMLIST: prefix

❌ Automerge Failure (Pre-Check Stage)

Root cause: All 6 checker jobs failed during the automerge step before any actual checks could run. The CI encountered 147 merge conflicts when attempting to merge the PR branch with the base branch.

Failure details:

CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/arm/qcom,coresight-ctcu.yaml
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/arm/qcom,coresight-tnoc.yaml
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/arm/qcom.yaml
... (144 more conflicts across bindings, DTS, drivers, sound, etc.)
automerge returned non-zero; check logs for conflicts
##[error]Process completed with exit code 1.

Analysis:

The PR itself only modifies 4 files:

• arch/arm64/boot/dts/qcom/monaco-ac-evk.dts
• arch/arm64/boot/dts/qcom/monaco-evk-common.dtsi (deleted)
• arch/arm64/boot/dts/qcom/monaco-evk.dts
• arch/arm64/boot/dts/qcom/Makefile

However, the automerge encountered 147 conflicts across the entire tree in unrelated files (bindings, drivers, sound subsystem, etc.). This indicates a base branch integration problem — the PR's base branch has diverged significantly from the target integration branch used by CI.

Subject prefix check (tag-check):
Both commits in the PR have valid FROMLIST: prefixes:

• ✅ FROMLIST: arm64: dts: qcom: monaco-evk: Extract common
• ✅ FROMLIST: arm64: dts: qcom: monaco: Align IFP mezzanine

Fix:

This is not a patch defect. The PR author needs to:

1. Rebase the PR branch onto the current target branch:

   git fetch origin
   git rebase origin/<target-branch>
   # Resolve any conflicts in the 4 monaco files
   git push --force-with-lease

2. Or merge the target branch into the PR branch:

   git fetch origin
   git merge origin/<target-branch>
   # Resolve any conflicts in the 4 monaco files
   git push

The conflicts are in files unrelated to this PR, suggesting the PR's base is stale. Once rebased/merged with the current target branch, the checkers should run successfully.

Reproduce locally:

To verify the PR patches are clean (without the base branch issue):

# Apply patches directly to a clean checkout
git checkout <target-branch>
git am pr.patch
./scripts/checkpatch.pl --strict --ignore FILE_PATH_CHANGES --git HEAD~2..HEAD

Verdict

Cannot assess merge readiness — all checkers were blocked by automerge conflicts. The PR commits appear well-formed (valid FROMLIST: prefixes, DTS-only changes), but the branch needs to be rebased onto the current target branch before checkers can run. Once rebased, re-trigger CI to get actual checker results.