Skip to content

FROMLIST: arm64: dts: qcom: Add M.2 QCC2072 support on qcs6490-rb3gen2 industrial mezzanine#1278

Open
rahul-samana wants to merge 2 commits into
qualcomm-linux:tech/all/dt/qcs6490from
rahul-samana:qcs6490_indus_mezz_cologne_m2
Open

FROMLIST: arm64: dts: qcom: Add M.2 QCC2072 support on qcs6490-rb3gen2 industrial mezzanine#1278
rahul-samana wants to merge 2 commits into
qualcomm-linux:tech/all/dt/qcs6490from
rahul-samana:qcs6490_indus_mezz_cologne_m2

Conversation

@rahul-samana
Copy link
Copy Markdown

Add the new compatible string for the QCC2072 BT SoC to the
Qualcomm Bluetooth DT binding schema.
Add DTS support for M.2 QCC2072 on Qualcomm qcs6490-rb3gen2
industrial mezzanine board.

Add the new compatible string for the QCC2072 BT SoC to the
Qualcomm Bluetooth DT binding schema.

Signed-off-by: Rahul Samana <rahul.samana@oss.qualcomm.com>
Link: https://lore.kernel.org/all/20260529175342.3363935-1-yepuri.siddu@oss.qualcomm.com/
@qcomlnxci qcomlnxci requested review from a team, Komal-Bajaj, jingyiwang42 and mukeshojha-linux and removed request for a team May 29, 2026 18:25
@qlijarvis
Copy link
Copy Markdown

🔨 Build Failure Analysis — PR #1278

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

# Error File:Line PR-introduced? Root Cause
1 Merge conflict during git merge arch/arm64/boot/dts/qcom/Makefile Yes PR adds new DTB entries to Makefile section that was modified by topic branch topic/tech/all/dt/qcs6490, causing content conflict

Verdict

This is a merge conflict, not a compilation error. The PR-introduced changes conflict with the integration branch baseline.

📎 Detailed analysis: Full report

@qlijarvis
Copy link
Copy Markdown

🔨 Build Failure Analysis — PR #1278

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

# Error File:Line PR-introduced? Root Cause
1 Merge conflict arch/arm64/boot/dts/qcom/Makefile:175-182 No (Integration conflict) PR changes conflict with topic branch topic/tech/all/dt/qcs6490 already merged into integration branch

Verdict

This is not a compilation error. The build failed during the merge phase due to a conflict between PR #1278 and the existing topic/tech/all/dt/qcs6490 topic branch in the integration tree. No code was compiled.

📎 Detailed analysis: Full report

@qlijarvis
Copy link
Copy Markdown

PR #1278 — validate-patch

PR: #1278

Verdict Issues Detailed Report
0 Full report

Final Summary

  1. Lore link present: Yes — both commits have valid lore.kernel.org links
  2. Lore link matches PR commits: Cannot verify — network access restricted; unable to fetch upstream patches for diff comparison
  3. Upstream patch status: ⏳ Decision Pending — cannot verify acceptance/rejection without network access to lore thread
  4. PR present in qcom-next: No — neither commit found in qcom-next branch

Overall verdict:FAIL — Missing original author's Signed-off-by in both commits violates DCO and attribution requirements for FROMLIST commits.

Verdict: ❌ — click to expand

🔍 Patch Validation Report

PR: #1278
Verdict: ❌ FAIL


Commit 1: FROMLIST: dt-bindings: net: bluetooth: qcom: document QCC2072

Upstream: https://lore.kernel.org/all/20260529175342.3363935-1-yepuri.siddu@oss.qualcomm.com/

Commit Message

Check Status Note
Subject matches upstream ⏭️ Skipped Cannot fetch lore patch (network restricted)
Body preserves rationale ⏭️ Skipped Cannot fetch lore patch (network restricted)
Fixes tag present/correct ✅ Pass No Fixes tag needed (new binding)
Authorship preserved FAIL Original author's Signed-off-by missing — lore message-ID shows author yepuri.siddu@oss.qualcomm.com, but only rahul.samana@oss.qualcomm.com appears in commit
Backport note N/A Not a backport

