Skip to content

Revert hdmi overlay refactor early hwe lyra - #2116

Open
anan-tiwa wants to merge 4 commits into
qualcomm-linux:early/hwe/lyrafrom
anan-tiwa:revert-hdmi-overlay-refactor-early-hwe-lyra
Open

anan-tiwa wants to merge 4 commits into
qualcomm-linux:early/hwe/lyrafrom
anan-tiwa:revert-hdmi-overlay-refactor-early-hwe-lyra

Conversation

@anan-tiwa

@anan-tiwa anan-tiwa commented Oct 26, 2026 •

Copy link
Copy Markdown

Revert Display Overlay and HDMI DT to address merge conflict in qcs615 branch

CRs-Fixed: 4647028

@qlijarvis

Copy link
Copy Markdown

🔨 Build Failure Analysis — PR #2116

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

# Error File:Line PR-introduced? Root Cause
1 Topic branch not found in integration config qcom-next.yaml No (Infrastructure) The topic branch early/hwe/lyra is not registered in the kernel integration configuration file qcom-next.yaml. This is a build infrastructure configuration issue, not a code compilation error.

Verdict

This is not a compilation failure. The build failed during the sync/configuration stage because the topic branch early/hwe/lyra is missing from the integration configuration. The PR code changes are syntactically valid but cannot be tested until the branch is added to qcom-next.yaml.

📎 Detailed analysis: Full report

@qlijarvis

Copy link
Copy Markdown

🔨 Build Failure Analysis — PR #2116

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

# Error File:Line PR-introduced? Root Cause
1 Topic branch not found in configuration qcom-next.yaml:N/A No Topic branch early/hwe/lyra is not registered in the kernel-config repository's qcom-next.yaml file. This is a build infrastructure configuration issue, not a code issue.

Verdict

This is not a compilation failure. The build failed during pre-build configuration because the topic branch early/hwe/lyra is not registered in the build system's configuration file. The PR's code changes (3 revert commits) were never compiled.

📎 Detailed analysis: Full report

@qlijarvis

Copy link
Copy Markdown

PR #2116 — validate-patch

PR: #2116

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 revert commits, not posted upstream
  4. PR present in qcom-next/topics: Fail - 2/3 commit(s) are missing from both qcom-next and topics
Verdict: ⚠️ — click to expand

🔍 Patch Validation

PR: #2116 - QCLINUX: Revert display-related commits for tech/all/dt/qcs615 re-pick
Upstream commit: N/A (vendor-only reverts)
Verdict: ⚠️ PARTIAL

Commit Message

Check Status Note
Subject matches upstream N/A QCLINUX: vendor-only reverts
Body preserves rationale ✅ Clear explanation for each revert
Fixes tag present/correct N/A Not applicable for reverts
Authorship preserved ✅ Consistent author across all commits
Backport note (if applicable) N/A Vendor-only commits

Diff

File Status Notes
drivers/regulator/rpi-panel-v2-regulator.c ✅ Clean revert of vcc-supply support
arch/arm64/boot/dts/qcom/talos-lyra-evk.dts ✅ Clean revert of display refactor and HDMI bridge

Issues

  • Integration presence concern: 2/3 commits are missing from both qcom-next and topics branches. Commit 2/3 shows only partial evidence. For vendor-only changes, presence in the integration tree is expected before merging to topic branches.

Verdict

Commits are well-formed vendor-only reverts with clear rationale. However, the missing presence in qcom-next/topics (2/3 missing, 1/3 partial) suggests these changes may not have been integrated yet, which is unusual for QCLINUX: commits being added to a topic branch.

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 revert commits, not posted upstream
  4. PR present in qcom-next/topics: Fail - 2/3 commit(s) are missing from both qcom-next and topics (per integration_presence_report.md). Commit 1/3 missing, commit 2/3 partial, commit 3/3 missing. This is unexpected for vendor-only changes.

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

Commit Subject qcom-next topics Final
1/3 [PATCH 1/3] QCLINUX: Revert "regulator: rpi-panel-v2: Add optional missing - no subject, patch-id, or full tree-content match found missing - no subject, patch-id, or full tree-content match found missing
2/3 [PATCH 2/3] QCLINUX: Revert "arm64: dts: qcom: talos-lyra-evk: 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
3/3 [PATCH 3/3] QCLINUX: Revert "arm64: dts: qcom: talos-lyra-evk: Add missing - no subject, patch-id, or full tree-content match found missing - no subject, patch-id, or full tree-content match found missing

Final Status

overall_status: FAIL
present_commits: 0/3
partial_commits: 1/3
missing_commits: 2/3
topics_checked_for_commits: 3/3
final_summary: PR present in qcom-next/topics: Fail - 2/3 commit(s) are missing from both qcom-next and topics

@qlijarvis

Copy link
Copy Markdown

PR #2116 — checker-log-analyzer

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

Checker Result Summary
Checker Result Summary
checkpatch ⏭️ Not run - automerge failed
dt-binding-check ⏭️ Not run - automerge failed
dtb-check ⏭️ Not run - automerge failed
sparse-check ⏭️ Not run - automerge failed
check-uapi-headers ⏭️ Not run - automerge failed
check-patch-compliance ⏭️ Not run - automerge failed
tag-check ✅ All commits have QCLINUX: prefix (valid for vendor-only reverts)
qcom-next-check N/A Not applicable - topic branch target

Detailed report: Full report

Checker analysis — click to expand

🤖 CI Checker Analysis (checker-log-analyzer)

PR: #2116 - Revert Talos Lyra EVK display changes
Source: https://github.com/qualcomm-linux/kernel-config/actions/runs/40331327815

