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.

[qswat-orbit-external]

Merge Check Failed: No CR Numbers Found

Error: No Change Request numbers were found.

Please add Change Request numbers to your pull request description in the format CRs-Fixed: 12345 or link GitHub issues that are associated with Change Requests.

[qlijarvis]

PR #1132 — validate-patch

PR: #1132

Verdict	Issues	Detailed Report
❌	0	Full report

Final Summary

1. Lore link present: Commit 1: Yes but wrong (links to cover letter, not a patch); Commit 2: Yes
2. Lore link matches PR commits: No - Commit 1 links to non-patch cover letter; Commit 2 performs different operation (reorder vs add)
3. Upstream patch status: Patches 1/3 and 3/3 ACKed and merged; Patch 2/3 reviewed but not applied; Patch 0/2 is cover letter (N/A)
4. PR present in qcom-next/topics: Partial - 1/2 commit(s) only have partial integration evidence

Verdict: ❌ — click to expand

🔍 Patch Validation

PR: #1132 - "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 commits:

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

Verdict: ❌ FAIL

Commit Message

Check	Status	Note
Subject matches upstream	❌	Commit 1 links to cover letter (0/2), not an actual patch; Commit 2 subject describes "Align IFP mezzanine hunk position" but upstream patch adds IFP mezzanine support
Body preserves rationale	⚠️	Commit 1 describes v5 refactoring but links to cover letter; Commit 2 describes position alignment but upstream adds new functionality
Fixes tag present/correct	N/A	Not applicable - new board support
Authorship preserved	❌	PR author is Faruque Ansari but upstream author is Umang Chheda; missing Umang's Signed-off-by
Backport note (if applicable)	N/A	FROMLIST prefix used correctly

Diff

File	Status	Notes
Commit 1: monaco-ac-evk.dts, monaco-evk.dts, monaco-evk-common.dtsi	❌	Links to cover letter (message-id -1-), not an actual patch - cannot validate diff
Commit 2: Makefile	❌	PR moves existing lines; upstream adds 3 new lines for IFP mezzanine - completely different changes

Issues

Commit 1 - Critical Issues:

1. Wrong lore link: Links to cover letter 20260626111301.3479559-1- (patch 0/2) instead of an actual patch. Cover letters are not patches and cannot be cherry-picked.
2. Authorship violation: PR From: is Faruque Ansari <faruque.ansari@oss.qualcomm.com> but upstream author is Umang Chheda <umang.chheda@oss.qualcomm.com>. For FROMLIST: commits, the original author's Signed-off-by: must be present - it is missing.
3. Commit message mismatch: PR describes "Rebasing to v5 of the monaco-ac EVK series, which drops the shared monaco-evk-common.dtsi" but this describes a refactoring between v4→v5, not the actual content of any single v5 patch.

Commit 2 - Critical Issues:

1. Semantic divergence:
   • Upstream patch (message-id -4-, patch 3/3): Adds 3 new lines to create monaco-ac-evk-ifp-mezzanine combo DTB
   • PR patch: Moves existing 3 lines (the same combo) from below monaco-evk-camera-imx577 to above monaco-evk-el2 - a pure reordering operation
2. Commit message misleading: PR says "Align IFP mezzanine hunk position with upstream v5" implying the combo already exists and is being repositioned, but upstream patch 3/3 is adding it for the first time.
3. Missing prerequisite: Upstream patch 2/3 (the main monaco-ac-evk.dts board file) was not applied by the maintainer (only patches 1/3 and 3/3 were applied on Aug 31 and Sep 3, 2026 respectively). The PR assumes patch 2/3 content is already present.

Upstream Patch Status

Commit	Community Verdict
Patch 0/2 (cover letter)	N/A - cover letters are not patches
Patch 1/3 (dt-bindings)	✅ ACKed - merged as 522cffd76eb8 by Bjorn Andersson on Aug 31, 2026
Patch 2/3 (monaco-ac-evk.dts board file)	⏳ Decision Pending - Reviewed-by from Konrad Dybcio but not applied by maintainer; Sashiko AI flagged issues with GPIO expander count mismatch
Patch 3/3 (IFP mezzanine combo)	✅ ACKed - merged as 0fb8fb4e7377 by Bjorn Andersson on Sep 3, 2026

Verdict

Do not merge. This PR has multiple critical validation failures:

1. Commit 1 is not validatable - links to a cover letter instead of a patch, making it impossible to verify diff correctness against upstream.
2. Authorship violation - original author Umang Chheda's Signed-off-by: is missing from both commits.
3. Semantic divergence in Commit 2 - PR performs a reordering operation while claiming to match upstream patch that adds new content.
4. Missing dependency - Upstream patch 2/3 (main board file) was not applied by the maintainer, so the PR's assumption that the IFP mezzanine combo already exists is incorrect.

Recommendation

Reject and request rework:

1. For Commit 1: Determine which actual v5 patch(es) this commit represents. If it's meant to be patch 2/3 (monaco-ac-evk.dts), update the Link to 20260626111301.3479559-3- and ensure the diff matches. Note that patch 2/3 has not been applied upstream yet.