Diff

File Status Notes
Documentation/devicetree/bindings/net/bluetooth/qcom,qcc2072-bt.yaml ⏭️ Skipped Cannot compare without upstream patch

Commit 2: FROMLIST: arm64: dts: qcom: Add M.2 QCC2072 support on qcs6490-rb3gen2 industrial mezzanine

Upstream: https://lore.kernel.org/all/20260529180234.3373056-1-yepuri.siddu@oss.qualcomm.com/

Commit Message

Check Status Note
Subject matches upstream ⏭️ Skipped Cannot fetch lore patch (network restricted)
Body preserves rationale ⏭️ Skipped Cannot fetch lore patch (network restricted)
Fixes tag present/correct ✅ Pass No Fixes tag needed (new feature)
Authorship preserved FAIL Original author's Signed-off-by missing — lore message-ID shows author yepuri.siddu@oss.qualcomm.com, but only rahul.samana@oss.qualcomm.com appears in commit
Backport note N/A Not a backport

Diff

File Status Notes
arch/arm64/boot/dts/qcom/Makefile ⏭️ Skipped Cannot compare without upstream patch
arch/arm64/boot/dts/qcom/qcs6490-rb3gen2-industrial-mezzanine-m2-cologne.dtso ⏭️ Skipped Cannot compare without upstream patch
arch/arm64/boot/dts/qcom/qcs6490-rb3gen2-industrial-mezzanine.dtso ⏭️ Skipped Cannot compare without upstream patch

Issues Found

Critical: Missing original author attribution (both commits)

For FROMLIST: commits, the original lore patch author must appear in the Signed-off-by: chain, even when the submitter (who cherry-picked and added the FROMLIST: prefix) is different.

Current state:

From: Rahul Samana <rahul.samana@oss.qualcomm.com>
Signed-off-by: Rahul Samana <rahul.samana@oss.qualcomm.com>

Expected state (based on lore message-IDs showing yepuri.siddu@oss.qualcomm.com as author):

From: Rahul Samana <rahul.samana@oss.qualcomm.com>
Signed-off-by: Siddartha Yepuri <yepuri.siddu@oss.qualcomm.com>
Signed-off-by: Rahul Samana <rahul.samana@oss.qualcomm.com>

The submitter (Rahul Samana) is legitimately in From: for FROMLIST: commits, but the original author's Signed-off-by: must be preserved to maintain proper attribution and the Developer Certificate of Origin (DCO) chain.


Upstream Patch Status

Commit Community Verdict
dt-bindings: net: bluetooth: qcom: document QCC2072 Decision Pending — cannot verify (network restricted); lore link present but not fetched
arm64: dts: qcom: Add M.2 QCC2072 support Decision Pending — cannot verify (network restricted); lore link present but not fetched

qcom-next Presence

Commit Status
dt-bindings: net: bluetooth: qcom: document QCC2072 ⚠️ Not in qcom-next — searched by subject, no match found
arm64: dts: qcom: Add M.2 QCC2072 support ⚠️ Not in qcom-next — searched by subject, no match found

Recommendation

Do not merge until the following issue is corrected:

  1. Add the original author's Signed-off-by — Both commits must include Signed-off-by: Siddartha Yepuri <yepuri.siddu@oss.qualcomm.com> (the lore patch author, inferred from message-ID yepuri.siddu@oss.qualcomm.com) before the submitter's Signed-off-by.

How to fix:

# For each commit, amend to add the original author's Signed-off-by:
git commit --amend -s --signoff="Siddartha Yepuri <yepuri.siddu@oss.qualcomm.com>"
# Then add your own:
git commit --amend -s

Or manually edit the commit message to insert the original author's Signed-off-by line before yours.


Final Summary

  1. Lore link present: Yes — both commits have valid lore.kernel.org links
  2. Lore link matches PR commits: Cannot verify — network access restricted; unable to fetch upstream patches for diff comparison
  3. Upstream patch status: ⏳ Decision Pending — cannot verify acceptance/rejection without network access to lore thread
  4. PR present in qcom-next: No — neither commit found in qcom-next branch