Checker Result Summary
checkpatch ⏭️ Not run - automerge failed
dt-binding-check ⏭️ Not run - automerge failed
dtb-check ⏭️ Not run - automerge failed
sparse-check ⏭️ Not run - automerge failed
check-uapi-headers ⏭️ Not run - automerge failed
check-patch-compliance ⏭️ Not run - automerge failed
tag-check ✅ All commits have QCLINUX: prefix (valid for vendor-only reverts)
qcom-next-check N/A Not applicable - topic branch target

❌ automerge — Integration Failure

Root cause: The PR reverts commits that conflict with existing changes in the topic/early/hwe/lyra branch during CI automerge integration.

Failure details:

** Merging topic branch: topic/early/hwe/lyra
Auto-merging arch/arm64/boot/dts/qcom/Makefile
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/qcom/Makefile
Auto-merging arch/arm64/boot/dts/qcom/talos-camera-lyra-evk.dtsi
CONFLICT (add/add): Merge conflict in arch/arm64/boot/dts/qcom/talos-camera-lyra-evk.dtsi
Auto-merging arch/arm64/boot/dts/qcom/talos-camera-sensor-lyra-evk.dtsi
CONFLICT (add/add): Merge conflict in arch/arm64/boot/dts/qcom/talos-camera-sensor-lyra-evk.dtsi
Auto-merging arch/arm64/boot/dts/qcom/talos-lyra-evk-som.dtsi
CONFLICT (add/add): Merge conflict in arch/arm64/boot/dts/qcom/talos-lyra-evk-som.dtsi
Auto-merging arch/arm64/boot/dts/qcom/talos-lyra-evk.dts
CONFLICT (add/add): Merge conflict in arch/arm64/boot/dts/qcom/talos-lyra-evk.dts
Auto-merging arch/arm64/boot/dts/qcom/talos.dtsi
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/qcom/talos.dtsi
Auto-merging drivers/regulator/rpi-panel-v2-regulator.c
CONFLICT (content): Merge conflict in drivers/regulator/rpi-panel-v2-regulator.c
Automatic merge failed; fix conflicts and then commit the result.

Analysis:

This PR contains 3 revert commits that remove Talos Lyra EVK display-related changes:

  1. Revert regulator driver vcc-supply support
  2. Revert display overlay refactor
  3. Revert LT9611UXD HDMI bridge support

The CI automerge step failed because these reverts conflict with the existing topic/early/hwe/lyra branch content. This is expected behavior when reverting commits that are still present in the integration baseline or other topic branches.

Why no checkers ran:

The kernel-checkers CI workflow follows this sequence:

  1. Clone the kernel repository
  2. Run automerge to integrate all topic branches
  3. Run individual checkers (checkpatch, dtb-check, etc.) on the merged result

Since step 2 (automerge) failed with merge conflicts, the workflow terminated before any checkers could execute. This is not a checker failure — it's an integration conflict that must be resolved before checkers can validate the code.

Fix:

This is not a patch quality issue. The automerge conflict indicates one of the following scenarios:

Scenario A: The reverted commits still exist in the integration baseline

  • The commits being reverted are present in the baseline tag (e.g., qcom-next or integration snapshot)
  • Action: Verify the baseline doesn't already contain these commits. If it does, the reverts are correct and the automerge conflict is expected. The PR may need to be merged directly without automerge, or the baseline needs to be updated first.

Scenario B: Another topic branch re-introduces the same changes

  • Another topic branch (possibly topic/early/hwe/lyra itself or a dependent branch) contains the same Lyra EVK display changes
  • Action: Coordinate with the maintainers to determine merge order. Either:
    1. Merge this revert PR first, then rebase the conflicting topic branch, OR
    2. Remove the conflicting changes from the other topic branch before merging this PR

Scenario C: The target branch is incorrect

  • This PR may be targeting the wrong branch (e.g., targeting early/hwe/lyra when it should target a different branch)
  • Action: Verify the intended target branch with the maintainers

Reproduce locally:

To reproduce the automerge conflict:

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

# Or manually simulate the merge:
git clone https://github.com/qualcomm-linux/kernel-topics.git
cd kernel-topics
git checkout <baseline-tag>
git merge --no-ff topic/early/hwe/lyra
# Observe the same conflicts

✅ tag-check — Subject Prefix Validation

All three commits in this PR use the QCLINUX: prefix, which is appropriate for vendor-only revert commits that have no upstream equivalent. The subjects are properly formatted:

  1. QCLINUX: Revert "regulator: rpi-panel-v2: Add optional vcc-supply support"
  2. QCLINUX: Revert "arm64: dts: qcom: talos-lyra-evk: Refactor display for overlay support"
  3. QCLINUX: Revert "arm64: dts: qcom: talos-lyra-evk: Add LT9611UXD HDMI bridge support"

Note: The QCLINUX: prefix is valid for vendor-specific changes. However, check-patch-compliance (if it had run) would flag these commits because it only accepts upstream-linkable prefixes (FROMLIST:, FROMGIT:, UPSTREAM:, BACKPORT:). This is a known limitation of the checker for vendor-only commits.


Verdict

This is not a patch quality issue — it's an integration conflict.

The PR cannot be validated by the kernel-checkers CI until the automerge conflict is resolved. The conflict indicates that the commits being reverted still exist in the integration baseline or in another topic branch (topic/early/hwe/lyra).

Recommended actions:

  1. Coordinate with maintainers to determine the correct merge strategy:

    • Should this PR be merged first, then other branches rebased?
    • Should the conflicting topic branch be updated before merging this PR?
    • Is the target branch correct?
  2. Consider manual merge testing outside the CI automerge workflow to validate the patch quality independently

  3. Once the integration strategy is clear, either:

    • Rebase this PR on the correct baseline, OR
    • Merge this PR with manual conflict resolution, OR
    • Update the conflicting topic branch first

The patch content itself (3 revert commits) appears clean and properly formatted with appropriate commit messages and QCLINUX: prefixes. The issue is purely integration-related, not code quality.

