Skip to content

QCLINUX : arm64: dts: qcom: Remove sa8775p-ride composite DTB rules - #1816

Merged
Shiraz Hashim (shashim-quic) merged 1 commit into
qualcomm-linux:tech/overlay/dtfrom
sgaud-quic:tech/overlay/dt
Sep 12, 2026
Merged

Shiraz Hashim (shashim-quic) merged 1 commit into
qualcomm-linux:tech/overlay/dtfrom
sgaud-quic:tech/overlay/dt

Conversation

@sgaud-quic

Copy link
Copy Markdown
Contributor

sa8775p-ride.dts and sa8775p-ride-r3.dts do not exist in the tree, removed as part of qualcomm-linux/kernel@921f145639e4

Remove the composite-DTB rules and their dtb-y install entries.

sa8775p-ride.dts and sa8775p-ride-r3.dts do not exist in the tree,
removed as part of qualcomm-linux/kernel@921f145639e4

Remove the composite-DTB rules and their dtb-y install entries.

Signed-off-by: Salendarsingh Gaud <sgaud@qti.qualcomm.com>
@qcomlnxci
qcomlnxci requested review from a team, Dmitry Baryshkov (lumag), Shivendra Pratap (quicAspratap) and Trilok Soni (trsoni) and removed request for a team September 12, 2026 06:14
@shashim-quic
Shiraz Hashim (shashim-quic) merged commit 589b98a into qualcomm-linux:tech/overlay/dt Sep 12, 2026
3 of 7 checks passed
@qlijarvis

Copy link
Copy Markdown

🔨 Build Failure Analysis — PR #1816

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

# Error File:Line PR-introduced? Root Cause
1 Merge conflict during automerge arch/arm64/boot/dts/qcom/Makefile No Pre-existing conflict between PR base and qcom-next baseline; PR modifies the same file that has integration conflicts

Verdict

This is not a compilation failure. The build failed during the automerge/integration step due to a pre-existing merge conflict in the same file the PR modifies. The PR changes themselves are not the cause of the conflict.

📎 Detailed analysis: Full report

@qlijarvis

Copy link
Copy Markdown

🔨 Build Failure Analysis — PR #1816

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

# Error File:Line PR-introduced? Root Cause
1 Merge conflict during topic branch integration arch/arm64/boot/dts/qcom/Makefile Indirectly PR modifies Makefile lines that conflict with topic/tech/overlay/dt branch changes
2 Multiple merge conflicts in DT bindings and drivers Various files (150+ conflicts) No Pre-existing conflicts between baseline (qcom-next) and topic branch (tech/overlay/dt)

Verdict

The build failure is not caused by compilation errors. The CI failed during the pre-merge integration phase when attempting to merge the topic/tech/overlay/dt branch with the baseline. While the PR modifies arch/arm64/boot/dts/qcom/Makefile (removing sa8775p-ride composite DTB rules), the merge conflict in this file is part of a larger set of 150+ conflicts between the baseline and topic branch that are unrelated to the PR changes themselves. The PR changes are valid but cannot be tested until the underlying topic branch conflicts are resolved.

📎 Detailed analysis: Full report

@qlijarvis

Copy link
Copy Markdown

PR #1816 — validate-patch

PR: #1816

Verdict Issues Detailed Report
0 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 change, not posted upstream
  4. PR present in qcom-next/topics: Yes - all 1 commit(s) are present in qcom-next or topics
Verdict: ✅ — click to expand

🔍 Patch Validation

PR: #1816 - QCLINUX : arm64: dts: qcom: Remove sa8775p-ride composite DTB rules
Upstream commit: N/A (vendor-only commit)
Verdict: ✅ PASS

Commit Message

Check Status Note
Subject matches upstream N/A Vendor-only commit; no upstream source
Body preserves rationale Clear explanation: files removed in commit 921f145
Fixes tag present/correct N/A Cleanup commit; no bug fix
Authorship preserved Author: Salendarsingh Gaud; Signed-off-by present
Backport note (if applicable) N/A Not a backport

Diff

File Status Notes
arch/arm64/boot/dts/qcom/Makefile Removes 7 lines of composite DTB rules for non-existent .dts files

Verdict