Overall verdict:FAIL — Missing original author's Signed-off-by in both commits violates DCO and attribution requirements for FROMLIST commits.

@qlijarvis
Copy link
Copy Markdown

PR #1278 — checker-log-analyzer

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

Checker Result Summary
Checker Result Summary
checkpatch Merge conflict - CI infrastructure issue
dt-binding-check Merge conflict - CI infrastructure issue
dtb-check Merge conflict - CI infrastructure issue
sparse-check Merge conflict - CI infrastructure issue
check-uapi-headers Merge conflict - CI infrastructure issue
check-patch-compliance Merge conflict - CI infrastructure issue
tag-check N/A Skipped (target branch is qcom-next)

Detailed report: Full report

Checker analysis — click to expand

🤖 CI Checker Analysis (checker-log-analyzer)

PR: #1278 - Add M.2 QCC2072 Bluetooth support on qcs6490-rb3gen2 industrial mezzanine
Source: https://github.com/qualcomm-linux/kernel-config/actions/runs/26654754252
Target branch: qcom-next

Checker Result Summary
checkpatch Merge conflict - CI infrastructure issue
dt-binding-check Merge conflict - CI infrastructure issue
dtb-check Merge conflict - CI infrastructure issue
sparse-check Merge conflict - CI infrastructure issue
check-uapi-headers Merge conflict - CI infrastructure issue
check-patch-compliance Merge conflict - CI infrastructure issue
tag-check N/A Skipped (target branch is qcom-next)

❌ All Checkers — Merge Conflict (CI Infrastructure Issue)

Root cause: The CI workflow failed to merge PR #1278 with the integration branch due to a merge conflict in arch/arm64/boot/dts/qcom/Makefile.

Failure details:

2026-05-29T18:43:22.7156413Z  ** Merging topic branch: topic/tech/all/dt/qcs6490
2026-05-29T18:43:23.6488236Z Auto-merging arch/arm64/boot/dts/qcom/kodiak.dtsi
2026-05-29T18:43:23.7334650Z Done, merged 1 topic(s).
2026-05-29T18:43:24.5638315Z From https://github.com/qualcomm-linux/kernel-topics
2026-05-29T18:43:24.5638895Z  * [new ref]                   refs/pull/1278/head -> pr-1278
2026-05-29T18:43:24.5825086Z Merging pr-1278 (no-commit)...
2026-05-29T18:43:25.6211872Z Auto-merging arch/arm64/boot/dts/qcom/Makefile
2026-05-29T18:43:25.6212508Z CONFLICT (content): Merge conflict in arch/arm64/boot/dts/qcom/Makefile
2026-05-29T18:43:25.6846821Z Automatic merge failed; fix conflicts and then commit the result.
2026-05-29T18:43:25.6968908Z Merge failed or conflicts detected. Aborting merge.
2026-05-29T18:43:25.8319648Z ##[error]Process completed with exit code 3.

Analysis:

The CI workflow attempts to:

  1. Create an integration branch based on qcom-next baseline (commit df3ae9703774)
  2. Merge topic branch topic/tech/all/dt/qcs6490
  3. Merge PR FROMLIST: arm64: dts: qcom: Add M.2 QCC2072 support on qcs6490-rb3gen2 industrial mezzanine #1278

The merge conflict occurs at step 3 when merging PR #1278 into the integration branch that already includes changes from topic/tech/all/dt/qcs6490. Both the topic branch and PR #1278 modify the same region of arch/arm64/boot/dts/qcom/Makefile (the qcs6490-rb3gen2 dtb entries around line 175-180).

This is a CI infrastructure/workflow issue, not a patch defect. The patches themselves appear well-formed:

  • Both commits have proper FROMLIST: prefix tags
  • Both have Link: tags pointing to lore.kernel.org
  • Both have Signed-off-by: tags
  • The changes are DT-only (binding + DTS files)

Fix:

The PR author needs to rebase the PR on top of the current qcom-next branch that includes the topic/tech/all/dt/qcs6490 changes, then resolve the Makefile conflict manually:

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

