Skip to content

arm64: dts: qcom: hamoa, purwa: Describe the PCIe M.2 Key E connector - #1629

Open
weiden (WeiDeng-weiden) wants to merge 4 commits into
qualcomm-linux:tech/all/dt/hamoafrom
WeiDeng-weiden:tech/all/dt/hamoa
Open

arm64: dts: qcom: hamoa, purwa: Describe the PCIe M.2 Key E connector#1629
weiden (WeiDeng-weiden) wants to merge 4 commits into
qualcomm-linux:tech/all/dt/hamoafrom
WeiDeng-weiden:tech/all/dt/hamoa

Conversation

@WeiDeng-weiden

@WeiDeng-weiden weiden (WeiDeng-weiden) commented Aug 3, 2026

Copy link
Copy Markdown

Describe the PCIe M.2 Key E connector on the Hamoa and Purwa IoT EVKs

4 commits:

  1. hamoa: Add graph port/endpoint anchors to pcie4_port0 and uart14 — endpoint stubs in hamoa.dtsi (Suggested-by: Konrad)
  2. hamoa: Add compatible to the PCIe Root Portpciclass,0604 on pcie4_port0 (Reviewed-by: Konrad)
  3. hamoa-iot-evk: Describe the PCIe M.2 Key E connector — port@0 PCIe + port@3 UART; remove wcn7850-pmu/static BT(Reviewed-by: Konrad, Mani)
  4. purwa-iot-evk: Describe the PCIe M.2 Key E connector — same connector layout; Purwa inherits hamoa.dtsi

Upstream V4: https://lore.kernel.org/all/20260804-hamoa-m2-dts-v2-v4-0-1b5ceac74538@oss.qualcomm.com/

CRs-Fixed: 4630764

@qlijarvis

Copy link
Copy Markdown

🔨 Build Failure Analysis — PR #1629

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

# Error File:Line PR-introduced? Root Cause
1 Merge conflict arch/arm64/boot/dts/qcom/hamoa-iot-evk.dts No Integration conflict with topic/tech/all/dt/hamoa branch

Verdict

This is not a compilation error. The build failed during the merge phase when attempting to integrate PR #1629 with the baseline integration branch that already includes topic/tech/all/dt/hamoa. The conflict is pre-existing and caused by overlapping changes between the PR and the topic branch, not by code introduced in this PR.

📎 Detailed analysis: Full report

@qlijarvis

Copy link
Copy Markdown

🔨 Build Failure Analysis — PR #1629

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

# Error File:Line PR-introduced? Root Cause
1 Merge conflict arch/arm64/boot/dts/qcom/hamoa-iot-evk.dts Yes PR modifies the same file already changed by topic branch topic/tech/all/dt/hamoa, causing a merge conflict during integration

Verdict

This is not a compilation error. The build failed due to a merge conflict between PR #1629 and the pre-existing topic branch topic/tech/all/dt/hamoa. Both modify hamoa-iot-evk.dts, and the CI workflow cannot automatically resolve the conflict.

📎 Detailed analysis: Full report

@qlijarvis

Copy link
Copy Markdown

PR #1629 — validate-patch

PR: #1629

Verdict Issues Detailed Report
⚠️ 0 Full report

Final Summary

  1. Lore link present: Yes - https://lore.kernel.org/all/20260709-fix-hamoa-m2-w-disable2-v1-1-5e725091266a@oss.qualcomm.com/
  2. Lore link matches PR commits: Yes - diff content is identical; commit message preserves all upstream content and adds appropriate vendor-specific note
  3. Upstream patch status: ⏳ Decision Pending - posted 2026-07-09, has maintainer Reviewed-by tags, not yet merged to mainline
  4. PR present in qcom-next/topics: Partial - 1/1 commit(s) only have partial integration evidence
Verdict: ⚠️ — click to expand

🔍 Patch Validation

PR: #1629 - FROMLIST: arm64: dts: qcom: hamoa-iot-evk: Describe the PCIe M.2 Key E connector
Upstream commit: https://lore.kernel.org/all/20260709-fix-hamoa-m2-w-disable2-v1-1-5e725091266a@oss.qualcomm.com/
Verdict: ⚠️ PARTIAL

Commit Message

Check Status Note
Subject matches upstream Identical except for FROMLIST: prefix (correct)
Body preserves rationale All key paragraphs preserved verbatim
Fixes tag present/correct N/A No Fixes tag in upstream or PR
Authorship preserved From: matches lore author (Wei Deng)
Backport note (if applicable) N/A FROMLIST: prefix used (not yet merged upstream)
Reviewed-by tags Both Reviewed-by tags from lore thread present
Vendor-specific note PR adds vendor workaround removal note (appropriate for internal tree)

Diff

File Status Notes
arch/arm64/boot/dts/qcom/hamoa-iot-evk.dts 129 changed lines match lore patch exactly; context differs due to different base commit
arch/arm64/boot/dts/qcom/hamoa.dtsi Single-line addition matches lore patch

Upstream Patch Status

Community verdict:Decision Pending (under review)

Evidence:

  • Posted to linux-arm-msm on 2026-07-09 as part of 3-patch series
  • Received formal Reviewed-by: from Manivannan Sadhasivam (maintainer) and Konrad Dybcio
  • Thread contains "this can be queued independently" comment
  • No merge confirmation or NAK found in thread
  • Not yet found in torvalds/linux mainline (as of 2026-08-03)

Series context: This is patch 1/3 of a series titled "power: sequencing: pcie-m2: Enable USB/UART BT coexistence on Hamoa EVK". The PR contains only patch 1/3; patches 2/3 and 3/3 (driver changes to pwrseq-pcie-m2.c) are not included.

Integration Presence

Per integration_presence_report.md:

  • qcom-next: Partial - subject or partial tree evidence found, but full change not verified
  • kernel-topics: Missing - no subject, patch-id, or full tree-content match found
  • Overall: PARTIAL (1/1 commit has only partial integration evidence)

Issues

  1. Incomplete series in PR - The lore patch is part of a 3-patch series, but only patch 1/3 is included in this PR. Patches 2/3 and 3/3 modify drivers/power/sequencing/pwrseq-pcie-m2.c and are dependencies for the full feature to work correctly. The commit message references "the pwrseq-pcie-m2 driver" functionality that requires patches 2/3 and 3/3.

  2. Vendor-specific note added - The PR commit message adds a "Note:" paragraph about removing a WORKAROUND commit from tech/all/workaround. This is appropriate for the internal tree but is not present in the upstream lore patch.

  3. Integration status unclear - The integration presence report shows only "partial" evidence in qcom-next and "missing" in kernel-topics, which is inconsistent with a FROMLIST: commit that should either be fully present or fully absent.