@anan-tiwa
anan-tiwa force-pushed the revert-hdmi-overlay-refactor-early-hwe-lyra branch from 3f456ea to 84e3fda Compare October 26, 2026 14:55
@qlijarvis

Copy link
Copy Markdown

🔨 Build Failure Analysis — PR #2116

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

# Error File:Line PR-introduced? Root Cause
1 CI Configuration Error: topic 'early/hwe/lyra' not found in qcom-next.yaml kernel-config-ci/qcom-next.yaml:N/A No The target branch early/hwe/lyra is not registered in the CI configuration file. This is a pre-existing infrastructure issue, not caused by the PR changes.

Verdict

This is NOT a compilation failure. The build failed during CI workflow setup before any kernel compilation occurred. The error is a CI configuration issue where the target branch early/hwe/lyra is missing from the qcom-next.yaml configuration file. The PR changes themselves (device tree reverts) are syntactically valid and would not cause compilation errors.

📎 Detailed analysis: Full report

@qlijarvis

Copy link
Copy Markdown

🔨 Build Failure Analysis — PR #2116

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

# Error File:Line PR-introduced? Root Cause
1 Topic branch not found in config qcom-next.yaml No Pre-existing CI configuration issue: branch early/hwe/lyra is not registered in the kernel-config repository's qcom-next.yaml file

Verdict

This is NOT a compilation failure. The build failed during the CI setup phase because the topic branch early/hwe/lyra is not registered in the build system's configuration file. This is a pre-existing infrastructure issue unrelated to the PR's code changes.

📎 Detailed analysis: Full report

@qlijarvis

Copy link
Copy Markdown

PR #2116 — validate-patch

PR: #2116

Verdict Issues Detailed Report
❌ 2 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 revert changes, not posted upstream
  4. PR present in qcom-next/topics: Fail - 1/2 commit(s) are missing from both qcom-next and topics
Verdict: ❌ — click to expand

🔍 Patch Validation

PR: #2116 - QCLINUX: Revert display refactor and HDMI bridge commits
Upstream commit: N/A (vendor-only QCLINUX: revert commits)
Verdict: ❌ FAIL

Commit Message

Check Status Note
Subject matches upstream N/A QCLINUX: vendor-only revert commits
Body preserves rationale ✅ Clear explanation of why reverts are needed
Fixes tag present/correct N/A Revert commits reference original commit SHAs
Authorship preserved ✅ Anand Tiwari authored both commits
Backport note (if applicable) N/A Not backports

Diff

File Status Notes
arch/arm64/boot/dts/qcom/talos-lyra-evk.dts (1/2) ✅ Reverts display refactor changes cleanly
arch/arm64/boot/dts/qcom/talos-lyra-evk.dts (2/2) ✅ Reverts HDMI bridge support cleanly

Issues

Integration Presence Failure:

  • Commit 1/2 (cd06423): Shows "partial" presence in qcom-next/topics - subject or partial tree evidence found, but full change was not verified
  • Commit 2/2 (84e3fda): Missing from both qcom-next and topics branches - no subject, patch-id, or full tree-content match found

Per the validation constraints, commits must be present in qcom-next or topics branches. Commit 2/2 fails this requirement.

Verdict

Do not merge. While both commits are well-formed QCLINUX: vendor-only reverts with clear rationale, commit 2/2 is completely missing from the integration branches (qcom-next and topics). This indicates the commit may not have been properly integrated or the revert target may not exist in the expected branches. Verify that commit 47fbdb46b67b52d168166b0afd5bd26a89cfa6af (being reverted) exists in the target branch before merging this PR.

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 revert changes, not posted upstream
  4. PR present in qcom-next/topics: Fail - 1/2 commit(s) are missing from both qcom-next and topics (commit 2/2 84e3fda has no presence; commit 1/2 cd06423 shows only partial evidence)

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

Commit Subject qcom-next topics Final
1/2 [PATCH 1/2] QCLINUX: Revert "arm64: dts: qcom: talos-lyra-evk: partial - subject or partial tree evidence found, but full change was not verified partial - subject or partial tree evidence found, but full change was not verified partial
2/2 [PATCH 2/2] QCLINUX: Revert "arm64: dts: qcom: talos-lyra-evk: Add missing - no subject, patch-id, or full tree-content match found missing - no subject, patch-id, or full tree-content match found missing

Final Status

overall_status: FAIL
present_commits: 0/2
partial_commits: 1/2
missing_commits: 1/2
topics_checked_for_commits: 2/2
final_summary: PR present in qcom-next/topics: Fail - 1/2 commit(s) are missing from both qcom-next and topics

@qlijarvis

Copy link
Copy Markdown

PR #2116 — checker-log-analyzer

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

Checker Result Summary
Checker Result Summary
checkpatch ❌ Automerge conflict - setup failed
dt-binding-check ❌ Automerge conflict - setup failed
dtb-check ❌ Automerge conflict - setup failed
sparse-check ❌ Automerge conflict - setup failed
check-uapi-headers ❌ Automerge conflict - setup failed
check-patch-compliance ❌ Automerge conflict - setup failed
tag-check ✅ Both commits have valid QCLINUX: prefix

Detailed report: Full report

Checker analysis — click to expand

🤖 CI Checker Analysis (checker-log-analyzer)

PR: #2116 - Revert HDMI bridge support for upstream re-pick
Source: https://github.com/qualcomm-linux/kernel-config/actions/runs/40344422751

Checker Result Summary
checkpatch ❌ Automerge conflict - setup failed
dt-binding-check ❌ Automerge conflict - setup failed
dtb-check ❌ Automerge conflict - setup failed
sparse-check ❌ Automerge conflict - setup failed
check-uapi-headers ❌ Automerge conflict - setup failed
check-patch-compliance ❌ Automerge conflict - setup failed
tag-check ✅ Both commits have valid QCLINUX: prefix

❌ CI Infrastructure Failure — Automerge Conflicts