# Resolve the conflict in arch/arm64/boot/dts/qcom/Makefile
# The conflict will be in the qcs6490-rb3gen2 dtb entries section
# Manually merge both sets of changes, keeping all dtb entries

git add arch/arm64/boot/dts/qcom/Makefile
git rebase --continue
git push --force-with-lease

Reproduce locally:

git clone https://github.com/qualcomm-linux/kernel.git
cd kernel
git checkout qcom-next
git fetch https://github.com/qualcomm-linux/kernel-topics.git refs/pull/1278/head:pr-1278
git merge pr-1278
# Conflict will appear in arch/arm64/boot/dts/qcom/Makefile

Patch Content Review (Pre-Merge Analysis)

Since no checkers could run due to the merge conflict, I performed a manual review of the patch content:

Commit 1/2: FROMLIST: dt-bindings: net: bluetooth: qcom: document QCC2072

  • ✅ Adds new DT binding YAML for QCC2072 Bluetooth
  • ✅ Proper YAML structure with required fields
  • ✅ References common schemas correctly
  • ✅ Has FROMLIST: prefix and Link: tag

Commit 2/2: FROMLIST: arm64: dts: qcom: Add M.2 QCC2072 support on qcs6490-rb3gen2 industrial mezzanine

  • ✅ Adds new DTSO files for M.2 QCC2072 support
  • ✅ Updates Makefile to build new DTBs
  • ✅ Has FROMLIST: prefix and Link: tag
  • ⚠️ Makefile changes conflict with topic/tech/all/dt/qcs6490

Verdict

Cannot merge until merge conflict is resolved. The PR requires a rebase on the current qcom-next branch to resolve the Makefile conflict. Once rebased, the CI checkers should run successfully as the patch content appears well-formed and follows kernel coding standards.

Action required: PR author must rebase and resolve the arch/arm64/boot/dts/qcom/Makefile conflict.

…2 industrial mezzanine

Add DTS support for M.2 QCC2072 on Qualcomm qcs6490-rb3gen2
industrial mezzanine board.

Signed-off-by: Rahul Samana <rahul.samana@oss.qualcomm.com>
Link: https://lore.kernel.org/all/20260529180234.3373056-1-yepuri.siddu@oss.qualcomm.com/
@rahul-samana rahul-samana force-pushed the qcs6490_indus_mezz_cologne_m2 branch from b2d86f0 to d9e7701 Compare May 29, 2026 19:28
@qcomlnxci qcomlnxci requested a review from a team May 29, 2026 19:30
@qlijarvis
Copy link
Copy Markdown

🔨 Build Failure Analysis — PR #1278

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

# Error File:Line PR-introduced? Root Cause
1 Merge conflict arch/arm64/boot/dts/qcom/Makefile:175-181 Yes PR adds new DTB entries that conflict with existing changes in the integration branch

Verdict

This is a merge conflict, not a compilation error. The build failed before reaching the compilation stage. The PR introduces changes to the Makefile that conflict with the current state of the integration branch.

📎 Detailed analysis: Full report

@qlijarvis
Copy link
Copy Markdown

🔨 Build Failure Analysis — PR #1278

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

# Error File:Line PR-introduced? Root Cause
1 Merge conflict arch/arm64/boot/dts/qcom/Makefile Yes PR modifies Makefile lines that conflict with topic branch topic/tech/all/dt/qcs6490

Verdict

This is not a compilation failure. The build failed due to a merge conflict introduced by this PR when merging with the existing topic branch topic/tech/all/dt/qcs6490. The PR needs to be rebased or the Makefile conflict needs to be resolved.

📎 Detailed analysis: Full report

@qlijarvis
Copy link
Copy Markdown

PR #1278 — validate-patch

PR: #1278

Verdict Issues Detailed Report
3 Full report

Final Summary

  1. Lore link present: Yes — both commits have properly formatted lore.kernel.org links
  2. Lore link matches PR commits: Cannot verify — network access restricted; unable to fetch upstream patches for diff comparison
  3. Upstream patch status: ⏳ Decision Pending — patches posted to lore.kernel.org on 2026-05-29 (today); too recent to have merge decision; cannot verify thread status due to network restrictions
  4. PR present in qcom-next: No — files not found in qcom-next branch (qcom,qcc2072-bt.yaml and qcs6490-rb3gen2-industrial-mezzanine-m2-cologne.dtso do not exist)