Verdict

Request clarification before merging:

  1. Dependency completeness: Verify that patches 2/3 and 3/3 from the lore series are either (a) already merged in the target branch, or (b) will be submitted in separate PRs. The commit message describes functionality that depends on driver changes in those patches.

  2. Integration status: Reconcile the "partial" integration presence finding - either the commit is already in qcom-next (in which case this PR may be redundant), or it's not (in which case the partial match needs investigation).

  3. Prefix consistency: If patches 2/3 and 3/3 are already merged upstream, consider whether FROMLIST: is still the correct prefix, or if UPSTREAM: or BACKPORT: would be more accurate.

The patch itself is a faithful representation of the lore source with appropriate vendor-specific annotations. The concerns are about series completeness and integration state, not patch correctness.

Final Summary

  1. Lore link present: Yes - https://lore.kernel.org/all/20260709-fix-hamoa-m2-w-disable2-v1-1-5e725091266a@oss.qualcomm.com/
  2. Lore link matches PR commits: Yes - diff content is identical; commit message preserves all upstream content and adds appropriate vendor-specific note
  3. Upstream patch status: ⏳ Decision Pending - posted 2026-07-09, has maintainer Reviewed-by tags, not yet merged to mainline
  4. PR present in qcom-next/topics: Partial - integration report shows partial evidence in qcom-next but missing in topics; needs clarification

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

Commit Subject qcom-next topics Final
1/1 [PATCH] FROMLIST: arm64: dts: qcom: hamoa-iot-evk: Describe the PCIe partial - subject or partial tree evidence found, but full change was not verified missing - no subject, patch-id, or full tree-content match found partial

Final Status

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

@qlijarvis

Copy link
Copy Markdown

PR #1629 — checker-log-analyzer

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

Checker Result Summary
Checker Result Summary
checkpatch ⏭️ Skipped - merge conflict prevented execution
dt-binding-check ⏭️ Skipped - merge conflict prevented execution
dtb-check ⏭️ Skipped - merge conflict prevented execution
sparse-check ⏭️ Skipped - merge conflict prevented execution
check-uapi-headers ⏭️ Skipped - merge conflict prevented execution
check-patch-compliance ⏭️ Skipped - merge conflict prevented execution
tag-check Subject has valid FROMLIST: prefix
qcom-next-check N/A Cannot determine target branch without network access

Detailed report: Full report

Checker analysis — click to expand

🤖 CI Checker Analysis (checker-log-analyzer)

PR: #1629 - FROMLIST: arm64: dts: qcom: hamoa-iot-evk: Describe the PCIe M.2 Key E connector
Source: https://github.com/qualcomm-linux/kernel-config/actions/runs/30790703305

Checker Result Summary
checkpatch ⏭️ Skipped - merge conflict prevented execution
dt-binding-check ⏭️ Skipped - merge conflict prevented execution
dtb-check ⏭️ Skipped - merge conflict prevented execution
sparse-check ⏭️ Skipped - merge conflict prevented execution
check-uapi-headers ⏭️ Skipped - merge conflict prevented execution
check-patch-compliance ⏭️ Skipped - merge conflict prevented execution
tag-check Subject has valid FROMLIST: prefix
qcom-next-check N/A Cannot determine target branch without network access

⚠️ CI Infrastructure Issue: Merge Conflict

Root cause: All checker jobs failed during the integration merge phase before any actual checks could run.

Failure details:

Merging topic branch: topic/tech/all/dt/hamoa
Auto-merging arch/arm64/boot/dts/qcom/hamoa-iot-evk.dts
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/qcom/hamoa-iot-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:

The CI workflow attempts to merge PR #1629 on top of an integration branch that includes topic/tech/all/dt/hamoa. This topic branch contains conflicting changes to arch/arm64/boot/dts/qcom/hamoa-iot-evk.dts, the same file modified by this PR.