Root cause: All checker jobs failed during the automerge setup phase when attempting to integrate the PR branch (early/hwe/lyra) with qcom-next baseline. The automerge process encountered merge conflicts and could not proceed to run any actual checker validation.

Failure details:

CONFLICT (content): Merge conflict in arch/arm64/boot/dts/qcom/Makefile
CONFLICT (add/add): Merge conflict in arch/arm64/boot/dts/qcom/talos-camera-lyra-evk.dtsi
CONFLICT (add/add): Merge conflict in arch/arm64/boot/dts/qcom/talos-camera-sensor-lyra-evk.dtsi
CONFLICT (add/add): Merge conflict in arch/arm64/boot/dts/qcom/talos-lyra-evk-som.dtsi
CONFLICT (add/add): Merge conflict in arch/arm64/boot/dts/qcom/talos-lyra-evk.dts
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/qcom/talos.dtsi
CONFLICT (content): Merge conflict in drivers/regulator/rpi-panel-v2-regulator.c
Automatic merge failed; fix conflicts and then commit the result.
automerge returned non-zero; check logs for conflicts

Analysis:

This is not a patch quality issue — the PR itself contains two clean revert commits with proper QCLINUX: prefixes. The failure occurred because the CI workflow attempts to:

  1. Start from qcom-next baseline
  2. Run automerge to integrate the target branch (early/hwe/lyra)
  3. Then merge the PR commits on top

The automerge step (step 2) failed with conflicts in 7 files, preventing the CI from ever reaching the actual checker validation phase.

Why this happened:

The PR targets early/hwe/lyra, which is a topic branch that has diverged from qcom-next. The CI workflow's automerge step tries to integrate early/hwe/lyra into qcom-next, but encounters conflicts in:

  • Talos DTS files (camera, EVK, SOM, base DTSI)
  • Makefile (likely due to different file additions)
  • Regulator driver

These conflicts are expected when topic branches have independent development that hasn't been synchronized with qcom-next.

Fix:

This is a CI workflow limitation, not a patch defect. The PR cannot be validated by the current CI setup because the target branch conflicts with qcom-next during automerge.

Options:

  1. Merge as-is (recommended if the target branch maintainer approves):

    • The PR commits themselves are clean reverts with proper prefixes
    • The automerge conflict is a CI infrastructure issue, not a code quality issue
    • Manual review of the two revert commits shows they are straightforward and correct
  2. Rebase the target branch (early/hwe/lyra) onto current qcom-next:

    • Resolve the 7 conflicting files
    • Re-trigger CI — it should pass once the branch is synchronized
  3. Skip CI for this PR:

    • If early/hwe/lyra is intentionally divergent and will be integrated separately
    • Manual review is sufficient for these simple revert commits

Reproduce locally:

git clone https://github.com/qualcomm-linux/kernel.git
cd kernel
git fetch origin qcom-next early/hwe/lyra
git checkout qcom-next
git merge origin/early/hwe/lyra
# Conflicts will appear in the 7 files listed above

✅ tag-check — PASS

Analysis: Both commits in the PR have valid subject-line prefixes:

  1. QCLINUX: Revert "arm64: dts: qcom: talos-lyra-evk: Refactor display for overlay support"
  2. QCLINUX: Revert "arm64: dts: qcom: talos-lyra-evk: Add LT9611UXD HDMI bridge support"

The QCLINUX: prefix is appropriate for these commits because they are reverting vendor-specific changes to prepare for upstream FROMLIST patches. The target branch is early/hwe/lyra (not qcom-next or qcom-next-staging), so the prefix requirement applies and is satisfied.

Note: check-patch-compliance would fail these commits (if it had run) because it only accepts FROMLIST:, FROMGIT:, UPSTREAM:, and BACKPORT: prefixes. However, this is a known checker limitation for vendor-only commits — the QCLINUX: prefix is valid and widely used in the tree for vendor-specific changes.


Verdict

CI cannot validate this PR due to automerge conflicts between the target branch and qcom-next baseline.

The PR commits themselves are clean and properly formatted:

  • ✅ Both commits have valid QCLINUX: prefixes
  • ✅ Commit messages clearly explain the revert rationale
  • ✅ Changes are straightforward reverts of previous commits

Recommendation: Merge as-is if the branch maintainer approves, OR rebase early/hwe/lyra onto qcom-next to resolve automerge conflicts and re-trigger CI.

The automerge failure is a CI infrastructure limitation when validating PRs against divergent topic branches, not a defect in the submitted patches.

@qlijarvis

Copy link
Copy Markdown

🔨 Build Failure Analysis — PR #2116

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

# Error File:Line PR-introduced? Root Cause
1 Topic branch 'early/hwe/lyra' not found in qcom-next.yaml kernel-config-ci/qcom-next.yaml No Pre-existing CI configuration issue: the topic branch early/hwe/lyra is not registered in the kernel-config repository's qcom-next.yaml file

Verdict

This is not a compilation failure. The build failed during CI setup before any code was compiled. The error is pre-existing and unrelated to the PR changes — the topic branch needs to be added to the kernel-config repository's qcom-next.yaml configuration file.

📎 Detailed analysis: Full report

@qlijarvis

Copy link
Copy Markdown

🔨 Build Failure Analysis — PR #2116

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

# Error File:Line PR-introduced? Root Cause
1 Topic branch not found in config qcom-next.yaml No CI infrastructure: branch early/hwe/lyra is not registered in the kernel-config repository's qcom-next.yaml file

Verdict

0 of 1 errors are introduced by this PR; 1 is a pre-existing CI infrastructure configuration issue. The build never reached compilation — it failed during the setup phase when trying to locate the topic branch in the integration configuration.

📎 Detailed analysis: Full report

@qlijarvis

Copy link
Copy Markdown

PR #2116 — validate-patch