Merge as-is. This is a valid vendor-only cleanup commit that removes stale Makefile entries for DTB files that were previously deleted. The commit message clearly explains the rationale and references the commit that removed the source files.

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 change, not posted upstream
  4. PR present in qcom-next/topics: Yes — present in topics at 589b98aaac48275b106fb137ee0e7d7ebff5df31 (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: d49c33864d06e9672dce57738be8851384578fcf
topics remote: topics -> https://github.com/qualcomm-linux/kernel-topics
topics fetch: fetched

Commit Subject qcom-next topics Final
1/1 [PATCH] QCLINUX : arm64: dts: qcom: Remove sa8775p-ride composite DTB missing - no subject, patch-id, or full tree-content match found present - exact patch-id match at 589b98a present

Final Status

overall_status: PASS
present_commits: 1/1
partial_commits: 0/1
missing_commits: 0/1
topics_checked_for_commits: 1/1
final_summary: PR present in qcom-next/topics: Yes - all 1 commit(s) are present in qcom-next or topics

@qlijarvis

Copy link
Copy Markdown

PR #1816 — checker-log-analyzer

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

Checker Result Summary
Checker Result Summary
checkpatch ⏭️ CI setup failed - no tests executed
dt-binding-check ⏭️ CI setup failed - no tests executed
dtb-check ⏭️ CI setup failed - no tests executed
sparse-check ⏭️ CI setup failed - no tests executed
check-uapi-headers ⏭️ CI setup failed - no tests executed
check-patch-compliance ⏭️ CI setup failed - no tests executed
tag-check N/A Cannot determine target branch due to CI failure

Detailed report: Full report

Checker analysis — click to expand

🤖 CI Checker Analysis (checker-log-analyzer)

PR: #1816 - QCLINUX : arm64: dts: qcom: Remove sa8775p-ride composite DTB rules
Source: https://github.com/qualcomm-linux/kernel-config/actions/runs/34677606924

Checker Result Summary
checkpatch ⏭️ CI setup failed - no tests executed
dt-binding-check ⏭️ CI setup failed - no tests executed
dtb-check ⏭️ CI setup failed - no tests executed
sparse-check ⏭️ CI setup failed - no tests executed
check-uapi-headers ⏭️ CI setup failed - no tests executed
check-patch-compliance ⏭️ CI setup failed - no tests executed
tag-check N/A Cannot determine target branch due to CI failure

⚠️ CI Infrastructure Failure

Root cause: Git merge failure during CI setup phase - "refusing to merge unrelated histories"

Failure details:

2026-09-12T06:30:53.3604666Z  ** Merging topic branch: topic/tech/overlay/dt
2026-09-12T06:31:12.0380033Z fatal: refusing to merge unrelated histories
2026-09-12T06:31:12.1489165Z Merge failed, manual merge
...
2026-09-12T06:31:13.1939093Z Merging pr-1816 (no-commit)...
2026-09-12T06:31:33.2367601Z fatal: refusing to merge unrelated histories
2026-09-12T06:31:33.3486539Z Merge failed or conflicts detected. Aborting merge.
2026-09-12T06:31:33.3523490Z ##[error]Process completed with exit code 3.

Analysis:

This is a CI infrastructure issue, not a patch defect. The kernel-checkers workflow failed during the initial setup phase when attempting to:

  1. Merge the topic branch topic/tech/overlay/dt into the integration branch
  2. Subsequently merge PR QCLINUX : arm64: dts: qcom: Remove sa8775p-ride composite DTB rules #1816 into the integration branch

Both merge operations failed with "refusing to merge unrelated histories", which indicates that the topic branch and/or PR branch have no common ancestor with the baseline integration branch. This is a git history topology issue in the CI workflow configuration.

Impact: No checker tests were executed. The patch quality cannot be assessed from this CI run.

Fix: Re-trigger the CI workflow. If the issue persists, the topic branch tech/overlay/dt may need to be rebased or the CI workflow configuration may need adjustment to handle this branch topology.

No patch changes are required - this is purely a CI setup/configuration issue.


📋 Manual Patch Review

Since the automated checkers did not run, here's a manual review of the patch:

Patch content:

  • Removes composite DTB rules for sa8775p-ride-camx and sa8775p-ride-r3-camx
  • Removes corresponding dtb-y install entries
  • Keeps the .dtbo overlay file entry
  • Clean removal of 7 lines from arch/arm64/boot/dts/qcom/Makefile

Observations:

  1. Subject prefix: Uses QCLINUX: prefix, which indicates a vendor-only change

    • Note: QCLINUX: prefix will always fail check-patch-compliance checker (known limitation)
    • This is acceptable for vendor-only changes with no upstream equivalent
  2. Commit message: Clear and well-formatted

    • Explains what was removed and why
    • References the commit that removed the source .dts files
    • Has proper Signed-off-by: trailer
  3. Code change: Straightforward cleanup

    • Removes build rules for non-existent DTS files
    • Keeps the overlay .dtbo file which may still be used
    • No functional code changes
  4. Potential checkpatch issues: None expected

    • Makefile-only change
    • No coding style issues
    • Proper commit message formatting
  5. Target branch: Cannot determine from failed CI logs

    • If targeting a branch other than qcom-next or qcom-next-staging, the QCLINUX: prefix is acceptable but will fail check-patch-compliance

Verdict

CI Status: Infrastructure failure - re-trigger required

Patch Quality: Appears clean based on manual review. The patch is a straightforward Makefile cleanup removing build rules for deleted DTS files. No code quality issues identified.

Recommendation:

  • Re-trigger the CI workflow to get proper checker results
  • If CI continues to fail with merge errors, investigate the topic branch history topology
  • The patch itself appears ready for merge once CI infrastructure issues are resolved

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.

3 participants