Verdict: ❌ — click to expand

🔍 Patch Validation

PR: #1278 - Add QCC2072 Bluetooth support for qcs6490-rb3gen2 industrial mezzanine
Upstream commits:

Commit Message

Check Commit 1 Commit 2 Note
Subject matches upstream ⏭️ ⏭️ Cannot verify - network restricted
Body preserves rationale ⏭️ ⏭️ Cannot verify - network restricted
Fixes tag present/correct N/A N/A No Fixes tag (new feature)
Authorship preserved CRITICAL: Missing original author's Signed-off-by
Backport note N/A N/A FROMLIST prefix used (correct)

Diff

File Status Notes
Documentation/devicetree/bindings/net/bluetooth/qcom,qcc2072-bt.yaml ⏭️ Cannot verify against lore - network restricted
arch/arm64/boot/dts/qcom/Makefile ⏭️ Cannot verify against lore - network restricted
arch/arm64/boot/dts/qcom/qcs6490-rb3gen2-industrial-mezzanine-m2-cologne.dtso ⏭️ Cannot verify against lore - network restricted
arch/arm64/boot/dts/qcom/qcs6490-rb3gen2-industrial-mezzanine.dtso ⏭️ Cannot verify against lore - network restricted

Issues

CRITICAL AUTHORSHIP VIOLATION (both commits):

Both commits use the FROMLIST: prefix, which is correct for patches posted to the mailing list but not yet merged. However, they violate the Developer Certificate of Origin (DCO) chain of custody:

  1. Commit 1 - FROMLIST: dt-bindings: net: bluetooth: qcom: document QCC2072

    • Lore message-ID: 20260529175342.3363935-1-yepuri.siddu@oss.qualcomm.com
    • Original author (from message-ID): yepuri.siddu@oss.qualcomm.com
    • PR submitter: rahul.samana@oss.qualcomm.com
    • Issue: Only Rahul Samana's Signed-off-by: is present; the original author's Signed-off-by: is missing
  2. Commit 2 - FROMLIST: arm64: dts: qcom: Add M.2 QCC2072 support on qcs6490-rb3gen2 industrial mezzanine

    • Lore message-ID: 20260529180234.3373056-1-yepuri.siddu@oss.qualcomm.com
    • Original author (from message-ID): yepuri.siddu@oss.qualcomm.com
    • PR submitter: rahul.samana@oss.qualcomm.com
    • Issue: Only Rahul Samana's Signed-off-by: is present; the original author's Signed-off-by: is missing

Per the validate-patch skill FROMLIST authorship rule:

  • The submitter (Rahul Samana) can legitimately appear in From: when cherry-picking a FROMLIST: patch
  • BUT: The original lore patch author's Signed-off-by: MUST be present in the commit message
  • Missing the original author's Signed-off-by: breaks the DCO chain and is a FAIL condition

Required fix:
Add the original author's Signed-off-by: line to both commits:

Signed-off-by: Siddu Yepuri <yepuri.siddu@oss.qualcomm.com>
Signed-off-by: Rahul Samana <rahul.samana@oss.qualcomm.com>

The original author's Signed-off-by: must come first (in chronological order), followed by the submitter's.

Verdict

Do not merge. Both commits violate DCO requirements by omitting the original author's Signed-off-by: line. The lore message-IDs clearly indicate the original author is yepuri.siddu@oss.qualcomm.com, but this attribution is completely absent from the commit messages. This must be corrected before the PR can be accepted.

Final Summary

  1. Lore link present: Yes — both commits have properly formatted lore.kernel.org links
  2. Lore link matches PR commits: Cannot verify — network access restricted; unable to fetch upstream patches for diff comparison
  3. Upstream patch status: ⏳ Decision Pending — patches posted to lore.kernel.org on 2026-05-29 (today); too recent to have merge decision; cannot verify thread status due to network restrictions
  4. PR present in qcom-next: No — files not found in qcom-next branch (qcom,qcc2072-bt.yaml and qcs6490-rb3gen2-industrial-mezzanine-m2-cologne.dtso do not exist)