PR: #2116

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 revert commits, not posted upstream
  4. PR present in qcom-next/topics: Fail - 3/4 commit(s) are missing from both qcom-next and topics
Verdict: ⚠️ — click to expand

🔍 Patch Validation

PR: #2116 - Revert talos-lyra-evk display overlay changes
Upstream commit: N/A (vendor-only reverts)
Verdict: ⚠️ PARTIAL

Commit Message

Check Status Note
Subject matches upstream N/A QCLINUX: vendor-only reverts
Body preserves rationale ✅ Clear revert rationale provided for all 4 commits
Fixes tag present/correct N/A Not applicable for revert commits
Authorship preserved ✅ Consistent authorship (Anand Tiwari)
Backport note (if applicable) N/A Vendor-only commits

Diff

File Status Notes
arch/arm64/boot/dts/qcom/talos-lyra-evk.dts ✅ All 4 commits revert changes to this file; proper revert format

Issues

  • Integration presence concern: 3 of 4 commits are missing from both qcom-next and topics branches. Commit 1/4 shows only partial evidence. Since these are reverts of locally-authored content, this may be intentional cleanup, but the missing presence is flagged for reviewer awareness.

Verdict

Commits are well-formed vendor-only reverts with clear rationale. The missing qcom-next/topics presence for 3/4 commits should be verified by the reviewer to ensure this cleanup aligns with the intended 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 revert commits, not posted upstream
  4. PR present in qcom-next/topics: Fail - 3/4 commit(s) are missing from both qcom-next and topics (per integration_presence_report.md). Commit 1/4 shows partial evidence only. Since these are reverts removing locally-authored content, missing presence may be expected, but should be verified by reviewer.

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: c7896917e523946138ce654d4b6c1e33d5a8f4e5
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 "arm64: dts: qcom: talos-lyra-evk: 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] QCLINUX: Revert "arm64: dts: qcom: talos-lyra-evk: Add missing - no subject, patch-id, or full tree-content match found missing - no subject, patch-id, or full tree-content match found missing
3/4 [PATCH 3/4] QCLINUX: Revert "arm64: dts: qcom: talos-lyra-evk: Add missing - no subject, patch-id, or full tree-content match found missing - no subject, patch-id, or full tree-content match found missing
4/4 [PATCH 4/4] QCLINUX: Revert "arm64: dts: qcom: talos-lyra-evk: Add missing - no subject, patch-id, or full tree-content match found missing - no subject, patch-id, or full tree-content match found missing

Final Status

overall_status: FAIL
present_commits: 0/4
partial_commits: 1/4
missing_commits: 3/4
topics_checked_for_commits: 4/4
final_summary: PR present in qcom-next/topics: Fail - 3/4 commit(s) are missing from both qcom-next and topics

@qlijarvis

Copy link
Copy Markdown

PR #2116 — checker-log-analyzer

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

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: #2116 - Revert display-related commits on talos-lyra-evk
Source: https://github.com/qualcomm-linux/kernel-config/actions/runs/40361570923

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 — Automerge Conflict

Root cause: The CI automerge phase failed with merge conflicts when integrating topic/early/hwe/lyra with the baseline, preventing all checkers from running.

Failure details:

Merging topic branch: topic/early/hwe/lyra
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/qcom/Makefile
CONFLICT (add/add): Merge conflict in arch/arm64/boot/dts/qcom/talos-camera-lyra-evk.dtsi
CONFLICT (add/add): Merge conflict in arch/arm64/boot/dts/qcom/talos-camera-sensor-lyra-evk.dtsi
CONFLICT (add/add): Merge conflict in arch/arm64/boot/dts/qcom/talos-lyra-evk-som.dtsi
CONFLICT (add/add): Merge conflict in arch/arm64/boot/dts/qcom/talos-lyra-evk.dts
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/qcom/talos.dtsi
CONFLICT (content): Merge conflict in drivers/regulator/rpi-panel-v2-regulator.c
Automatic merge failed; fix conflicts and then commit the result.
automerge returned non-zero; check logs for conflicts
##[error]Process completed with exit code 1.

Analysis:

This PR reverts 4 display-related commits on talos-lyra-evk. The CI workflow attempts to merge the PR branch with the baseline (tag c7896917e523946138ce654d4b6c1e33d5a8f4e5) and encounters conflicts in:

  • DTS files: talos-lyra-evk.dts, talos-lyra-evk-som.dtsi, talos-camera-*.dtsi, talos.dtsi, Makefile
  • Driver: drivers/regulator/rpi-panel-v2-regulator.c

The conflicts are marked as add/add (both sides added the same file) or content (both sides modified the same lines). This indicates that the baseline has diverged from the PR branch — likely because:

  1. The reverted commits were already integrated into the baseline, OR
  2. Other conflicting changes were merged into the baseline after this PR branch was created

Fix:

The PR branch needs to be rebased on the current baseline to resolve conflicts:

# Fetch the latest baseline
git fetch origin

# Rebase the PR branch on the current baseline
git rebase origin/<base-branch>

# Resolve conflicts in each file:
# - For reverts: ensure the reverted content is removed
# - For add/add conflicts: decide which version to keep or merge both
# - For content conflicts: manually merge the changes

# After resolving each conflict:
git add <file>
git rebase --continue

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

Reproduce locally:

git clone https://github.com/qualcomm-linux/kernel-topics.git
cd kernel-topics
git fetch origin pull/2116/head:pr-2116
git checkout pr-2116
git rebase c7896917e523946138ce654d4b6c1e33d5a8f4e5
# Resolve conflicts as shown above

✅ tag-check

All 4 commits have valid subject prefixes:

  1. QCLINUX: Revert "arm64: dts: qcom: talos-lyra-evk: Refactor display for overlay support"
  2. QCLINUX: Revert "arm64: dts: qcom: talos-lyra-evk: Add LT9611UXD HDMI bridge support"
  3. QCLINUX: Revert "arm64: dts: qcom: talos-lyra-evk: Add RPI 7-inch DSI panel overlay"
  4. QCLINUX: Revert "arm64: dts: qcom: talos-lyra-evk: Add DLC DLC0697 panel overlay"