2. For Commit 2: This commit appears to be a local tree management operation (reordering Makefile entries) rather than a faithful representation of upstream patch 3/3. If the goal is to apply upstream patch 3/3, the commit should add the 3 lines as upstream does, not move existing lines.

3. Fix authorship: Both commits must preserve From: Umang Chheda <umang.chheda@oss.qualcomm.com> and include his Signed-off-by: trailer.

4. Verify dependency: Confirm whether patch 2/3 (main monaco-ac-evk.dts board file) should be included in this PR, since it was reviewed but not applied by the maintainer.

Final Summary

1. Lore link present: Commit 1: Yes but wrong (links to cover letter, not a patch); Commit 2: Yes
2. Lore link matches PR commits: No - Commit 1 links to non-patch cover letter; Commit 2 performs different operation (reorder vs add)
3. Upstream patch status: Patches 1/3 and 3/3 ACKed and merged; Patch 2/3 reviewed but not applied; Patch 0/2 is cover letter (N/A)
4. PR present in qcom-next/topics: Partial (1/2 commits) per integration_presence_report.md - Commit 1 has partial evidence, Commit 2 is present

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 #1132 — checker-log-analyzer

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

Checker	Result	Summary
Checker	Result	Summary
checkpatch	⚠️	No jobs ran - merge conflict
dt-binding-check	⚠️	No jobs ran - merge conflict
dtb-check	⚠️	No jobs ran - merge conflict
sparse-check	⚠️	No jobs ran - merge conflict
check-uapi-headers	⚠️	No jobs ran - merge conflict
check-patch-compliance	⚠️	No jobs ran - merge conflict
tag-check	N/A	Cannot run - merge conflict

Detailed report: Full report

Checker analysis — click to expand

🤖 CI Checker Analysis (checker-log-analyzer)

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

Checker	Result	Summary
checkpatch	⚠️	No jobs ran - merge conflict
dt-binding-check	⚠️	No jobs ran - merge conflict
dtb-check	⚠️	No jobs ran - merge conflict
sparse-check	⚠️	No jobs ran - merge conflict
check-uapi-headers	⚠️	No jobs ran - merge conflict
check-patch-compliance	⚠️	No jobs ran - merge conflict
tag-check	N/A	Cannot run - merge conflict

---

⚠️ CI Infrastructure Issue: Merge Conflicts

Root cause: The PR cannot be merged into the target branch qcom-6.18.y due to merge conflicts, preventing all checker jobs from running.

Failure details:

Merging pr-1132 (no-commit)...
Auto-merging arch/arm64/boot/dts/qcom/Makefile
CONFLICT (modify/delete): arch/arm64/boot/dts/qcom/monaco-evk-common.dtsi deleted in pr-1132 and modified in HEAD.  Version HEAD of arch/arm64/boot/dts/qcom/monaco-evk-common.dtsi left in tree.
Auto-merging arch/arm64/boot/dts/qcom/monaco-evk.dts
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/qcom/monaco-evk.dts
Automatic merge failed; fix conflicts and then commit the result.
Merge failed or conflicts detected. Aborting merge.
##[error]Process completed with exit code 3.

Analysis:

This PR attempts to delete arch/arm64/boot/dts/qcom/monaco-evk-common.dtsi and fold its contents into individual board files (monaco-evk.dts and monaco-ac-evk.dts). However, the target branch qcom-6.18.y has modifications to both:

1. monaco-evk-common.dtsi — The PR deletes this file, but the target branch has newer modifications to it (modify/delete conflict)
2. monaco-evk.dts — Both the PR and the target branch have made changes to this file (content conflict)

This indicates that the PR was created against an older version of qcom-6.18.y and needs to be rebased onto the current tip.

Fix:

The PR author needs to rebase the branch onto the latest qcom-6.18.y:

# In the PR branch
git fetch origin qcom-6.18.y
git rebase origin/qcom-6.18.y

# Resolve conflicts:
# 1. For monaco-evk-common.dtsi: Since the PR deletes it, ensure any new
#    content from the target branch is folded into the individual board files
# 2. For monaco-evk.dts: Manually merge the changes, ensuring both the PR's
#    refactoring and any new hardware additions from the target branch are preserved

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

# Force-push the rebased branch
git push --force-with-lease

Reproduce locally:

git clone https://github.com/qualcomm-linux/kernel.git
cd kernel
git checkout qcom-6.18.y
git fetch origin pull/1132/head:pr-1132
git merge pr-1132 --no-commit
# Observe the same conflicts

---

Verdict

Cannot assess patch quality — CI infrastructure blocked by merge conflicts.

The PR must be rebased onto the current qcom-6.18.y tip before any checker validation can occur. Once rebased and conflicts resolved:

1. Re-trigger the CI run
2. All six checkers will execute against the rebased commits
3. A new analysis can be performed on the actual checker results

Recommended action: Ask the PR author to rebase and resolve conflicts, then re-run CI.

[qswat-orbit-external]

Merge Check Failed: No CR Numbers Found

Error: No Change Request numbers were found.

Please add Change Request numbers to your pull request description in the format CRs-Fixed: 12345 or link GitHub issues that are associated with Change Requests.