@qlijarvis
Copy link
Copy Markdown

PR #1278 — checker-log-analyzer

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

Checker Result Summary
Checker Result Summary
checkpatch Merge conflict - CI infrastructure issue
dt-binding-check Merge conflict - CI infrastructure issue
dtb-check Merge conflict - CI infrastructure issue
sparse-check Merge conflict - CI infrastructure issue
check-uapi-headers Merge conflict - CI infrastructure issue
check-patch-compliance Merge conflict - CI infrastructure issue
tag-check Both commits have valid FROMLIST: prefix

Detailed report: Full report

Checker analysis — click to expand

🤖 CI Checker Analysis (checker-log-analyzer)

PR: #1278 - FROMLIST: dt-bindings: net: bluetooth: qcom: document QCC2072 + Add M.2 QCC2072 support on qcs6490-rb3gen2
Source: https://github.com/qualcomm-linux/kernel-config/actions/runs/26657885398

Checker Result Summary
checkpatch Merge conflict - CI infrastructure issue
dt-binding-check Merge conflict - CI infrastructure issue
dtb-check Merge conflict - CI infrastructure issue
sparse-check Merge conflict - CI infrastructure issue
check-uapi-headers Merge conflict - CI infrastructure issue
check-patch-compliance Merge conflict - CI infrastructure issue
tag-check Both commits have valid FROMLIST: prefix

❌ All Checkers — Merge Conflict (CI Infrastructure Issue)

Root cause: All checker jobs failed during the CI merge step due to a merge conflict in arch/arm64/boot/dts/qcom/Makefile when merging PR #1278 with the topic branch topic/tech/all/dt/qcs6490.

Failure details:

Auto-merging arch/arm64/boot/dts/qcom/Makefile
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/qcom/Makefile
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 is a CI infrastructure/integration issue, not a patch defect. The PR adds a new DTS file entry to the Makefile, and the topic branch topic/tech/all/dt/qcs6490 has conflicting changes in the same region of the Makefile.

Fix:

Option 1 (Recommended): Rebase the PR on the latest topic branch to resolve the conflict:

# Fetch the latest topic branch
git fetch origin topic/tech/all/dt/qcs6490

# Rebase PR on the topic branch
git rebase origin/topic/tech/all/dt/qcs6490

# Resolve the Makefile conflict by adding the new entry in alphabetical order
# Edit arch/arm64/boot/dts/qcom/Makefile
git add arch/arm64/boot/dts/qcom/Makefile
git rebase --continue

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

Option 2: Wait for the topic branch to be merged/updated, then re-trigger CI.

Option 3: Manually resolve the conflict by ensuring the new DTS entry qcs6490-rb3gen2-m2-qcc2072.dtbo is added in alphabetical order in the Makefile alongside any other new entries from the topic branch.

Note: The checkers themselves did not run because the merge failed before any checker logic executed. Once the merge conflict is resolved, all checkers should run successfully (assuming no other issues).

✅ tag-check

Status: PASS

Both commits have valid subject prefixes:

  • Commit 1: FROMLIST: dt-bindings: net: bluetooth: qcom: document QCC2072
  • Commit 2: FROMLIST: arm64: dts: qcom: Add M.2 QCC2072 support on qcs6490-rb3gen2 industrial mezzanine

Both commits include proper Link: tags pointing to lore.kernel.org, indicating they are posted upstream patches.

Verdict

Cannot assess patch quality — all checkers failed due to a merge conflict in the CI integration step. This is a CI infrastructure issue, not a patch defect.

Action required: Resolve the Makefile merge conflict by rebasing the PR on the latest topic/tech/all/dt/qcs6490 branch, then re-trigger CI to get actual checker results.

The patches themselves appear well-formed (proper FROMLIST: prefixes, Link: tags, and Signed-off-by: lines), but cannot be validated until the merge conflict is resolved and checkers run successfully.

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