The QCLINUX: prefix is appropriate for vendor-specific changes with no upstream equivalent.

Verdict

Blocker: Automerge conflict must be resolved before checkers can run.

The PR cannot be evaluated for code quality issues until the merge conflicts are resolved. Once rebased and conflicts are fixed, re-trigger the CI to run all checkers on the updated branch.

Anand Tiwari added 4 commits October 30, 2026 16:13
…y support"

This reverts commit a54cbf9.

The display refactor (generic names for common supplies) was done to
prepare this branch for the locally-authored HDMI bridge and overlay
support. The HDMI bridge support is being re-picked as-is from the
upstream posting (FROMLIST) on tech/all/dt/qcs615, so the
locally-authored refactor on this branch is removed first to avoid
divergent node/label naming between the two branches.

Signed-off-by: Anand Tiwari <anand.tiwari@oss.qualcomm.com>
…upport"

This reverts commit 47fbdb4.

The HDMI bridge support is being re-picked as-is from the upstream
posting (FROMLIST) on tech/all/dt/qcs615, so the locally-authored
version with divergent node/label naming is removed from this
branch.

Signed-off-by: Anand Tiwari <anand.tiwari@oss.qualcomm.com>
…erlay"

This reverts commit 4c47931.

The RPi 7-inch DSI panel overlay depends on the locally-authored
HDMI bridge/overlay-refactor nodes that were just reverted on this
branch in favor of the upstream FROMLIST HDMI bridge support on
tech/all/dt/qcs615, so it no longer applies and is removed until
it can be re-picked against the new node/label naming.

Signed-off-by: Anand Tiwari <anand.tiwari@oss.qualcomm.com>
This reverts commit 09c24aa.

The DLC0697 panel overlay depends on the locally-authored HDMI
bridge/overlay-refactor nodes that were just reverted on this
branch in favor of the upstream FROMLIST HDMI bridge support on
tech/all/dt/qcs615, so it no longer applies and is removed until
it can be re-picked against the new node/label naming.

Signed-off-by: Anand Tiwari <anand.tiwari@oss.qualcomm.com>
@anan-tiwa
anan-tiwa force-pushed the revert-hdmi-overlay-refactor-early-hwe-lyra branch from 294b0e1 to d9663a5 Compare October 30, 2026 10:44
@qlijarvis

Copy link
Copy Markdown

🔨 Build Failure Analysis — PR #2116

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

# Error File:Line PR-introduced? Root Cause
1 Topic branch 'early/hwe/lyra' not found in qcom-next.yaml kernel-config CI script NO The topic branch exists in kernel-topics but is not registered in the kernel-config integration configuration file. This is a CI infrastructure configuration issue.

Verdict

0 compilation errors occurred (build failed during pre-build configuration, before any kernel source was compiled). The failure is NOT PR-introduced — it is a pre-existing CI configuration issue unrelated to the PR's device tree changes.

📎 Detailed analysis: Full report

@qlijarvis

Copy link
Copy Markdown

🔨 Build Failure Analysis — PR #2116

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

# Error File:Line PR-introduced? Root Cause
1 Topic branch not found in qcom-next.yaml qcom-next.yaml:N/A No (Pre-existing) The CI build system cannot find the topic branch early/hwe/lyra in the kernel-config repository's qcom-next.yaml configuration file. This is a CI infrastructure configuration issue, not a code error introduced by the PR changes.

Verdict

This is not a compilation failure caused by the PR code changes. The build failed during the CI setup phase because the topic branch early/hwe/lyra is not registered in the qcom-next.yaml configuration file in the kernel-config repository. The PR changes themselves (device tree reverts) are syntactically valid and do not introduce any compilation errors.

📎 Detailed analysis: Full report

@qlijarvis

Copy link
Copy Markdown

PR #2116 — validate-patch

PR: #2116

Verdict Issues Detailed Report
❌ 9 Full report

Final Summary

  1. Lore link present: No — Revert commits; no lore link expected or required for reverting locally-authored changes
  2. Lore link matches PR commits: N/A — no lore link to compare against
  3. Upstream patch status: N/A — Revert commits of locally-authored changes, not posted upstream
  4. PR present in qcom-next/topics: Fail - 3/4 commit(s) are missing from both qcom-next and topics
Verdict: ❌ — click to expand

🔍 Patch Validation

PR: #2116 - Revert display overlay support commits on tech/all/dt/qcs615
Upstream commit: N/A (Revert commits - no upstream lore links)
Verdict: ❌ FAIL

Commit Message

Check Status Note
Subject matches upstream N/A Revert commits - no upstream source to compare
Body preserves rationale ✅ Clear rationale for each revert provided
Fixes tag present/correct N/A Not applicable for revert commits
Authorship preserved ✅ Consistent author across all commits
Backport note (if applicable) N/A Not applicable for revert commits

Diff

File Status Notes
arch/arm64/boot/dts/qcom/talos-lyra-evk.dts ⚠️ All 4 commits revert changes to this file; reverts appear structurally correct

Issues

Critical: Missing from qcom-next/topics

  • Commit 2/4: Missing from both qcom-next and topics - revert of LT9611UXD HDMI bridge support
  • Commit 3/4: Missing from both qcom-next and topics - revert of RPI 7-inch DSI panel overlay
  • Commit 4/4: Missing from both qcom-next and topics - revert of DLC DLC0697 panel overlay
  • Commit 1/4: Partial presence only - display refactor revert has subject/partial tree evidence but full change not verified