This is NOT a patch quality issue. The PR patch itself:

  • Has a valid FROMLIST: subject prefix ✅
  • Includes proper upstream link (Link: https://lore.kernel.org/all/...) ✅
  • Has proper sign-offs and reviews ✅
  • Makes reasonable DTS changes (M.2 connector refactoring) ✅

The conflict occurs because:

  1. The CI merges the baseline tag (8d5dbc1b17adf8fe86a41adcda686785e73f5414)
  2. Then merges topic/tech/all/dt/hamoa (which modifies hamoa-iot-evk.dts)
  3. Then attempts to merge PR arm64: dts: qcom: hamoa, purwa: Describe the PCIe M.2 Key E connector #1629 (which also modifies hamoa-iot-evk.dts)
  4. The two sets of changes overlap → merge conflict

Fix options:

  1. Rebase the PR on top of the current integration branch (baseline + topic/tech/all/dt/hamoa):

    # Fetch the topic branch
    git fetch origin tech/all/dt/hamoa:topic/tech/all/dt/hamoa
    
    # Rebase PR branch on top of baseline + topic
    git checkout <pr-branch>
    git rebase --onto topic/tech/all/dt/hamoa <baseline-sha>
    
    # Resolve conflicts in arch/arm64/boot/dts/qcom/hamoa-iot-evk.dts
    # Then force-push the rebased branch
  2. Coordinate with topic branch owner - If topic/tech/all/dt/hamoa is still under development, coordinate to ensure changes don't conflict, or merge one before the other.

  3. Merge topic branch first - If the topic branch is ready, merge it to the target branch first, then rebase this PR on the updated target.

Reproduce locally:

# Clone and set up the integration environment
git clone https://github.com/qualcomm-linux/kernel-topics.git
cd kernel-topics
git checkout 8d5dbc1b17adf8fe86a41adcda686785e73f5414
git checkout -b test-integ

# Merge the topic branch
git fetch origin tech/all/dt/hamoa
git merge origin/tech/all/dt/hamoa

# Attempt to merge the PR
git fetch origin pull/1629/head:pr-1629
git merge --no-commit pr-1629
# → This will reproduce the conflict

✅ tag-check

Status: PASS

The commit subject starts with FROMLIST:, which is a valid upstream-linkable prefix. The commit also includes a proper Link: trailer pointing to the lore.kernel.org thread.


Verdict

Cannot assess patch quality - all checkers were blocked by a merge conflict during CI setup.

Action required: Resolve the merge conflict with topic/tech/all/dt/hamoa by rebasing the PR branch, then re-trigger CI. The patch itself appears well-formed based on manual inspection of pr.patch.

@qcomlnxci
qcomlnxci requested a review from a team August 3, 2026 07:47
@qlijarvis

Copy link
Copy Markdown

🔨 Build Failure Analysis — PR #1629

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

# Error File:Line PR-introduced? Root Cause
1 Merge conflict arch/arm64/boot/dts/qcom/hamoa-iot-evk.dts No The PR modifies hamoa-iot-evk.dts which conflicts with changes already present in the topic branch topic/tech/all/dt/hamoa that was merged into the integration baseline before this PR. This is a merge conflict, not a compilation error.

Verdict

This is not a compilation failure. The build failed during the merge phase due to a merge conflict between PR #1629 and the existing topic branch topic/tech/all/dt/hamoa. Both modify the same file (hamoa-iot-evk.dts), causing a content conflict that must be resolved before the build can proceed.

📎 Detailed analysis: Full report

@qlijarvis

Copy link
Copy Markdown

🔨 Build Failure Analysis — PR #1629

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

# Error File:Line PR-introduced? Root Cause
1 Merge conflict arch/arm64/boot/dts/qcom/hamoa-iot-evk.dts No (integration conflict) The PR modifies the same file (hamoa-iot-evk.dts) that was already changed by the topic/tech/all/dt/hamoa branch merged into the integration baseline. Git cannot automatically resolve overlapping changes in the same region of the file.

Verdict

This is not a compilation error. The build failed during the merge phase before compilation could begin. The conflict is caused by overlapping changes between the PR and the pre-existing topic/tech/all/dt/hamoa topic branch, not by code introduced in this PR.

📎 Detailed analysis: Full report

@qlijarvis

Copy link
Copy Markdown

PR #1629 — validate-patch

PR: #1629

Verdict Issues Detailed Report
⚠️ 1 Full report

Final Summary

  1. Lore link present: Yes — https://lore.kernel.org/all/20260709-fix-hamoa-m2-w-disable2-v1-1-5e725091266a@oss.qualcomm.com/
  2. Lore link matches PR commits: Yes — diff content is identical; commit message adds vendor-specific WORKAROUND note not present in lore (acceptable for internal tree, but should be below --- line)
  3. Upstream patch status: ⏳ Decision Pending — Reviewed-by tags from Manivannan and Konrad; active discussion on series; not yet queued or merged as of 2026-07-21
  4. PR present in qcom-next/topics: Partial - 1/1 commit(s) only have partial integration evidence
Verdict: ⚠️ — click to expand

🔍 Patch Validation

PR: #1629 - FROMLIST: arm64: dts: qcom: hamoa-iot-evk: Describe the PCIe M.2 Key E connector
Upstream commit: https://lore.kernel.org/all/20260709-fix-hamoa-m2-w-disable2-v1-1-5e725091266a@oss.qualcomm.com/
Verdict: ⚠️ PARTIAL

Commit Message

Check Status Note
Subject matches upstream Subject identical except for FROMLIST: prefix (correct)
Body preserves rationale All key technical details preserved from lore patch
Fixes tag present/correct N/A No Fixes tag in upstream or PR (not a bugfix)
Authorship preserved From: matches lore author Wei Deng wei.deng@oss.qualcomm.com
Backport note (if applicable) N/A FROMLIST: commit, not a backport
Reviewed-by: tags present Both Manivannan and Konrad tags present in PR and lore thread
Additional content ⚠️ PR adds vendor-specific note about WORKAROUND f2ee870 not present in upstream

Diff

File Status Notes
arch/arm64/boot/dts/qcom/hamoa-iot-evk.dts Diff identical to lore patch - adds M.2 connector node, removes wcn7850-pmu, replaces wifi@0 and bluetooth nodes with port/endpoint graph
arch/arm64/boot/dts/qcom/hamoa.dtsi Diff identical to lore patch - adds compatible = "pciclass,0604" to pcie4_port0

Issues

Commit message:

  • PR commit message includes vendor-specific note: "Note: WORKAROUND f2ee870 in tech/all/workaround should be removed when merging this commit (vreg_wcn_bt_en superseded by w-disable2-gpios in the connector node)." This note is not present in the upstream lore patch and is specific to the Qualcomm internal tree integration workflow. While this is acceptable for internal tracking, it should ideally be placed below the --- line (after Signed-off-by: and before the diffstat) so it doesn't become part of the permanent commit message when/if this is merged upstream.

Upstream Patch Status

Community verdict:Decision Pending — Patch posted on 2026-07-09 with formal Reviewed-by: tags from Manivannan Sadhasivam and Konrad Dybcio. Thread shows active discussion about the broader series (patches 2/3 and 3/3 regarding USB BT handling). Bartosz Golaszewski (power sequencing maintainer) asked on 2026-07-16 whether patch 2/3 should be queued independently. Wei Deng confirmed on 2026-07-21 that patch 2/3 can be queued independently and that patch 3/3 will be dropped in favor of Chen-Yu Tsai's USB hub power sequencing series. This patch (1/3) has not yet been explicitly queued or merged into any maintainer tree as of the lore thread evidence available. Last activity: 2026-07-21.

Integration Presence

Per integration_presence_report.md:

  • qcom-next: Partial - subject or partial tree evidence found, but full change was not verified
  • topics: Missing - no subject, patch-id, or full tree-content match found
  • Final status: PARTIAL (1/1 commit has only partial integration evidence)

Verdict

Merge with minor note: The diff is faithful to the lore upstream and the commit message preserves all technical rationale. The FROMLIST: prefix is correct since the patch is under review but not yet merged upstream. The vendor-specific WORKAROUND note should ideally be moved below the --- line to keep the commit message clean for potential upstream submission, but this is a minor hygiene issue and does not affect correctness. The patch can be merged as-is for internal integration; consider moving the WORKAROUND note below --- in future submissions.

Final Summary

  1. Lore link present: Yes — https://lore.kernel.org/all/20260709-fix-hamoa-m2-w-disable2-v1-1-5e725091266a@oss.qualcomm.com/
  2. Lore link matches PR commits: Yes — diff content is identical; commit message adds vendor-specific WORKAROUND note not present in lore (acceptable for internal tree, but should be below --- line)
  3. Upstream patch status: ⏳ Decision Pending — Reviewed-by tags from Manivannan and Konrad; active discussion on series; not yet queued or merged as of 2026-07-21
  4. PR present in qcom-next/topics: Partial — integration_presence_report.md shows partial evidence in qcom-next, missing from topics

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

Commit Subject qcom-next topics Final
1/1 [PATCH] FROMLIST: arm64: dts: qcom: hamoa-iot-evk: Describe the PCIe partial - subject or partial tree evidence found, but full change was not verified missing - no subject, patch-id, or full tree-content match found partial

Final Status

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

@qlijarvis

Copy link
Copy Markdown

PR #1629 — checker-log-analyzer

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

Checker Result Summary
Checker Result Summary
checkpatch ⏭️ Skipped due to merge conflict
dt-binding-check ⏭️ Skipped due to merge conflict
dtb-check ⏭️ Skipped due to merge conflict
sparse-check ⏭️ Skipped due to merge conflict
check-uapi-headers ⏭️ Skipped due to merge conflict
check-patch-compliance ⏭️ Skipped due to merge conflict
tag-check N/A Not applicable (target branch is qcom-next)

Detailed report: Full report

Checker analysis — click to expand

🤖 CI Checker Analysis (checker-log-analyzer)

PR: #1629 - FROMLIST: arm64: dts: qcom: hamoa-iot-evk: Describe the PCIe M.2 Key E connector
Source: https://github.com/qualcomm-linux/kernel-config/actions/runs/30795073110
Target branch: qcom-next

Checker Result Summary
checkpatch ⏭️ Skipped due to merge conflict
dt-binding-check ⏭️ Skipped due to merge conflict
dtb-check ⏭️ Skipped due to merge conflict
sparse-check ⏭️ Skipped due to merge conflict
check-uapi-headers ⏭️ Skipped due to merge conflict
check-patch-compliance ⏭️ Skipped due to merge conflict
tag-check N/A Not applicable (target branch is qcom-next)

⚠️ CI Infrastructure Issue — Merge Conflict

Root cause: The PR cannot be merged cleanly with the integration branch due to a content conflict in arch/arm64/boot/dts/qcom/hamoa-iot-evk.dts.

Failure details:

2026-08-03T08:10:24.9931094Z Auto-merging arch/arm64/boot/dts/qcom/hamoa-iot-evk.dts
2026-08-03T08:10:24.9931794Z CONFLICT (content): Merge conflict in arch/arm64/boot/dts/qcom/hamoa-iot-evk.dts
2026-08-03T08:10:25.0570875Z Automatic merge failed; fix conflicts and then commit the result.
2026-08-03T08:10:25.0677832Z Merge failed or conflicts detected. Aborting merge.
2026-08-03T08:10:25.1935827Z ##[error]Process completed with exit code 3.

Analysis:

The CI workflow attempts to merge the PR with the integration branch (qcom-next baseline + topic branch topic/tech/all/dt/hamoa). The merge fails because:

  1. Integration sequence:

  2. Conflict location: arch/arm64/boot/dts/qcom/hamoa-iot-evk.dts

  3. Root cause: The topic branch topic/tech/all/dt/hamoa likely contains overlapping changes to the same region of hamoa-iot-evk.dts that this PR modifies. The PR removes the wcn7850-pmu node and replaces chip-specific WiFi/BT nodes with a generic M.2 connector approach, which conflicts with changes already present in the topic branch.

Fix:

This is not a patch defect — the patch itself is well-formed with proper FROMLIST: prefix, Link: trailer, and Signed-off-by: tags. The issue is a merge conflict that must be resolved before the checkers can run.

Resolution steps:

  1. Rebase the PR on top of the latest integration state:

    # Fetch the latest qcom-next baseline
    git fetch https://github.com/qualcomm-linux/kernel.git qcom-next
    
    # Fetch the topic branch
    git fetch origin topic/tech/all/dt/hamoa
    
    # Create a local integration branch
    git checkout -b local-integ FETCH_HEAD  # qcom-next baseline
    git merge origin/topic/tech/all/dt/hamoa
    
    # Rebase the PR branch on top
    git checkout <pr-branch>
    git rebase local-integ
  2. Resolve the conflict manually:

    • Open arch/arm64/boot/dts/qcom/hamoa-iot-evk.dts
    • Identify the conflicting hunks (likely around the wcn7850-pmu node, pcie4 node, or uart14 node)
    • Decide which changes to keep:
      • If the topic branch already has the M.2 connector approach → this PR may be redundant
      • If the topic branch has a different approach → merge both approaches or choose one
    • Remove conflict markers (<<<<<<<, =======, >>>>>>>)
    • Stage the resolved file: git add arch/arm64/boot/dts/qcom/hamoa-iot-evk.dts
    • Continue the rebase: git rebase --continue
  3. Force-push the rebased branch:

    git push --force-with-lease origin <pr-branch>
  4. Re-trigger CI — the checkers will run cleanly once the merge conflict is resolved.

Note on the commit message:

The commit message includes this note:

Note: WORKAROUND f2ee870 in tech/all/workaround should be removed when merging this commit (vreg_wcn_bt_en superseded by w-disable2-gpios in the connector node).

This suggests that the conflict may be related to the workaround commit f2ee87014e91 in the tech/all/workaround topic branch. The PR author expects that workaround to be removed when this PR is merged. The conflict may arise because the workaround is still present in the integration branch.

Patch quality assessment:

The patch itself is well-formed:

  • ✅ Proper FROMLIST: prefix (required for non-qcom-next/qcom-next-staging branches, but present here)
  • ✅ Valid Link: trailer pointing to lore.kernel.org
  • Signed-off-by: present
  • Reviewed-by: tags from maintainers (Manivannan Sadhasivam, Konrad Dybcio)
  • ✅ DTS-only changes (no C/H files) — would skip sparse-check and check-uapi-headers if merged cleanly
  • ✅ No binding changes — would skip dt-binding-check if merged cleanly
  • ✅ Changes are localized to hamoa-iot-evk.dts and hamoa.dtsi

Verdict

Cannot assess patch quality — all checkers were blocked by a merge conflict. The patch itself appears well-formed based on manual inspection. Action required: Resolve the merge conflict in arch/arm64/boot/dts/qcom/hamoa-iot-evk.dts by rebasing on the latest integration state (qcom-next + topic/tech/all/dt/hamoa), then re-trigger CI.

@WeiDeng-weiden
weiden (WeiDeng-weiden) force-pushed the tech/all/dt/hamoa branch 2 times, most recently from 64a8ab1 to b52387e Compare August 4, 2026 06:53
@qlijarvis

Copy link
Copy Markdown

🔨 Build Failure Analysis — PR #1629

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

# Error File:Line PR-introduced? Root Cause
1 Merge conflict during git merge arch/arm64/boot/dts/qcom/hamoa-iot-evk.dts Yes PR modifies the same file that was already changed by the integration branch topic topic/tech/all/dt/hamoa, causing a content conflict during merge

Verdict

This is not a compilation error. The build failed during the merge phase because PR #1629 conflicts with changes already present in the integration branch from topic/tech/all/dt/hamoa.

📎 Detailed analysis: Full report

@qlijarvis

Copy link
Copy Markdown

🔨 Build Failure Analysis — PR #1629

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

# Error File:Line PR-introduced? Root Cause
1 Merge conflict arch/arm64/boot/dts/qcom/hamoa-iot-evk.dts No The PR modifies the same regions of hamoa-iot-evk.dts that were already changed in the integration branch (topic/tech/all/dt/hamoa). The conflict occurs because both the PR and the integration branch touch overlapping sections of the device tree.

Verdict

This is not a compilation error. The build failed during the merge phase due to a git merge conflict between PR #1629 and the integration branch. The conflict must be resolved before the build can proceed.

📎 Detailed analysis: Full report

@qlijarvis

Copy link
Copy Markdown

PR #1629 — validate-patch

PR: #1629

Verdict Issues Detailed Report
0 Full report

Final Summary

  1. Lore link present: Yes — https://lore.kernel.org/all/20260709-fix-hamoa-m2-w-disable2-v1-1-5e725091266a@oss.qualcomm.com/
  2. Lore link matches PR commits: Yes — diff content faithful to lore PATCH 1/3; index differs due to rebase (expected)
  3. Upstream patch status: ⏳ Decision Pending — has Reviewed-by from Manivannan Sadhasivam and Konrad Dybcio; no explicit merge or NAK as of July 21, 2026
  4. PR present in qcom-next/topics: Partial - 1/1 commit(s) only have partial integration evidence
Verdict: ✅ — click to expand

🔍 Patch Validation

PR: #1629 - FROMLIST: arm64: dts: qcom: hamoa-iot-evk: Describe the PCIe M.2 Key E connector
Upstream commit: https://lore.kernel.org/all/20260709-fix-hamoa-m2-w-disable2-v1-1-5e725091266a@oss.qualcomm.com/
Verdict: ✅ PASS

Commit Message

Check Status Note
Subject matches upstream Subject identical except for FROMLIST: prefix
Body preserves rationale All key paragraphs preserved verbatim
Fixes tag present/correct N/A No Fixes tag in upstream or PR
Authorship preserved From: matches lore author Wei Deng
Backport note (if applicable) N/A Not a backport; FROMLIST: prefix correct
Reviewed-by tags Both Reviewed-by tags from lore thread present (Manivannan Sadhasivam, Konrad Dybcio)

Diff

File Status Notes
arch/arm64/boot/dts/qcom/hamoa-iot-evk.dts Content faithful; index differs due to rebase (expected for FROMLIST)
arch/arm64/boot/dts/qcom/hamoa.dtsi Single-line addition of compatible = "pciclass,0604" matches lore

Upstream Patch Status

The lore thread shows:

  • Reviewed-by: Manivannan Sadhasivam mani@kernel.org (present in PR ✅)
  • Reviewed-by: Konrad Dybcio konrad.dybcio@oss.qualcomm.com (present in PR ✅)
  • Status: ⏳ Decision Pending — patch has formal maintainer reviews but no explicit "applied" or merge confirmation in the thread as of the last activity (July 21, 2026). No NAK or rejection signals found.

Verdict

Merge as-is. The PR faithfully represents the lore patch (PATCH 1/3 from the series). The commit message, authorship, Reviewed-by tags, and diff content all match the upstream posting. The FROMLIST: prefix is correct since the patch has not yet been merged into mainline. The index line difference is expected due to rebasing onto the target tree.

Final Summary

  1. Lore link present: Yes — https://lore.kernel.org/all/20260709-fix-hamoa-m2-w-disable2-v1-1-5e725091266a@oss.qualcomm.com/
  2. Lore link matches PR commits: Yes — diff content faithful to lore PATCH 1/3; index differs due to rebase (expected)
  3. Upstream patch status: ⏳ Decision Pending — has Reviewed-by from Manivannan Sadhasivam and Konrad Dybcio; no explicit merge or NAK as of July 21, 2026
  4. PR present in qcom-next/topics: Partial — integration_presence_report.md shows "partial - subject or partial tree evidence found, but full change was not verified"

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

Commit Subject qcom-next topics Final
1/1 [PATCH] FROMLIST: arm64: dts: qcom: hamoa-iot-evk: Describe the PCIe partial - subject or partial tree evidence found, but full change was not verified missing - no subject, patch-id, or full tree-content match found partial

Final Status

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

@qlijarvis

Copy link
Copy Markdown

PR #1629 — checker-log-analyzer

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

Checker Result Summary
Checker Result Summary
checkpatch ⚠️ Blocked by merge conflict
dt-binding-check ⚠️ Blocked by merge conflict
dtb-check ⚠️ Blocked by merge conflict
sparse-check ⚠️ Blocked by merge conflict
check-uapi-headers ⚠️ Blocked by merge conflict
check-patch-compliance ⚠️ Blocked by merge conflict
tag-check Subject has valid FROMLIST: prefix
qcom-next-check N/A Cannot determine target branch (network restricted)

Detailed report: Full report

Checker analysis — click to expand

🤖 CI Checker Analysis (checker-log-analyzer)

PR: #1629 - FROMLIST: arm64: dts: qcom: hamoa-iot-evk: Describe the PCIe M.2 Key E connector
Source: https://github.com/qualcomm-linux/kernel-config/actions/runs/30885801767

Checker Result Summary
checkpatch ⚠️ Blocked by merge conflict
dt-binding-check ⚠️ Blocked by merge conflict
dtb-check ⚠️ Blocked by merge conflict
sparse-check ⚠️ Blocked by merge conflict
check-uapi-headers ⚠️ Blocked by merge conflict
check-patch-compliance ⚠️ Blocked by merge conflict
tag-check Subject has valid FROMLIST: prefix
qcom-next-check N/A Cannot determine target branch (network restricted)

⚠️ CI Infrastructure Issue — Merge Conflict

Root cause: All checker jobs failed during the PR merge step with a conflict in arch/arm64/boot/dts/qcom/hamoa-iot-evk.dts, preventing any actual checker validation from running.

Failure details:

CONFLICT (content): Merge conflict in arch/arm64/boot/dts/qcom/hamoa-iot-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.

This error appeared identically in all six checker jobs:

  • checker__checkpatch____checker.txt
  • checker__dt-binding-check____checker.txt
  • checker__dtb-check____checker.txt
  • checker__sparse-check____checker.txt
  • checker__check-uapi-headers____checker.txt
  • checker__check-patch-compliance____checker.txt

Analysis:

The CI workflow attempts to merge the PR branch into the target base branch before running checkers. This merge failed due to conflicting changes in hamoa-iot-evk.dts. The conflict indicates that the base branch has diverged since the PR was created — likely another PR modifying the same file was merged after this PR was opened.

What this means:

  1. No actual checker validation occurred — checkpatch, dtb-check, dt-binding-check, sparse, uapi-headers, and patch-compliance checks never ran because the merge failed before the checker scripts could execute.

  2. The patch itself appears well-formed:

    • ✅ Subject has valid FROMLIST: prefix
    • ✅ Contains proper Link: trailer pointing to lore.kernel.org
    • ✅ Has Signed-off-by: and Reviewed-by: tags
    • ✅ Only modifies DTS files (no C/H changes that would trigger sparse/uapi checks)
  3. The conflict is a CI/merge issue, not a patch quality issue.

Fix:

The PR author needs to rebase the branch onto the current base branch to resolve the conflict:

# In the PR branch
git fetch origin
git rebase origin/<base-branch>

# Resolve the conflict in arch/arm64/boot/dts/qcom/hamoa-iot-evk.dts
# The conflict is likely in the same region this patch modifies
# (around the connector/wcn7850-pmu/pcie4/uart14 nodes)

git add arch/arm64/boot/dts/qcom/hamoa-iot-evk.dts
git rebase --continue
git push --force-with-lease

After the rebase and force-push, the CI will re-run with a clean merge and the checkers will execute properly.

Reproduce locally:

To see the exact conflict:

git clone https://github.com/qualcomm-linux/kernel-topics.git
cd kernel-topics
git fetch origin pull/1629/head:pr-1629
git checkout <base-branch>
git merge --no-commit pr-1629
# Conflict will appear in arch/arm64/boot/dts/qcom/hamoa-iot-evk.dts

✅ tag-check — Manual Validation

Status: PASS

The commit subject starts with FROMLIST:, which is a valid prefix. The commit also includes:

  • Proper Link: trailer to the upstream lore.kernel.org posting
  • Signed-off-by: from the author
  • Reviewed-by: tags from maintainers

Note: Cannot determine if the target branch is qcom-next or qcom-next-staging (which would make the prefix check optional) due to network restrictions in the analysis environment. However, the prefix is present and valid regardless of target branch.


Verdict

Cannot assess patch quality — CI blocked by merge conflict.

The PR must be rebased onto the current base branch to resolve the merge conflict in hamoa-iot-evk.dts. Once rebased and force-pushed, the CI will re-run and the checkers will execute properly.

The patch itself appears well-formed based on manual inspection:

  • Valid subject prefix (FROMLIST:)
  • Proper upstream link and sign-offs
  • Clean DTS-only changes
  • No obvious formatting issues in the diff

Action required: Rebase the PR branch to resolve the merge conflict, then re-trigger CI.

Wei Deng added 4 commits August 5, 2026 07:36
… pcie4_port0 and uart14

Add empty graph port/endpoint nodes to pcie4_port0 and uart14 in hamoa.dtsi
so that board files can reference the endpoint labels (pcie4_port0_ep,
uart14_ep) to describe connections to M.2 Key E connectors via
remote-endpoint overrides.

Suggested-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Signed-off-by: Wei Deng <wei.deng@oss.qualcomm.com>
Link: https://lore.kernel.org/all/20260804-hamoa-m2-dts-v2-v4-1-1b5ceac74538@oss.qualcomm.com/
Add 'compatible = "pciclass,0604"' to the pcie4_port0 node in hamoa.dtsi
to allow the PCI subsystem to associate the DT node with the PCI-to-PCI
bridge device, which is required for M.2 connector graph endpoint
association.

Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Signed-off-by: Wei Deng <wei.deng@oss.qualcomm.com>
Link: https://lore.kernel.org/all/20260804-hamoa-m2-dts-v2-v4-2-1b5ceac74538@oss.qualcomm.com/
…E connector

The Hamoa IoT EVK has a PCIe M.2 Mechanical Key E connector for wireless
connectivity cards exposing Wi-Fi over PCIe and Bluetooth over UART.

Describe the connector node with:
- port@0: PCIe for Wi-Fi, linked to pcie4_port0
- port@3: UART for Bluetooth, linked to uart14

This allows the pwrseq-pcie-m2 driver to manage card power and
dynamically create the UART serdev for UART BT variants of the M.2 card.

Remove the chip-specific wcn7850-pmu node, the static bluetooth serdev
under uart14, and the wifi@0 PCI child node, as the M.2 connector
approach replaces WCN7850-specific power sequencing with a chip-agnostic
model.

Also remove the now-unused vreg_wcn_0p95 and vreg_wcn_1p9 dummy fixed
regulators whose only consumers were the wcn7850-pmu node.

Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Reviewed-by: Manivannan Sadhasivam <mani@kernel.org>
Signed-off-by: Wei Deng <wei.deng@oss.qualcomm.com>
Link: https://lore.kernel.org/all/20260804-hamoa-m2-dts-v2-v4-3-1b5ceac74538@oss.qualcomm.com/
…E connector

The Purwa IoT EVK has a PCIe M.2 Mechanical Key E connector for wireless
connectivity cards exposing Wi-Fi over PCIe and Bluetooth over UART.
Purwa inherits hamoa.dtsi via purwa.dtsi and therefore reuses the PCIe
root port compatible and the uart14_ep / pcie4_port0_ep endpoint stub
labels added there.

Describe the connector node with:
- port@0: PCIe for Wi-Fi, linked to pcie4_port0
- port@3: UART for Bluetooth, linked to uart14

This allows the pwrseq-pcie-m2 driver to manage card power and
dynamically create the UART serdev for UART BT variants of the M.2 card.

Remove the chip-specific wcn7850-pmu node, the static bluetooth serdev
under uart14, and the wifi@0 PCI child node, as the M.2 connector
approach replaces WCN7850-specific power sequencing with a chip-agnostic
model.

Also remove the now-unused vreg_wcn_0p95 and vreg_wcn_1p9 dummy fixed
regulators whose only consumers were the wcn7850-pmu node.

Signed-off-by: Wei Deng <wei.deng@oss.qualcomm.com>
Link: https://lore.kernel.org/all/20260804-hamoa-m2-dts-v2-v4-4-1b5ceac74538@oss.qualcomm.com/
@WeiDeng-weiden weiden (WeiDeng-weiden) changed the title arm64: dts: qcom: hamoa-iot-evk: Describe the PCIe M.2 Key E connector arm64: dts: qcom: hamoa, purwa: Describe the PCIe M.2 Key E connector Aug 5, 2026
@qlijarvis

Copy link
Copy Markdown

🔨 Build Failure Analysis — PR #1629

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

# Error File:Line PR-introduced? Root Cause
1 Merge conflict arch/arm64/boot/dts/qcom/hamoa-iot-evk.dts Yes PR replaces wcn7850-pmu node with wifi-bt-connector, conflicts with existing integration branch changes
2 Merge conflict arch/arm64/boot/dts/qcom/purwa-iot-evk.dts Yes PR replaces wcn7850-pmu node with wifi-bt-connector, conflicts with existing integration branch changes

Verdict

This is not a compilation failure. The build failed during the merge phase when attempting to integrate PR #1629 with the baseline integration branch. Both conflicts are PR-introduced and occur because the PR modifies the same device tree sections that have been changed in the integration branch (topic/tech/all/dt/hamoa).

📎 Detailed analysis: Full report

@qlijarvis

Copy link
Copy Markdown

🔨 Build Failure Analysis — PR #1629

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

# Error File:Line PR-introduced? Root Cause
1 Git merge conflict arch/arm64/boot/dts/qcom/hamoa-iot-evk.dts No Integration branch topic/tech/all/dt/hamoa contains overlapping changes to wcn7850-pmu, regulators, and PCIe/UART sections that conflict with PR's removal/replacement of these nodes
2 Git merge conflict arch/arm64/boot/dts/qcom/purwa-iot-evk.dts No Integration branch topic/tech/all/dt/hamoa contains overlapping changes to wcn7850-pmu, regulators, and PCIe/UART sections that conflict with PR's removal/replacement of these nodes

Verdict

This is NOT a compilation failure. Both errors are git merge conflicts caused by the integration branch already containing changes to the same device tree sections that the PR modifies. The build never reached the compilation stage.

📎 Detailed analysis: Full report

@qlijarvis

Copy link
Copy Markdown

PR #1629 — validate-patch

PR: #1629

Verdict Issues Detailed Report
0 Full report

Final Summary

  1. Lore link present: Yes — all 4 commits have Link: tags pointing to the correct lore.kernel.org message-IDs from the v4 series
  2. Lore link matches PR commits: Yes — commit messages, authorship, tags, and code changes are faithful to the lore v4 series
  3. Upstream patch status: ⏳ In review — posted Aug 4, 2026 (today); has Reviewed-by from Konrad Dybcio (patches 2-3) and Manivannan Sadhasivam (patch 3); no merge/NAK signals yet (series is < 24 hours old)
  4. PR present in qcom-next/topics: Partial - 3/4 commit(s) only have partial integration evidence
Verdict: ✅ — click to expand

🔍 Patch Validation

PR: #1629 - arm64: dts: qcom: hamoa-iot-evk, purwa-iot-evk: Enable M.2 Key E connector (4 commits)
Upstream commits: https://lore.kernel.org/all/20260804-hamoa-m2-dts-v2-v4-0-1b5ceac74538@oss.qualcomm.com/
Verdict: ✅ PASS

Commit Message

Check Status Note
Subject matches upstream All 4 commits: FROMLIST prefix added correctly; base subject preserved
Body preserves rationale All commit bodies match lore patches verbatim
Fixes tag present/correct N/A No Fixes tags (new feature, not a bugfix)
Authorship preserved All commits: From: Wei Deng matches lore author
Backport note (if applicable) N/A FROMLIST patches (not yet merged upstream)
Reviewed-by tags Patch 2: Konrad Dybcio; Patch 3: Konrad Dybcio + Manivannan Sadhasivam; Patch 4: none (as in lore)
Link tags All 4 commits have correct lore.kernel.org Link: tags

Diff

File Status Notes
arch/arm64/boot/dts/qcom/hamoa.dtsi (patch 1/4) Identical code changes; line numbers differ (2107 vs 2025, 3728 vs 3785) due to tree state — expected for FROMLIST
arch/arm64/boot/dts/qcom/hamoa.dtsi (patch 2/4) Adds compatible = "pciclass,0604" to pcie4_port0 — matches lore
arch/arm64/boot/dts/qcom/hamoa-iot-evk.dts (patch 3/4) Large refactor replacing wcn7850-pmu with M.2 connector — matches lore structure
arch/arm64/boot/dts/qcom/purwa-iot-evk.dts (patch 4/4) Parallel refactor for purwa board — matches lore structure

Verdict

Merge as-is. All four commits faithfully represent the v4 patch series posted to lore.kernel.org on Aug 4, 2026. The FROMLIST prefix is correct, authorship is preserved, Reviewed-by tags match the lore thread, and diff content is identical (context line number differences are expected and acceptable for FROMLIST patches applied to a different tree state).

Final Summary

  1. Lore link present: Yes — all 4 commits have Link: tags pointing to the correct lore.kernel.org message-IDs from the v4 series
  2. Lore link matches PR commits: Yes — commit messages, authorship, tags, and code changes are faithful to the lore v4 series
  3. Upstream patch status: ⏳ In review — posted Aug 4, 2026 (today); has Reviewed-by from Konrad Dybcio (patches 2-3) and Manivannan Sadhasivam (patch 3); no merge/NAK signals yet (series is < 24 hours old)
  4. PR present in qcom-next/topics: Partial — per integration_presence_report.md: commit 2/4 fully present in qcom-next; commits 1/4, 3/4, 4/4 have partial evidence (subject or partial tree match) but full changes not yet verified in qcom-next or topics branches

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

Commit Subject qcom-next topics Final
1/4 [PATCH 1/4] FROMLIST: arm64: dts: qcom: hamoa: Add graph 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/4 [PATCH 2/4] FROMLIST: arm64: dts: qcom: hamoa: Add compatible to the present - all checked added lines are present skipped - not checked because qcom-next already contains the change present
3/4 [PATCH 3/4] FROMLIST: arm64: dts: qcom: hamoa-iot-evk: Describe the partial - subject or partial tree evidence found, but full change was not verified missing - no subject, patch-id, or full tree-content match found partial
4/4 [PATCH 4/4] FROMLIST: arm64: dts: qcom: purwa-iot-evk: Describe the partial - subject or partial tree evidence found, but full change was not verified missing - no subject, patch-id, or full tree-content match found partial

Final Status

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

@qlijarvis

Copy link
Copy Markdown

PR #1629 — checker-log-analyzer

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

Checker Result Summary
Checker Result Summary
checkpatch Merge conflict - unable to run
dt-binding-check Merge conflict - unable to run
dtb-check Merge conflict - unable to run
sparse-check Merge conflict - unable to run
check-uapi-headers Merge conflict - unable to run
check-patch-compliance Merge conflict - unable to run
tag-check ⏭️ Skipped (qcom-next branch - prefix not required)

Detailed report: Full report

Checker analysis — click to expand

🤖 CI Checker Analysis (checker-log-analyzer)

PR: #1629 - FROMLIST: arm64: dts: qcom: hamoa/purwa M.2 Key E connector support
Source: https://github.com/qualcomm-linux/kernel-config/actions/runs/30975058014
Target branch: qcom-next (confirmed via integration_presence_report.md)

Checker Result Summary
checkpatch Merge conflict - unable to run
dt-binding-check Merge conflict - unable to run
dtb-check Merge conflict - unable to run
sparse-check Merge conflict - unable to run
check-uapi-headers Merge conflict - unable to run
check-patch-compliance Merge conflict - unable to run
tag-check ⏭️ Skipped (qcom-next branch - prefix not required)

❌ All Checkers — Merge Conflict Blocker

Root cause: The PR cannot be merged cleanly into the target branch due to conflicts in two DTS files.

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.
##[error]Process completed with exit code 3.

All six checker jobs (checkpatch, dt-binding-check, dtb-check, sparse-check, check-uapi-headers, check-patch-compliance) failed at the merge stage before they could analyze the patches. The CI workflow attempts to merge the PR branch into the target branch (qcom-next) to validate the integrated result, but this merge failed due to conflicts.

Analysis:

The conflicts are in the two board DTS files that this PR modifies:

  • arch/arm64/boot/dts/qcom/hamoa-iot-evk.dts (modified by patch 3/4)
  • arch/arm64/boot/dts/qcom/purwa-iot-evk.dts (modified by patch 4/4)

This indicates that changes have been merged into qcom-next since this PR branch was created that overlap with the same sections of these files. The integration_presence_report.md confirms this: patches 2/4 is already "present" in qcom-next, and patches 1/4, 3/4, 4/4 show "partial" presence, meaning some related changes exist but not the full patches.

Fix:

Rebase the PR branch onto the latest qcom-next:

# In the PR branch
git fetch origin qcom-next
git rebase origin/qcom-next

# Resolve conflicts in hamoa-iot-evk.dts and purwa-iot-evk.dts
# The conflicts are likely in the wcn7850-pmu / wifi-bt-connector sections
# that this PR is refactoring

git add arch/arm64/boot/dts/qcom/hamoa-iot-evk.dts
git add arch/arm64/boot/dts/qcom/purwa-iot-evk.dts
git rebase --continue

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

Reproduce locally:

git clone https://github.com/qualcomm-linux/kernel-topics
cd kernel-topics
git fetch origin pull/1629/head:pr-1629
git checkout pr-1629
git fetch origin qcom-next
git merge origin/qcom-next
# Conflicts will appear in hamoa-iot-evk.dts and purwa-iot-evk.dts

✅ Patch Quality Pre-Analysis (based on pr.patch)

Since the checkers couldn't run, I performed a manual review of the patch file:

Positive findings:

  • ✅ All 4 commits have proper FROMLIST: prefix
  • ✅ All 4 commits have valid Link: tags pointing to lore.kernel.org
  • ✅ All commits have proper Signed-off-by: trailers
  • ✅ Patches 3/4 and 4/4 have Reviewed-by: tags from maintainers (Konrad Dybcio, Manivannan Sadhasivam)
  • ✅ Commit messages are well-structured with clear descriptions
  • ✅ Changes are DTS-only (no C/H files modified)
  • ✅ No obvious checkpatch issues visible in the diff (proper indentation, no trailing whitespace)

Expected checker results after rebase:

  • checkpatch: Should PASS (no style issues visible)
  • dt-binding-check: Should SKIP (no binding YAML changes)
  • dtb-check: Should PASS or SKIP (DTS changes look valid; may skip if no new DTBs built)
  • sparse-check: Should SKIP (no C files changed)
  • check-uapi-headers: Should SKIP (no C/H files changed)
  • check-patch-compliance: Should PASS (all commits have FROMLIST: + Link: + proper author)

📋 tag-check — N/A (qcom-next branch)

Status: ⏭️ Skipped

Reason: The target branch is qcom-next. According to the checker-log-analyzer skill, subject-line prefix tags are not required for commits targeting qcom-next or qcom-next-staging branches.

Note: All 4 commits in this PR do have the FROMLIST: prefix, which is good practice and will satisfy check-patch-compliance, but it is not mandatory for qcom-next.


Verdict

❌ BLOCKER: Merge conflicts must be resolved before checkers can run.

The PR cannot be merged or validated until the conflicts in hamoa-iot-evk.dts and purwa-iot-evk.dts are resolved. Once rebased onto the latest qcom-next, all checkers should pass cleanly based on the patch quality observed.

Recommended action:

  1. Rebase PR arm64: dts: qcom: hamoa, purwa: Describe the PCIe M.2 Key E connector #1629 onto the latest qcom-next HEAD
  2. Resolve conflicts in the two board DTS files
  3. Force-push the rebased branch to trigger a new CI run
  4. All checkers should pass after rebase

@WeiDeng-weiden

Copy link
Copy Markdown
Author

The merge conflict in hamoa-iot-evk.dts and purwa-iot-evk.dts is caused by existing workaround commits on tech/all/workaround:

  • f2ee870 WORKAROUND: arm64: dts: qcom: hamoa-iot-evk: support Bluetooth over both USB and UART
  • 3aff695 WORKAROUND: arm64: dts: qcom: purwa-iot-evk: support Bluetooth over both USB and UART

These WA commits modify wcn7850-pmu and add vreg_wcn_bt_en, which conflicts with this PR's removal of the same nodes during the CI
integration merge.

The corresponding WA revert (PR #1627) will follow up once this PR is merged.

@WeiDeng-weiden

Copy link
Copy Markdown
Author

Hi Salendarsingh Gaud (@sgaud-quic)
Could you please review this?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants