Skip to content

QCLINUX: Revert old RB3 Gen 2 QCC2072 workaround - #1597

Merged
Shiraz Hashim (shashim-quic) merged 4 commits into
qualcomm-linux:tech/all/workaroundfrom
rahul-samana:rb3gen2-drop-old-qcc2072-workaround
Aug 6, 2026
Merged

QCLINUX: Revert old RB3 Gen 2 QCC2072 workaround#1597
Shiraz Hashim (shashim-quic) merged 4 commits into
qualcomm-linux:tech/all/workaroundfrom
rahul-samana:rb3gen2-drop-old-qcc2072-workaround

Conversation

@rahul-samana

@rahul-samana Rahul Samana (rahul-samana) commented Jul 28, 2026

Copy link
Copy Markdown

Remove the old downstream QCC2072 workaround enablement for the RB3 Gen 2
Industrial mezzanine.

Depends-on: #1596

The old workaround added the m2-cologne overlay and static Bluetooth DT
model directly in tech/all/workaround. That approach is now replaced by the
upstream-posted M.2 power sequencing model carried by PR #1596.

This PR reverts the old workaround commits so qcom-next can converge on the
new bt-uart overlay and M.2 connector graph model.

CRs-Fixed: 4615698

@qcomlnxci
qcomlnxci requested review from a team, Nicolas Dechesne (ndechesne), Kaushal Kumar (quic-kaushalk) and yijiyang and removed request for a team July 28, 2026 10:28
@qcomlnxci

Copy link
Copy Markdown

CI build failed due to invalid or unmerged dependencies: #https

1 similar comment
@qcomlnxci

Copy link
Copy Markdown

CI build failed due to invalid or unmerged dependencies: #https

@qlijarvis

Copy link
Copy Markdown

🔨 Build Failure Analysis — PR #1597

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

# Error File:Line PR-introduced? Root Cause
1 CI dependency validation failure N/A No CI workflow incorrectly parsed Depends-on: https://github.com/qualcomm-linux/kernel-topics/pull/1596 as dependency "#https" instead of PR #1596

Verdict

This is not a compilation error. The build failed during CI dependency validation due to a workflow parsing bug. The PR code changes are valid reverts that do not introduce any compilation errors.

📎 Detailed analysis: Full report

@qlijarvis

Copy link
Copy Markdown

🔨 Build Failure Analysis — PR #1597

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

# Error File:Line PR-introduced? Root Cause
1 CI dependency parsing failure N/A (pre-build) No CI script bug: cut -d ':' -f2 incorrectly parses Depends-on: https://... URLs, extracting only https instead of the full URL or PR number

Verdict

This is not a compilation failure. The build failed during the dependency resolution phase due to a CI script parsing bug that cannot correctly handle full GitHub URLs in Depends-on: declarations. The PR code changes are not at fault.

📎 Detailed analysis: Full report

@qlijarvis

Copy link
Copy Markdown

PR #1597 — validate-patch

PR: #1597

Verdict Issues Detailed Report
⚠️ 1 Full report

Final Summary

  1. Lore link present: No — QCLINUX: prefix; no lore link expected or required
  2. Lore link matches PR commits: N/A — no lore link to compare against
  3. Upstream patch status: N/A — vendor-only changes, not posted upstream
  4. PR present in qcom-next/topics: Partial - 1/4 commit(s) only have partial integration evidence
Verdict: ⚠️ — click to expand

🔍 Patch Validation

PR: #1597 - Revert QCC2072 FROMLIST patches
Upstream commit: N/A (vendor-only QCLINUX: reverts)
Verdict: ⚠️ PARTIAL

Commit Message

Check Status Note
Subject matches upstream N/A QCLINUX: vendor-only reverts; no upstream to match
Body preserves rationale Proper revert format with commit SHA and CRs-Fixed tag
Fixes tag present/correct N/A Revert commits; CRs-Fixed tag present instead
Authorship preserved Consistent authorship across all 4 commits
Backport note (if applicable) N/A Not a backport

Diff

File Status Notes
drivers/bluetooth/btqca.c (1/4) Clean revert of QCC2072 NVM/calibration combination logic
arch/arm64/boot/dts/qcom/* (2/4) Clean revert of M.2 QCC2072 device tree overlay
drivers/bluetooth/btqca.c (3/4) ⚠️ Revert of QCC2072 support - only partial integration evidence
Documentation/devicetree/bindings/* (4/4) Clean revert of QCC2072 dt-bindings documentation

Issues

  • Commit 3/4 integration concern: The revert of "FROMLIST: Bluetooth: qca: add QCC2072 support" shows only partial evidence in the topics branch (subject or partial tree match found, but full change not verified by patch-id). This suggests the revert may not have been fully integrated or tested in the topic branch workflow.

Verdict

Merge with caution. Three of four commits have verified patch-id matches in topics branch. Commit 3/4 requires manual verification that the revert is complete and correct.

Final Summary

  1. Lore link present: No — QCLINUX: prefix; no lore link expected or required
  2. Lore link matches PR commits: N/A — no lore link to compare against
  3. Upstream patch status: N/A — vendor-only changes, not posted upstream
  4. PR present in qcom-next/topics: Partial — 3/4 commits have verified patch-id matches in topics branch; commit 3/4 (Revert "FROMLIST: Bluetooth: qca: add QCC2072 support") shows only partial integration evidence (subject or partial tree match, but full change 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: 07f50dc44eddcf748a99d1a7523a466438bfffa6
topics remote: topics -> https://github.com/qualcomm-linux/kernel-topics
topics fetch: fetched

Commit Subject qcom-next topics Final
1/4 [PATCH 1/4] QCLINUX: Revert "FROMLIST: Bluetooth: qca: combine NVM missing - no subject, patch-id, or full tree-content match found present - exact patch-id match at ac0efd1 present
2/4 [PATCH 2/4] QCLINUX: Revert "FROMLIST: arm64: dts: qcom: Add M.2 missing - no subject, patch-id, or full tree-content match found present - exact patch-id match at 5315e13 present
3/4 [PATCH 3/4] QCLINUX: Revert "FROMLIST: Bluetooth: qca: add QCC2072 missing - no subject, patch-id, or full tree-content match found partial - subject or partial tree evidence found, but full change was not verified partial
4/4 [PATCH 4/4] QCLINUX: Revert "FROMLIST: dt-bindings: net: bluetooth: missing - no subject, patch-id, or full tree-content match found present - exact patch-id match at 1de2ab6 present

Final Status

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

@qlijarvis

Copy link
Copy Markdown

PR #1597 — checker-log-analyzer

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

Checker Result Summary
Checker Result Summary
checkpatch Merge conflict - checker did not run
dt-binding-check Merge conflict - checker did not run
dtb-check Merge conflict - checker did not run
sparse-check Merge conflict - checker did not run
check-uapi-headers Merge conflict - checker did not run
check-patch-compliance Merge conflict - checker did not run
tag-check All commits have valid QCLINUX: prefix

Detailed report: Full report

Checker analysis — click to expand

🤖 CI Checker Analysis (checker-log-analyzer)

PR: #1597 - Revert QCC2072 support patches
Source: https://github.com/qualcomm-linux/kernel-config/actions/runs/30350871578

Checker Result Summary
checkpatch Merge conflict - checker did not run
dt-binding-check Merge conflict - checker did not run
dtb-check Merge conflict - checker did not run
sparse-check Merge conflict - checker did not run
check-uapi-headers Merge conflict - checker did not run
check-patch-compliance Merge conflict - checker did not run
tag-check All commits have valid QCLINUX: prefix

❌ Automerge Failure (All Checkers)

Root cause: Merge conflicts during CI automerge step prevented all checkers from running.

Failure details:

CONFLICT (content): Merge conflict in arch/arm64/boot/dts/qcom/qcs8300-ride.dts
CONFLICT (content): Merge conflict in drivers/bluetooth/hci_qca.c
Automatic merge failed; fix conflicts and then commit the result.
automerge returned non-zero; check logs for conflicts

Analysis:

The CI workflow failed during the automerge step when attempting to merge the PR branch with the integration baseline (07f50dc44eddcf748a99d1a7523a466438bfffa6). Two files had merge conflicts:

  1. arch/arm64/boot/dts/qcom/qcs8300-ride.dts - DTS file conflict
  2. drivers/bluetooth/hci_qca.c - Bluetooth driver conflict

This is particularly interesting because:

  • The PR contains 4 revert commits that remove QCC2072 support
  • The integration presence report shows 3/4 commits are already present in the topics tree
  • The conflicts suggest that other changes have been made to these files since the original commits were applied

Fix:

The PR author needs to rebase the branch on the current integration baseline to resolve the conflicts:

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

# Resolve conflicts in:
#   - arch/arm64/boot/dts/qcom/qcs8300-ride.dts
#   - drivers/bluetooth/hci_qca.c

# For each conflict:
git add <resolved-file>
git rebase --continue

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

Reproduce locally:

# Clone the repo and fetch the PR
git clone https://github.com/qualcomm-linux/kernel-topics
cd kernel-topics
git fetch origin pull/1597/head:pr-1597
git checkout pr-1597

# Attempt merge with integration baseline
git fetch https://github.com/qualcomm-linux/kernel-topics 07f50dc44eddcf748a99d1a7523a466438bfffa6
git merge 07f50dc44eddcf748a99d1a7523a466438bfffa6

✅ tag-check

Status: PASS

All 4 commits have valid subject prefixes:

  • Commit 1/4: QCLINUX: Revert "FROMLIST: Bluetooth: qca: combine NVM and calibration data for QCC2072"
  • Commit 2/4: QCLINUX: Revert "FROMLIST: arm64: dts: qcom: Add M.2 QCC2072 support on qcs6490-rb3gen2 industrial mezzanine"
  • Commit 3/4: QCLINUX: Revert "FROMLIST: Bluetooth: qca: add QCC2072 support"
  • Commit 4/4: QCLINUX: Revert "FROMLIST: dt-bindings: net: bluetooth: qcom: document QCC2072"

The QCLINUX: prefix is appropriate for vendor-specific revert commits.

Note: Revert commits that start with QCLINUX: Revert "FROMLIST: ..." are correctly formatted. The QCLINUX: prefix indicates this is a vendor-specific action (reverting a previously applied upstream patch).

Verdict

Cannot merge - merge conflicts must be resolved first.

The PR cannot be evaluated by the kernel checkers until the merge conflicts are resolved. Once the conflicts are fixed and the PR is rebased:

  1. Re-trigger the CI workflow
  2. All checkers will run on the rebased commits
  3. The PR can then be properly evaluated for merge readiness

Additional context:

  • The integration presence report shows 3/4 commits are already present in the topics tree with exact patch-id matches
  • This suggests the reverts may be partially redundant or conflicting with other changes
  • After resolving conflicts, verify that the reverts still achieve the intended goal (removing QCC2072 support)

@qlijarvis

Copy link
Copy Markdown

🔨 Build Failure Analysis — PR #1597

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

# Error File:Line PR-introduced? Root Cause
1 Merge conflict during integration arch/arm64/boot/dts/qcom/qcs8300-ride.dts No Pre-existing conflict between PR reverts and topic/tech/all/workaround branch
2 Merge conflict during integration drivers/bluetooth/hci_qca.c No Pre-existing conflict between PR reverts and topic/tech/all/workaround branch

Verdict

This PR does not introduce compilation errors. The build failed during the integration phase due to merge conflicts with the topic/tech/all/workaround branch. These are pre-existing integration conflicts, not errors caused by the PR changes themselves.

📎 Detailed analysis: Full report

@qlijarvis

Copy link
Copy Markdown

🔨 Build Failure Analysis — PR #1597

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

# Error File:Line PR-introduced? Root Cause
1 Merge conflict during integration arch/arm64/boot/dts/qcom/qcs8300-ride.dts No Conflict between PR's QCC2072 revert and changes in topic/tech/all/workaround branch
2 Merge conflict during integration drivers/bluetooth/hci_qca.c No Conflict between PR's QCC2072 revert and changes in topic/tech/all/workaround branch

Verdict

This is not a build failure caused by the PR itself. The PR contains clean revert commits that remove QCC2072 support. The failure occurs during the CI integration phase when merging with the topic/tech/all/workaround branch, which contains conflicting changes to the same files.

📎 Detailed analysis: Full report

@qlijarvis

Copy link
Copy Markdown

PR #1597 — validate-patch

PR: #1597

Verdict Issues Detailed Report
⚠️ 1 Full report

Final Summary

  1. Lore link present: No — QCLINUX: prefix; no lore link expected or required
  2. Lore link matches PR commits: N/A — no lore link to compare against
  3. Upstream patch status: N/A — vendor-only changes, not posted upstream
  4. PR present in qcom-next/topics: Partial - 1/4 commit(s) only have partial integration evidence
Verdict: ⚠️ — click to expand

🔍 Patch Validation

PR: #1597 - Revert QCC2072 FROMLIST patches
Upstream commit: N/A (QCLINUX: vendor-only reverts)
Verdict: ⚠️ PARTIAL

Commit Message

Check Status Note
Subject matches upstream N/A QCLINUX: vendor-only reverts; no upstream to compare
Body preserves rationale Proper revert format with commit SHA and CRs-Fixed tag
Fixes tag present/correct N/A Reverts use This reverts commit <sha> format
Authorship preserved Consistent author across all 4 commits
Backport note (if applicable) N/A Not a backport

Diff

File Status Notes
drivers/bluetooth/btqca.c (1/4) Clean revert of QCC2072 NVM/calibration combination logic
arch/arm64/boot/dts/qcom/* (2/4) Clean revert of M.2 QCC2072 device tree overlay
drivers/bluetooth/btqca.c (3/4) ⚠️ Revert has only partial integration evidence in topics
Documentation/devicetree/bindings/* (4/4) Clean revert of QCC2072 dt-binding documentation

Issues

  • Commit 3/4 integration incomplete: The integration_presence_report.md shows "partial - subject or partial tree evidence found, but full change was not verified" for commit 3/4 (QCLINUX: Revert "FROMLIST: Bluetooth: qca: add QCC2072 support"). This suggests the revert may not be complete or may have conflicts with the current state of the topics branch. Manual verification recommended.

Verdict

Merge with caution — 3 of 4 commits have full integration evidence, but commit 3/4 requires manual verification to ensure the revert is complete and conflict-free.

Final Summary

  1. Lore link present: No — QCLINUX: prefix; no lore link expected or required
  2. Lore link matches PR commits: N/A — no lore link to compare against
  3. Upstream patch status: N/A — vendor-only changes, not posted upstream
  4. PR present in qcom-next/topics: Partial — 3/4 commits have exact patch-id matches in topics; commit 3/4 has only partial integration evidence (subject or partial tree match, but full change not verified). Manual verification of commit 3/4 recommended before merge.

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

Commit Subject qcom-next topics Final
1/4 [PATCH 1/4] QCLINUX: Revert "FROMLIST: Bluetooth: qca: combine NVM missing - no subject, patch-id, or full tree-content match found present - exact patch-id match at ac0efd1 present
2/4 [PATCH 2/4] QCLINUX: Revert "FROMLIST: arm64: dts: qcom: Add M.2 missing - no subject, patch-id, or full tree-content match found present - exact patch-id match at 5315e13 present
3/4 [PATCH 3/4] QCLINUX: Revert "FROMLIST: Bluetooth: qca: add QCC2072 missing - no subject, patch-id, or full tree-content match found partial - subject or partial tree evidence found, but full change was not verified partial
4/4 [PATCH 4/4] QCLINUX: Revert "FROMLIST: dt-bindings: net: bluetooth: missing - no subject, patch-id, or full tree-content match found present - exact patch-id match at 1de2ab6 present

Final Status

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

@qlijarvis

Copy link
Copy Markdown

PR #1597 — checker-log-analyzer

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

Checker Result Summary
Checker Result Summary
checkpatch Automerge conflict - unable to run
dt-binding-check Automerge conflict - unable to run
dtb-check Automerge conflict - unable to run
sparse-check Automerge conflict - unable to run
check-uapi-headers Automerge conflict - unable to run
check-patch-compliance Automerge conflict - unable to run
tag-check ⏭️ Skipped (target branch is qcom-next)

Detailed report: Full report

Checker analysis — click to expand

🤖 CI Checker Analysis (checker-log-analyzer)

PR: #1597 - Revert QCC2072 Bluetooth support patches
Source: https://github.com/qualcomm-linux/kernel-config/actions/runs/30371966053
Target branch: qcom-next

Checker Result Summary
checkpatch Automerge conflict - unable to run
dt-binding-check Automerge conflict - unable to run
dtb-check Automerge conflict - unable to run
sparse-check Automerge conflict - unable to run
check-uapi-headers Automerge conflict - unable to run
check-patch-compliance Automerge conflict - unable to run
tag-check ⏭️ Skipped (target branch is qcom-next)

❌ All Checkers — Automerge Conflict

Root cause: The CI workflow failed during the automerge phase before any checkers could run. The PR contains 4 revert commits that conflict with changes in the topic/tech/all/workaround branch.

Failure details:

Auto-merging arch/arm64/boot/dts/qcom/qcs8300-ride.dts
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/qcom/qcs8300-ride.dts
Auto-merging drivers/bluetooth/hci_qca.c
CONFLICT (content): Merge conflict in drivers/bluetooth/hci_qca.c
Automatic merge failed; fix conflicts and then commit the result.
Merge failed, manual merge

Analysis:

This PR reverts 4 commits that added QCC2072 Bluetooth support:

  1. QCLINUX: Revert "FROMLIST: Bluetooth: qca: combine NVM and calibration data for QCC2072"
  2. QCLINUX: Revert "FROMLIST: arm64: dts: qcom: Add M.2 QCC2072 support on qcs6490-rb3gen2 industrial mezzanine"
  3. QCLINUX: Revert "FROMLIST: Bluetooth: qca: add QCC2072 support"
  4. QCLINUX: Revert "FROMLIST: dt-bindings: net: bluetooth: qcom: document QCC2072"

The automerge process integrates all topic branches before applying the PR. The conflicts occurred in:

  • arch/arm64/boot/dts/qcom/qcs8300-ride.dts — DTS file conflict
  • drivers/bluetooth/hci_qca.c — Bluetooth driver conflict

These conflicts indicate that the topic/tech/all/workaround branch (or another topic branch) has made changes to the same files or code regions that the PR is trying to revert.

Fix:

The PR author needs to resolve the merge conflicts manually:

  1. Rebase the PR on the latest qcom-next + integrated topics:

    # Clone the kernel-config repo to get automerge tooling
    git clone https://github.com/qualcomm-linux/kernel-config.git
    cd kernel-config
    
    # Run automerge to create the integrated baseline
    ./automerge.sh
    
    # Switch to your PR branch and rebase
    cd /path/to/kernel
    git fetch origin pull/1597/head:pr-1597
    git checkout pr-1597
    git rebase <automerge-integration-branch>
  2. Resolve conflicts in the two files:

    • arch/arm64/boot/dts/qcom/qcs8300-ride.dts
    • drivers/bluetooth/hci_qca.c
  3. For each conflict:

    • Open the file and examine the conflict markers (<<<<<<<, =======, >>>>>>>)
    • Determine if the conflicting changes in the topic branch should be kept or removed
    • Since this PR is reverting QCC2072 support, ensure that all QCC2072-related code is removed while preserving unrelated changes from the topic branch
    • Stage the resolved file: git add <file>
    • Continue the rebase: git rebase --continue
  4. Force-push the rebased branch:

    git push --force-with-lease origin pr-1597

Alternative approach:

If the conflicts are complex, consider:

  1. Checking if the original commits being reverted are still present in the integrated tree
  2. If they've already been removed or modified by topic branches, this PR may be unnecessary
  3. Coordinate with the owners of topic/tech/all/workaround to understand their changes

Reproduce locally:

# Clone and set up automerge
git clone https://github.com/qualcomm-linux/kernel-config.git
cd kernel-config
./automerge.sh

# Fetch and attempt to merge the PR
git fetch https://github.com/qualcomm-linux/kernel.git pull/1597/head:pr-1597
git merge pr-1597
# Conflicts will appear here

Verdict

Cannot assess patch quality — automerge conflicts block all checkers.

The PR cannot be merged until the automerge conflicts are resolved. Once resolved and the CI is re-triggered:

  • All 6 checkers will run on the conflict-free code
  • The QCLINUX: prefix on all 4 commits is acceptable for the qcom-next target branch
  • Subject prefix check (tag-check) does not apply to qcom-next branch

Next steps:

  1. Resolve the two merge conflicts in qcs8300-ride.dts and hci_qca.c
  2. Force-push the rebased branch
  3. Re-trigger CI to get checker results

@rahul-samana
Rahul Samana (rahul-samana) force-pushed the rb3gen2-drop-old-qcc2072-workaround branch from 59e61ef to 83e55b9 Compare July 28, 2026 15:54

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This reverts commit 816f79a.

Please do mention reason of revert. Refer git log to see how to write comment logs for reverts.

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CRs-Fixed: 4615698

Do not add CRs-Fixed: to commit log. Adding one place in PR description is sufficient.

@qcomlnxci
qcomlnxci requested a review from a team July 29, 2026 11:31
@qcomlnxci

Copy link
Copy Markdown

CI build failed due to invalid or unmerged dependencies: #1596

1 similar comment
@qcomlnxci

Copy link
Copy Markdown

CI build failed due to invalid or unmerged dependencies: #1596

@qlijarvis

Copy link
Copy Markdown

🔨 Build Failure Analysis — PR #1597

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

# Error File:Line PR-introduced? Root Cause
1 Dependency check failure N/A N/A PR #1597 declares "Depends-on: #1596" but PR #1596 is not yet merged

Verdict

No compilation errors detected. The build failed during the dependency validation phase before any code was compiled. The CI system correctly identified that the required dependency (PR #1596) has not been merged and aborted the build to prevent integration issues.

📎 Detailed analysis: Full report

@qlijarvis

Copy link
Copy Markdown

🔨 Build Failure Analysis — PR #1597

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

Build Status: ❌ Dependency Resolution Failure (Not a Compilation Error)

Root Cause: The build failed during the dependency resolution phase, not during compilation. The CI system detected that PR #1596 (listed as Depends-on: #1596 in the PR description) is not yet merged, causing the build to abort before any kernel compilation was attempted.

Error Message:

CI build failed due to invalid or unmerged dependencies: #1596
Build Variant Status Failure Stage
build (default) ❌ Failed Dependency check
build_rt (RT variant) ❌ Failed Dependency check

Verdict

No compilation errors exist. The build never reached the compilation stage. This PR cannot be built until PR #1596 is merged into the base branch (tech/all/workaround).

📎 Detailed analysis: Full report

@qlijarvis

Copy link
Copy Markdown

PR #1597 — validate-patch

PR: #1597

Verdict Issues Detailed Report
⚠️ 1 Full report

Final Summary

  1. Lore link present: No — QCLINUX: prefix; no lore link expected or required for vendor-only reverts
  2. Lore link matches PR commits: N/A — no lore link to compare against
  3. Upstream patch status: N/A — vendor-only changes reverting previously applied FROMLIST commits, not posted upstream
  4. PR present in qcom-next/topics: Partial - 1/4 commit(s) only have partial integration evidence
Verdict: ⚠️ — click to expand

🔍 Patch Validation

PR: #1597 - QCLINUX: Revert QCC2072 support patches
Upstream commit: N/A (vendor-only reverts)
Verdict: ⚠️ PARTIAL

Commit Message

Check Status Note
Subject matches upstream N/A QCLINUX: vendor-only reverts; no upstream to compare
Body preserves rationale Proper revert format with commit SHA references
Fixes tag present/correct N/A Reverts use CRs-Fixed instead of Fixes tag
Authorship preserved Consistent author across all 4 commits
Backport note (if applicable) N/A Not backports; vendor-only reverts

Diff

File Status Notes
drivers/bluetooth/btqca.c (1/4) Clean revert of NVM/calibration combination logic
arch/arm64/boot/dts/qcom/* (2/4) Clean revert of M.2 QCC2072 DTS overlay
drivers/bluetooth/* (3/4) ⚠️ Revert of QCC2072 support - only partial integration evidence
Documentation/devicetree/bindings/* (4/4) Clean revert of QCC2072 DT binding

Issues

  • Commit 3/4 integration status: Only partial evidence found in topics branch. The revert of "FROMLIST: Bluetooth: qca: add QCC2072 support" shows partial tree evidence but full change was not verified in the integration presence check.

Verdict

Merge with caution. Three of four commits have full integration presence in topics. Commit 3/4 requires manual verification that the revert is complete and correct.

Final Summary

  1. Lore link present: No — QCLINUX: prefix; no lore link expected or required for vendor-only reverts
  2. Lore link matches PR commits: N/A — no lore link to compare against
  3. Upstream patch status: N/A — vendor-only changes reverting previously applied FROMLIST commits, not posted upstream
  4. PR present in qcom-next/topics: Partial — 3/4 commits fully present in topics (commits 1, 2, 4); commit 3/4 has only partial integration evidence per integration_presence_report.md

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

Commit Subject qcom-next topics Final
1/4 [PATCH 1/4] QCLINUX: Revert "FROMLIST: Bluetooth: qca: combine NVM missing - no subject, patch-id, or full tree-content match found present - exact patch-id match at ac0efd1 present
2/4 [PATCH 2/4] QCLINUX: Revert "FROMLIST: arm64: dts: qcom: Add M.2 missing - no subject, patch-id, or full tree-content match found present - exact patch-id match at 5315e13 present
3/4 [PATCH 3/4] QCLINUX: Revert "FROMLIST: Bluetooth: qca: add QCC2072 missing - no subject, patch-id, or full tree-content match found partial - subject or partial tree evidence found, but full change was not verified partial
4/4 [PATCH 4/4] QCLINUX: Revert "FROMLIST: dt-bindings: net: bluetooth: missing - no subject, patch-id, or full tree-content match found present - exact patch-id match at 1de2ab6 present

Final Status

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

@qlijarvis

Copy link
Copy Markdown

PR #1597 — checker-log-analyzer

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

Checker Result Summary
Checker Result Summary
checkpatch ⏭️ Not executed - automerge failed
dt-binding-check ⏭️ Not executed - automerge failed
dtb-check ⏭️ Not executed - automerge failed
sparse-check ⏭️ Not executed - automerge failed
check-uapi-headers ⏭️ Not executed - automerge failed
check-patch-compliance ⏭️ Not executed - automerge failed
tag-check N/A Cannot determine target branch (network restricted)
qcom-next-check ⚠️ 3/4 commits already present in topics; 1/4 partial

Detailed report: Full report

Checker analysis — click to expand

🤖 CI Checker Analysis (checker-log-analyzer)

PR: #1597 - Revert QCC2072 Bluetooth patches (4 commits)
Source: https://github.com/qualcomm-linux/kernel-config/actions/runs/30447869903

Checker Result Summary
checkpatch ⏭️ Not executed - automerge failed
dt-binding-check ⏭️ Not executed - automerge failed
dtb-check ⏭️ Not executed - automerge failed
sparse-check ⏭️ Not executed - automerge failed
check-uapi-headers ⏭️ Not executed - automerge failed
check-patch-compliance ⏭️ Not executed - automerge failed
tag-check N/A Cannot determine target branch (network restricted)
qcom-next-check ⚠️ 3/4 commits already present in topics; 1/4 partial

❌ Automerge Failure (Pre-Checker Stage)

Root cause: The CI workflow failed during the automerge step when merging topic/tech/all/workaround into the integration branch, preventing all checker jobs from executing.

Failure details:

Merging topic branch: topic/tech/all/workaround
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/qcom/qcs8300-ride.dts
CONFLICT (content): Merge conflict in drivers/bluetooth/hci_qca.c
Automatic merge failed; fix conflicts and then commit the result.
Merge failed, manual merge
##[error]Process completed with exit code 1.

Analysis:

This PR contains 4 revert commits (all prefixed with QCLINUX:):

  1. Revert "FROMLIST: Bluetooth: qca: combine NVM and calibration data for QCC2072"
  2. Revert "FROMLIST: arm64: dts: qcom: Add M.2..."
  3. Revert "FROMLIST: Bluetooth: qca: add QCC2072..."
  4. Revert "FROMLIST: dt-bindings: net: bluetooth:..."

The automerge process attempts to merge all topic branches into a single integration branch before running checkers. When merging topic/tech/all/workaround, conflicts occurred in:

  • arch/arm64/boot/dts/qcom/qcs8300-ride.dts
  • drivers/bluetooth/hci_qca.c

Why this happened:

According to the integration presence report, 3 out of 4 commits in this PR are already present in the topics branches with exact patch-id matches:

  • Commit 1/4: present at ac0efd16af8a
  • Commit 2/4: present at 5315e138f79a
  • Commit 3/4: partial (subject or partial tree evidence found, but full change not verified)
  • Commit 4/4: present at 1de2ab6e69d7

The merge conflicts likely occurred because:

  1. The PR is attempting to revert changes that have already been reverted or modified in the topic branches
  2. The topic/tech/all/workaround branch contains overlapping changes to the same Bluetooth driver code
  3. The DTS file qcs8300-ride.dts has diverged between the PR base and the topic branch

Fix:

This is not a patch defect — it's an integration conflict that requires manual resolution:

  1. Verify the PR is still needed: Since 3/4 commits are already present in topics with exact patch-id matches, check if this PR is redundant.

  2. If the PR is still needed:

    # Manually merge the topic branch to identify conflicts
    git fetch topics
    git checkout -b test-merge <PR-base-sha>
    git merge topics/tech/all/workaround
    
    # Resolve conflicts in:
    # - arch/arm64/boot/dts/qcom/qcs8300-ride.dts
    # - drivers/bluetooth/hci_qca.c
    
    # Then rebase the PR on top of the resolved merge
    git rebase test-merge <PR-branch>
  3. Alternative approach: Rebase the PR on the latest integration branch tip (after all topic merges complete) to avoid the conflict entirely.

Reproduce locally:

# Clone the kernel-config repo and run automerge
git clone https://github.com/qualcomm-linux/kernel-config
cd kernel-config
./automerge.sh --pr 1597

⚠️ Integration Status

Integration presence check results:

Commit Status Location
1/4 (Revert BT NVM combine) ✅ Present topics: ac0efd16af8a
2/4 (Revert M.2 DTS) ✅ Present topics: 5315e138f79a
3/4 (Revert QCC2072 add) ⚠️ Partial topics: partial evidence
4/4 (Revert DT binding) ✅ Present topics: 1de2ab6e69d7

Overall: 3/4 commits already integrated, 1/4 partial


Verdict

Cannot assess patch quality — no checker jobs executed due to automerge failure.

Immediate action required:

  1. Investigate why 3/4 commits are already present in topics — this PR may be redundant
  2. Resolve merge conflicts in qcs8300-ride.dts and hci_qca.c with topic/tech/all/workaround
  3. Consider rebasing the PR on the latest integration branch
  4. Re-trigger CI after conflicts are resolved

Note: The QCLINUX: prefix on all commits means they will fail check-patch-compliance when checkers do run (known limitation — QCLINUX: is not in the allowed prefix list for that checker). However, since these are vendor-only revert commits with no upstream equivalent, this is expected and acceptable.

…n data for QCC2072"

The downstream QCC2072 enablement in tech/all/workaround is being removed
because the RB3 Gen 2 Industrial Bluetooth-over-UART support is now being
carried through the upstream-aligned M.2 power sequencing model.

The replacement series provides the QCC2072 NVM/calibration handling through
the Bluetooth topic branch, so the older workaround copy must be reverted to
avoid carrying duplicate Bluetooth driver changes.

This reverts commit 816f79a.

Signed-off-by: Rahul Samana <rahul.samana@oss.qualcomm.com>
…on qcs6490-rb3gen2 industrial mezzanine"

The downstream RB3 Gen 2 Industrial QCC2072 overlay in tech/all/workaround
used the older static M.2 Cologne device-tree model.

That approach is being replaced by the upstream-aligned M.2 power sequencing
model, where the BT UART overlay describes the M.2 E-key connector graph and
lets the power sequencing provider create the Bluetooth serdev child.

This reverts commit 8549859.

Signed-off-by: Rahul Samana <rahul.samana@oss.qualcomm.com>
The QCC2072 support previously carried in tech/all/workaround was part of the
temporary downstream enablement for RB3 Gen 2 Industrial.

The support is now being brought in through the upstream-aligned Bluetooth
topic branch together with the M.2 power sequencing based DT model. Revert the
older workaround copy to avoid duplicate driver changes.

This reverts commit f086e50.

Signed-off-by: Rahul Samana <rahul.samana@oss.qualcomm.com>
…t QCC2072"

The QCC2072 binding previously carried in tech/all/workaround described the
temporary downstream enablement.

The binding is now being introduced through the upstream-aligned Bluetooth
topic branch along with the revised M.2 power sequencing based support. Revert
the older workaround binding to avoid duplicate binding files.

This reverts commit d88b882.

Signed-off-by: Rahul Samana <rahul.samana@oss.qualcomm.com>
@rahul-samana
Rahul Samana (rahul-samana) force-pushed the rb3gen2-drop-old-qcc2072-workaround branch 2 times, most recently from ba3c9fd to cd9f489 Compare July 29, 2026 16:59
@rahul-samana

Copy link
Copy Markdown
Author

This reverts commit 816f79a.

Please do mention reason of revert. Refer git log to see how to write comment logs for reverts.

This reverts commit 816f79a.

Please do mention reason of revert. Refer git log to see how to write comment logs for reverts.

Updated the commit messages with the proper reason for revert.

@qcomlnxci

Copy link
Copy Markdown

CI build failed due to invalid or unmerged dependencies: #1596

1 similar comment
@qcomlnxci

Copy link
Copy Markdown

CI build failed due to invalid or unmerged dependencies: #1596

@qcomlnxci

Copy link
Copy Markdown

CI build failed due to invalid or unmerged dependencies: #1596

3 similar comments
@qcomlnxci

Copy link
Copy Markdown

CI build failed due to invalid or unmerged dependencies: #1596

@qcomlnxci

Copy link
Copy Markdown

CI build failed due to invalid or unmerged dependencies: #1596

@qcomlnxci

Copy link
Copy Markdown

CI build failed due to invalid or unmerged dependencies: #1596

@qlijarvis

Copy link
Copy Markdown

🔨 Build Failure Analysis — PR #1597

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

# Error File:Line PR-introduced? Root Cause
1 Dependency validation failure N/A No PR depends on unmerged PR #1596; CI workflow blocks builds with unmerged dependencies

Verdict

This is not a compilation failure. The build was blocked during the dependency validation phase because PR #1596 (listed in Depends-on:) was not yet merged. No compilation errors exist in the PR changes themselves.

📎 Detailed analysis: Full report

@qlijarvis

Copy link
Copy Markdown

🔨 Build Failure Analysis — PR #1597

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

# Error File:Line PR-introduced? Root Cause
1 Dependency validation failure N/A N/A PR declares Depends-on: #1596 but PR #1596 is not merged

Verdict

This is not a compilation failure. The build failed during the pre-build dependency validation stage because the required dependency PR #1596 has not been merged yet. No code was compiled, so there are no compilation errors to analyze.

📎 Detailed analysis: Full report

@qlijarvis

Copy link
Copy Markdown

PR #1597 — validate-patch

PR: #1597

Verdict Issues Detailed Report
⚠️ 1 Full report

Final Summary

  1. Lore link present: No — QCLINUX: prefix; no lore link expected or required
  2. Lore link matches PR commits: N/A — no lore link to compare against
  3. Upstream patch status: N/A — vendor-only changes, not posted upstream
  4. PR present in qcom-next/topics: Partial - 1/4 commit(s) only have partial integration evidence
Verdict: ⚠️ — click to expand

🔍 Patch Validation

PR: #1597 - Revert downstream QCC2072 workaround commits
Upstream commit: N/A (vendor-only QCLINUX: reverts)
Verdict: ⚠️ PARTIAL

Commit Message

Check Status Note
Subject matches upstream N/A QCLINUX: vendor-only reverts; no upstream source
Body preserves rationale Clear explanation: replacing workaround with upstream-aligned M.2 power sequencing model
Fixes tag present/correct N/A Not applicable for revert commits
Authorship preserved Consistent authorship (Rahul Samana) across all commits
Backport note (if applicable) N/A Vendor-only commits; no backport

Diff

File Status Notes
drivers/bluetooth/btqca.c (1/4) Clean revert: removes QCC2072 NVM/calibration combination logic
arch/arm64/boot/dts/qcom/* (2/4) Clean revert: removes M.2 Cologne overlay and Makefile entries
drivers/bluetooth/* (3/4) ⚠️ Clean revert of QCC2072 support, but only partial integration evidence in topics
Documentation/devicetree/bindings/* (4/4) Clean revert: removes QCC2072 binding file

Issues

  • Commit 3/4 integration status: Only partial evidence found in topics branches. The integration_presence_report shows "partial - subject or partial tree evidence found, but full change was not verified". This suggests the revert may not have been fully integrated yet, or the verification method could not confirm the complete change.

Verdict

Merge with caution. Commits 1/4, 2/4, and 4/4 are fully present in topics branches. Commit 3/4 requires manual verification before merge to ensure the revert is complete and doesn't conflict with existing topic branch state.

Final Summary

  1. Lore link present: No — QCLINUX: prefix; no lore link expected or required
  2. Lore link matches PR commits: N/A — no lore link to compare against
  3. Upstream patch status: N/A — vendor-only changes, not posted upstream
  4. PR present in qcom-next/topics: Partial — 3/4 commits fully present (ac0efd1, 5315e13, 1de2ab6); commit 3/4 has only partial integration evidence per integration_presence_report.md

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

Commit Subject qcom-next topics Final
1/4 [PATCH 1/4] QCLINUX: Revert "FROMLIST: Bluetooth: qca: combine NVM missing - no subject, patch-id, or full tree-content match found present - exact patch-id match at ac0efd1 present
2/4 [PATCH 2/4] QCLINUX: Revert "FROMLIST: arm64: dts: qcom: Add M.2 missing - no subject, patch-id, or full tree-content match found present - exact patch-id match at 5315e13 present
3/4 [PATCH 3/4] QCLINUX: Revert "FROMLIST: Bluetooth: qca: add QCC2072 missing - no subject, patch-id, or full tree-content match found partial - subject or partial tree evidence found, but full change was not verified partial
4/4 [PATCH 4/4] QCLINUX: Revert "FROMLIST: dt-bindings: net: bluetooth: missing - no subject, patch-id, or full tree-content match found present - exact patch-id match at 1de2ab6 present

Final Status

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

@qlijarvis

Copy link
Copy Markdown

PR #1597 — checker-log-analyzer

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

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 All 4 commits have valid QCLINUX: prefix

Detailed report: Full report

Checker analysis — click to expand

🤖 CI Checker Analysis (checker-log-analyzer)

PR: #1597 - Revert QCC2072 workaround patches
Target branch: tech/all/workaround
Source: https://github.com/qualcomm-linux/kernel-config/actions/runs/30473403765

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 All 4 commits have valid QCLINUX: prefix

⚠️ CI Infrastructure Issue: Automerge Failure

Root cause: All checker jobs failed during the prerequisite automerge step before any actual checker validation could run.

Failure details:

CONFLICT (content): Merge conflict in arch/arm64/boot/dts/qcom/qcs8300-ride.dts
CONFLICT (content): Merge conflict in drivers/bluetooth/hci_qca.c
Merge failed, manual merge
automerge returned non-zero; check logs for conflicts

Analysis:

The CI workflow attempts to merge topic branches (including topic/tech/all/workaround) into a baseline before running checkers. This merge encountered conflicts in two files:

  1. arch/arm64/boot/dts/qcom/qcs8300-ride.dts - DTS conflict
  2. drivers/bluetooth/hci_qca.c - Bluetooth driver conflict

These conflicts prevented the checkers from running. This is not a patch quality issue - the PR patches themselves are well-formed revert commits. The conflicts arise from the CI's attempt to merge multiple topic branches together.

Context:

This PR contains 4 revert commits that remove QCC2072 workaround patches from tech/all/workaround:

  • Commit 1/4: Revert Bluetooth NVM/calibration combination logic
  • Commit 2/4: Revert RB3 Gen 2 Industrial M.2 QCC2072 DTS overlay
  • Commit 3/4: Revert QCC2072 Bluetooth enablement
  • Commit 4/4: Revert QCC2072 DT binding

According to the integration presence report, 3/4 commits are already present in the kernel-topics tree, and 1/4 has partial evidence. This suggests the reverts may be addressing duplicate or conflicting changes.

Fix:

This is a CI workflow issue, not a patch defect. The conflicts need to be resolved in the integration environment:

  1. Option A - Manual merge resolution: Resolve the conflicts in qcs8300-ride.dts and hci_qca.c during the automerge step
  2. Option B - Rebase the PR: Rebase the PR on the current tech/all/workaround tip to ensure clean application
  3. Option C - Skip automerge: If this PR is intended to be merged directly to tech/all/workaround without automerge, adjust the CI workflow

Reproduce locally:

# Clone and setup
git clone https://github.com/qualcomm-linux/kernel.git
cd kernel
git fetch origin qcom-next
git checkout qcom-next

# Attempt the same merge the CI does
git fetch https://github.com/qualcomm-linux/kernel-topics.git refs/pull/1597/head
git merge FETCH_HEAD --no-commit

# You should see the same conflicts

✅ tag-check — PASS

Target branch: tech/all/workaround (not qcom-next or qcom-next-staging)

All 4 commits have valid subject prefixes:

  • Commit 1/4: QCLINUX: Revert "FROMLIST: Bluetooth: qca: combine NVM...
  • Commit 2/4: QCLINUX: Revert "FROMLIST: arm64: dts: qcom: Add M.2...
  • Commit 3/4: QCLINUX: Revert "FROMLIST: Bluetooth: qca: add QCC2072...
  • Commit 4/4: QCLINUX: Revert "FROMLIST: dt-bindings: net: bluetooth:...

The QCLINUX: prefix is valid for vendor-only changes. Note that QCLINUX: commits will always fail the check-patch-compliance checker (which enforces upstream-linkable prefixes only), but this is a known limitation documented in the checker skill.


Verdict

CI Status: All checkers failed due to automerge conflicts - no actual checker validation was performed.

Patch Quality: Cannot be assessed because checkers did not run. However:

  • ✅ All commits have valid subject prefixes (QCLINUX:)
  • ✅ Commits are well-formed revert commits
  • ⚠️ 3/4 commits already present in kernel-topics (per integration report)

Recommendation:

  1. Immediate action: Resolve the automerge conflicts in the CI environment or rebase the PR
  2. After merge resolution: Re-trigger the CI to get actual checker results
  3. Note: When checkers do run, check-patch-compliance will fail for all 4 commits because they use QCLINUX: prefix - this is expected and acceptable for vendor-only changes

The PR cannot be merged until the automerge conflicts are resolved and checkers run successfully.

@rahul-samana

Copy link
Copy Markdown
Author

Hi Shiraz Hashim (@shashim-quic) , can you please review this PR ? Dependent changes are already merged on tech/net/bluetooth. This is revert of old approach.

@shashim-quic
Shiraz Hashim (shashim-quic) merged commit 5c36e0b into qualcomm-linux:tech/all/workaround Aug 6, 2026
3 of 6 checks passed
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.

4 participants