Revert Chain Integrity

  • All four commits are reverting locally-authored changes (not upstream commits)
  • Rationale states these reverts prepare the branch for FROMLIST HDMI bridge support from tech/all/dt/qcs615
  • The commits being reverted (a54cbf9, 47fbdb4, 4c47931, 09c24aa) are not verified to exist in the target branch

No Upstream Lore Links

  • None of the four commits contain Link: tags to lore.kernel.org
  • This is expected for revert commits of locally-authored changes
  • However, the commits being reverted should have been validated before being added to the tree

Verdict

Do not merge - This PR fails integration presence validation. Three out of four commits are completely missing from both qcom-next and the kernel topics branches, and the fourth has only partial evidence. Revert commits must target commits that actually exist in the destination branch. The PR appears to be reverting commits that either:

  1. Were never merged to the target branch, or
  2. Are being reverted on the wrong branch

The submitter should verify:

  • That commits a54cbf9, 47fbdb4, 4c47931, and 09c24aa exist on the target branch
  • That this PR is being opened against the correct base branch
  • That the revert series is complete and in the correct order

Final Summary

  1. Lore link present: No — Revert commits; no lore link expected or required for reverting locally-authored changes
  2. Lore link matches PR commits: N/A — no lore link to compare against
  3. Upstream patch status: N/A — Revert commits of locally-authored changes, not posted upstream
  4. PR present in qcom-next/topics: Fail - 3/4 commit(s) are missing from both qcom-next and topics; 1/4 has only partial evidence. Integration presence check failed - these reverts cannot be applied because the commits being reverted are not present in the target integration 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: ae2606baf50f01e14ed7ddfa73116e5850c6c0d1
topics remote: topics -> https://github.com/qualcomm-linux/kernel-topics
topics fetch: fetched

Commit Subject qcom-next topics Final
1/4 [PATCH 1/4] Revert "arm64: dts: qcom: talos-lyra-evk: Refactor 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] Revert "arm64: dts: qcom: talos-lyra-evk: Add LT9611UXD missing - no subject, patch-id, or full tree-content match found missing - no subject, patch-id, or full tree-content match found missing
3/4 [PATCH 3/4] Revert "arm64: dts: qcom: talos-lyra-evk: Add RPI 7-inch missing - no subject, patch-id, or full tree-content match found missing - no subject, patch-id, or full tree-content match found missing
4/4 [PATCH 4/4] Revert "arm64: dts: qcom: talos-lyra-evk: Add DLC DLC0697 missing - no subject, patch-id, or full tree-content match found missing - no subject, patch-id, or full tree-content match found missing

Final Status

overall_status: FAIL
present_commits: 0/4
partial_commits: 1/4
missing_commits: 3/4
topics_checked_for_commits: 4/4
final_summary: PR present in qcom-next/topics: Fail - 3/4 commit(s) are missing from both qcom-next and topics

@qlijarvis

Copy link
Copy Markdown

PR #2116 — checker-log-analyzer

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

Checker Result Summary
Checker Result Summary
checkpatch ⏭️ Skipped - merge failed before checker could run
dt-binding-check ⏭️ Skipped - merge failed before checker could run
dtb-check ⏭️ Skipped - merge failed before checker could run
sparse-check ⏭️ Skipped - merge failed before checker could run
check-uapi-headers ⏭️ Skipped - merge failed before checker could run
check-patch-compliance ⏭️ Skipped - merge failed before checker could run
tag-check ❌ All 4 commits missing required subject prefix
qcom-next-check N/A Cannot determine - target branch unknown

Detailed report: Full report

Checker analysis — click to expand

🤖 CI Checker Analysis (checker-log-analyzer)

PR: #2116 - Revert display overlay support patches for talos-lyra-evk
Source: https://github.com/qualcomm-linux/kernel-config/actions/runs/41043086877

Checker Result Summary
checkpatch ⏭️ Skipped - merge failed before checker could run
dt-binding-check ⏭️ Skipped - merge failed before checker could run
dtb-check ⏭️ Skipped - merge failed before checker could run
sparse-check ⏭️ Skipped - merge failed before checker could run
check-uapi-headers ⏭️ Skipped - merge failed before checker could run
check-patch-compliance ⏭️ Skipped - merge failed before checker could run
tag-check ❌ All 4 commits missing required subject prefix
qcom-next-check N/A Cannot determine - target branch unknown

❌ CI Infrastructure Failure — Merge Conflicts

Root cause: The CI workflow failed during the automerge/integration step when attempting to merge the PR branch (topic/early/hwe/lyra) with the integration baseline. Multiple merge conflicts prevented the checkers from running.

Failure details:

Merging topic branches...
------------------------------------------
 ** Merging topic branch: topic/early/hwe/lyra
Auto-merging Documentation/devicetree/bindings/arm/qcom.yaml
Auto-merging arch/arm64/boot/dts/qcom/Makefile
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/qcom/Makefile
Auto-merging arch/arm64/boot/dts/qcom/talos-camera-lyra-evk.dtsi
CONFLICT (add/add): Merge conflict in arch/arm64/boot/dts/qcom/talos-camera-lyra-evk.dtsi
Auto-merging arch/arm64/boot/dts/qcom/talos-camera-sensor-lyra-evk.dtsi
CONFLICT (add/add): Merge conflict in arch/arm64/boot/dts/qcom/talos-camera-sensor-lyra-evk.dtsi
Auto-merging arch/arm64/boot/dts/qcom/talos-lyra-evk-som.dtsi
CONFLICT (add/add): Merge conflict in arch/arm64/boot/dts/qcom/talos-lyra-evk-som.dtsi
Auto-merging arch/arm64/boot/dts/qcom/talos-lyra-evk.dts
CONFLICT (add/add): Merge conflict in arch/arm64/boot/dts/qcom/talos-lyra-evk.dts
Auto-merging arch/arm64/boot/dts/qcom/talos.dtsi
CONFLICT (content): Merge conflict in arch/arm64/boot/dts/qcom/talos.dtsi
Auto-merging drivers/regulator/rpi-panel-v2-regulator.c
CONFLICT (content): Merge conflict in drivers/regulator/rpi-panel-v2-regulator.c
Automatic merge failed; fix conflicts and then commit the result.
Merge failed, manual merge

Analysis:

This is not a patch quality issue — the PR contains 4 revert commits that are syntactically valid. The failure occurred because:

  1. Integration baseline mismatch: The CI attempted to merge topic/early/hwe/lyra (the PR branch) into an integration baseline (c7896917e523946138ce654d4b6c1e33d5a8f4e5), but the files being reverted have diverged significantly from the baseline.

  2. Revert target not present: The integration presence report shows that 3 out of 4 commits being reverted are missing from both qcom-next and the topic branches. You cannot revert commits that don't exist in the target tree.

  3. Conflicting changes: The files touched by these reverts (talos-camera-lyra-evk.dtsi, talos-lyra-evk.dts, talos.dtsi, etc.) have been modified by other commits in the integration baseline, causing add/add and content conflicts.

Fix:

This PR cannot be merged as-is because it attempts to revert commits that are not present in the target integration branch. The author needs to:

  1. Verify the target branch: Confirm which branch this PR is targeting (likely topic/early/hwe/lyra or a related topic branch).

  2. Check commit presence: Use git log --oneline --grep="<subject>" to verify that the commits being reverted actually exist in the target branch.

  3. Rebase the PR: If the target branch has diverged, rebase the PR on the current tip of the target branch:

    git fetch origin <target-branch>
    git rebase origin/<target-branch>
    # Resolve any conflicts
    git push --force-with-lease
  4. Alternative approach: If the goal is to remove functionality that was added by commits that are no longer in the tree, consider:

    • Submitting a fresh patch that removes the unwanted code directly (not as a revert)
    • Or, if the commits were already reverted elsewhere, close this PR as superseded

Reproduce locally:

# Clone the kernel-topics repo
git clone https://github.com/qualcomm-linux/kernel-topics
cd kernel-topics

# Fetch the PR branch
git fetch origin pull/2116/head:pr-2116
git checkout pr-2116

# Attempt to merge with the integration baseline
git fetch origin <target-branch>
git merge origin/<target-branch>
# This will reproduce the merge conflicts seen in CI

❌ tag-check — Missing Subject Prefix

Root cause: All 4 commits in this PR have subjects starting with Revert "..." without a required prefix tag before the word Revert.

Failure details:

The PR contains 4 revert commits:

  1. Revert "arm64: dts: qcom: talos-lyra-evk: Refactor display for overlay support"
  2. Revert "arm64: dts: qcom: talos-lyra-evk: Add LT9611UXD HDMI bridge support"
  3. Revert "arm64: dts: qcom: talos-lyra-evk: Add RPI 7-inch DSI panel overlay"
  4. Revert "arm64: dts: qcom: talos-lyra-evk: Add DLC DLC0697 panel overlay"

Analysis:

Per the tag-check requirement (Section 2.7 of the skill), every commit subject must start with one of the required prefix tags:

  • FROMLIST: / FROMGIT: / UPSTREAM: / BACKPORT: / QCLINUX: / PENDING: / WORKAROUND:

For revert commits, the prefix must appear before the word Revert, e.g.:

  • ✅ UPSTREAM: Revert "arm64: dts: qcom: ..."
  • ✅ FROMLIST: Revert "arm64: dts: qcom: ..."
  • ❌ Revert "arm64: dts: qcom: ..." (no prefix)

Note: This check applies to all branches except qcom-next and qcom-next-staging. Since the target branch for this PR is unknown (CI failed before branch detection), I'm flagging this as a potential issue. If the target branch is qcom-next or qcom-next-staging, this check does not apply.

Fix:

Amend each commit to add the appropriate prefix:

git rebase -i HEAD~4

# For each commit, mark as 'reword' and change the subject to:
# QCLINUX: Revert "arm64: dts: qcom: talos-lyra-evk: Refactor display for overlay support"
# QCLINUX: Revert "arm64: dts: qcom: talos-lyra-evk: Add LT9611UXD HDMI bridge support"
# QCLINUX: Revert "arm64: dts: qcom: talos-lyra-evk: Add RPI 7-inch DSI panel overlay"
# QCLINUX: Revert "arm64: dts: qcom: talos-lyra-evk: Add DLC DLC0697 panel overlay"

git push --force-with-lease

Choose the correct prefix based on the origin of the commits being reverted:

  • If the original commits were vendor-only → QCLINUX:
  • If the original commits were posted upstream → FROMLIST: or UPSTREAM:
  • If the original commits were backports → BACKPORT:

Reproduce locally:

git log --format="%H %s" HEAD~4..HEAD | while read sha subject; do
  if ! echo "$subject" | grep -qE '^(FROMLIST|FROMGIT|UPSTREAM|BACKPORT|QCLINUX|PENDING|WORKAROUND):'; then
    echo "MISSING prefix: $sha $subject"
  fi
done

Verdict

Cannot merge — 2 blockers must be fixed:

  1. Merge conflicts (blocker): The PR cannot be integrated into the baseline because it attempts to revert commits that are not present in the target tree. The author must verify the target branch, confirm commit presence, and either rebase the PR or adopt an alternative approach (direct removal patch instead of revert).

  2. Missing subject prefix (conditional blocker): All 4 commits lack the required subject-line prefix tag. If the target branch is not qcom-next or qcom-next-staging, this is a blocker. Add QCLINUX: (or appropriate prefix) before Revert in each commit subject.

Next steps:

  1. Determine the target branch for this PR
  2. Verify that the commits being reverted exist in the target branch
  3. Rebase the PR on the current target branch tip
  4. Add subject-line prefix tags if required by the target branch
  5. Re-trigger CI after fixes

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