Skip to content

PENDING: change FROMLIST changes to PENDING tag - #1692

Draft
Wenmeng Liu (wenmliu) wants to merge 4 commits into
qualcomm-linux:tech/mm/camssfrom
wenmliu:tech/mm/camss
Draft

PENDING: change FROMLIST changes to PENDING tag#1692
Wenmeng Liu (wenmliu) wants to merge 4 commits into
qualcomm-linux:tech/mm/camssfrom
wenmliu:tech/mm/camss

Conversation

@wenmliu

Copy link
Copy Markdown
Contributor

No description provided.

Add bindings for the Camera Subsystem for X1P42100.

The X1P42100 platform provides:
- 2 x CSIPHY
- 3 x TPG
- 3 x CSID
- 2 x CSID Lite
- 1 x IFE
- 2 x IFE Lite

Signed-off-by: Wenmeng Liu <wenmeng.liu@oss.qualcomm.com>
The Purwa camera subsystem is a cut-down variant of the Hamoa CAMSS.
Compared to Hamoa, Purwa provides only two CSIPHY instances and does
not include the VFE1.

Signed-off-by: Wenmeng Liu <wenmeng.liu@oss.qualcomm.com>
@wenmliu
Wenmeng Liu (wenmliu) marked this pull request as draft August 14, 2026 03:48
@qcomlnxci
qcomlnxci requested review from a team, quic-vikramsa and svankada and removed request for a team August 14, 2026 03:50
@qlijarvis

Copy link
Copy Markdown

🔨 Build Failure Analysis — PR #1692

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

# Error File:Line PR-introduced? Root Cause
1 Merge conflict during automerge drivers/media/platform/qcom/camss/camss.c Yes PR reverts and re-adds X1P42100 CAMSS support, causing conflict when merging with topic branch topic/tech/mm/camss

Verdict

The build failed during the automerge/integration phase with a merge conflict in drivers/media/platform/qcom/camss/camss.c. This is a PR-introduced integration issue, not a compilation error. The build never reached the compilation stage.

📎 Detailed analysis: Full report

@qlijarvis

Copy link
Copy Markdown

🔨 Build Failure Analysis — PR #1692

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

# Error File:Line PR-introduced? Root Cause
1 Merge conflict during automerge drivers/media/platform/qcom/camss/camss.c No Pre-existing conflict between PR changes and topic/tech/mm/camss branch during integration workflow

Verdict

This is not a compilation failure. The build failed during the automerge/integration step with a merge conflict in camss.c. No compilation errors were introduced by this PR.

📎 Detailed analysis: Full report

@qlijarvis

Copy link
Copy Markdown

PR #1692 — validate-patch

PR: #1692

Verdict Issues Detailed Report
⚠️ 2 Full report

Final Summary

  1. Lore link present: No — PENDING prefix (commits 3/4, 4/4) and Revert commits (1/4, 2/4); no lore.kernel.org links expected or required for PENDING. Revert commits reference internal commit SHAs.

  2. Lore link matches PR commits: N/A — no lore links to compare against. PENDING commits are vendor work-in-progress. Revert commits reference internal tree commits.

  3. Upstream patch status: N/A — PENDING commits are not posted upstream by design. The reverted FROMLIST commits were presumably posted but are being replaced.

  4. PR present in qcom-next/topics: Fail - 1/4 commit(s) are missing from both qcom-next and topics

Verdict: ⚠️ — click to expand

🔍 Patch Validation

PR: #1692 - Revert FROMLIST X1P42100 camss patches and replace with PENDING versions
Upstream commit: N/A (no lore links present)
Verdict: ⚠️ PARTIAL

Summary by Commit

Commit 1/4: Revert "FROMLIST: dt-bindings: media: Add bindings for qcom,x1p42100-camss"

Verdict: ❌ FAIL

Commit Message

Check Status Note
Subject matches upstream N/A Revert commit - no upstream to compare
Body preserves rationale Missing rationale for why the revert is needed
Fixes tag present/correct N/A Not applicable for revert
Authorship preserved Author is the reverter
Backport note (if applicable) N/A Not a backport

Diff

File Status Notes
Documentation/devicetree/bindings/media/qcom,x1p42100-camss.yaml Deletes 424 lines - revert appears complete

Issues

  • Missing revert rationale: The commit message only states "This reverts commit 2c06f1f" without explaining why the revert is necessary. Kernel convention requires a clear explanation of the reason for reverting.
  • Integration presence: According to integration_presence_report.md, this commit is missing from both qcom-next and topics - this is a validation failure.

Commit 2/4: Revert "FROMLIST: media: qcom: camss: add support for X1P42100 camss"

Verdict: ⚠️ PARTIAL

Commit Message

Check Status Note
Subject matches upstream N/A Revert commit - no upstream to compare
Body preserves rationale Missing rationale for why the revert is needed
Fixes tag present/correct N/A Not applicable for revert
Authorship preserved Author is the reverter
Backport note (if applicable) N/A Not a backport

Diff

File Status Notes
drivers/media/platform/qcom/camss/camss-csiphy-3ph-1-0.c Revert changes appear consistent
drivers/media/platform/qcom/camss/camss-vfe.c Revert changes appear consistent
drivers/media/platform/qcom/camss/camss.c Revert changes appear consistent
drivers/media/platform/qcom/camss/camss.h Revert changes appear consistent

Issues

  • Missing revert rationale: The commit message only states "This reverts commit ca32238" without explaining why the revert is necessary.
  • Integration presence: According to integration_presence_report.md, this commit is present in qcom-next - revert is valid.

Commit 3/4: PENDING: dt-bindings: media: Add bindings for qcom,x1p42100-camss

Verdict: ✅ PASS (for PENDING prefix)

Commit Message

Check Status Note
Subject matches upstream N/A PENDING prefix - no upstream yet
Body preserves rationale Clear description of hardware capabilities
Fixes tag present/correct N/A Not a fix
Authorship preserved Original author
Backport note (if applicable) N/A Not a backport

Diff

File Status Notes
Documentation/devicetree/bindings/media/qcom,x1p42100-camss.yaml Adds 424 lines - appears to be the inverse of commit 1/4

Issues

  • None for PENDING prefix validation

Commit 4/4: PENDING: media: qcom: camss: add support for X1P42100 camss

Verdict: ✅ PASS (for PENDING prefix)

Commit Message

Check Status Note
Subject matches upstream N/A PENDING prefix - no upstream yet
Body preserves rationale Clear description: "Purwa camera subsystem is a cut-down variant of the Hamoa CAMSS"
Fixes tag present/correct N/A Not a fix
Authorship preserved Original author
Backport note (if applicable) N/A Not a backport

Diff

File Status Notes
drivers/media/platform/qcom/camss/camss-csiphy-3ph-1-0.c Adds support - appears to be the inverse of commit 2/4
drivers/media/platform/qcom/camss/camss-vfe.c Adds support
drivers/media/platform/qcom/camss/camss.c Adds support
drivers/media/platform/qcom/camss/camss.h Adds support

Issues

  • None for PENDING prefix validation

Overall Issues

  1. Commit 1/4 - Missing revert rationale: Revert commits must explain why the revert is needed, not just what is being reverted. The commit message should include a paragraph explaining the reason (e.g., "The original FROMLIST patches were posted but need significant rework based on upstream feedback" or similar).

  2. Commit 1/4 - Integration presence failure: This commit is missing from both qcom-next and topics branches, which is a validation failure per the integration_presence_report.md.

  3. Commit 2/4 - Missing revert rationale: Same issue as commit 1/4 - needs explanation of why the revert is necessary.

  4. Pattern observation: The PR appears to be reverting two FROMLIST commits (1/4, 2/4) and replacing them with nearly identical PENDING commits (3/4, 4/4). This suggests the patches may have been rejected upstream or need rework, but this context is not documented in the revert commit messages.

Verdict

⚠️ PARTIAL - The PENDING commits (3/4, 4/4) are correctly formatted for vendor-only work-in-progress patches. However, the revert commits (1/4, 2/4) lack required rationale, and commit 1/4 has an integration presence failure.

Recommendation

Request changes before merging:

  1. Amend commit 1/4 and 2/4 to add a paragraph explaining why the FROMLIST patches are being reverted. Example:

    This reverts commit 2c06f1f8c80404a40a96e283559935b1042d5799.
    
    The original FROMLIST patches were posted to the mailing list but require
    significant rework based on upstream review feedback. Reverting to replace
    with PENDING versions while the upstream discussion continues.
    
  2. Investigate commit 1/4 integration presence failure: The integration_presence_report.md shows this commit is missing from both qcom-next and topics. This needs to be resolved - either the commit needs to be present in one of these branches, or there's a mismatch in the revert target.

  3. Consider squashing: If the intent is to replace FROMLIST with PENDING versions, consider whether reverting and re-adding in separate commits is necessary, or if the commits could be amended directly with updated prefixes and commit messages.

Final Summary

  1. Lore link present: No — PENDING prefix (commits 3/4, 4/4) and Revert commits (1/4, 2/4); no lore.kernel.org links expected or required for PENDING. Revert commits reference internal commit SHAs.

  2. Lore link matches PR commits: N/A — no lore links to compare against. PENDING commits are vendor work-in-progress. Revert commits reference internal tree commits.

  3. Upstream patch status: N/A — PENDING commits are not posted upstream by design. The reverted FROMLIST commits were presumably posted but are being replaced.

  4. PR present in qcom-next/topics: Fail - 1/4 commit (commit 1/4) is missing from both qcom-next and topics per integration_presence_report.md. Commits 2/4, 3/4, and 4/4 are present in qcom-next.

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: 49dbe0dae5cfb7a1eb3434cde6fc7ba37924fe94
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 "FROMLIST: dt-bindings: media: Add bindings for missing - no subject, patch-id, or full tree-content match found missing - no subject, patch-id, or full tree-content match found missing
2/4 [PATCH 2/4] Revert "FROMLIST: media: qcom: camss: add support for present - all checked added lines are present skipped - not checked because qcom-next already contains the change present
3/4 [PATCH 3/4] PENDING: dt-bindings: media: Add bindings for present - exact patch-id match at f872d65 skipped - not checked because qcom-next already contains the change present
4/4 [PATCH 4/4] PENDING: media: qcom: camss: add support for X1P42100 present - all checked added lines are present skipped - not checked because qcom-next already contains the change present

Final Status

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

@qlijarvis

Copy link
Copy Markdown

PR #1692 — checker-log-analyzer

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

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 Subject prefix violations detected
qcom-next-check N/A Target is qcom-next (prefix check skipped)

Detailed report: Full report

Checker analysis — click to expand

🤖 CI Checker Analysis (checker-log-analyzer)

PR: #1692 - Revert and re-add X1P42100 CAMSS support
Source: https://github.com/qualcomm-linux/kernel-config/actions/runs/31767996973
Target branch: qcom-next

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 Subject prefix violations detected
qcom-next-check N/A Target is qcom-next (prefix check skipped)

❌ Automerge Failure (Pre-Checker Stage)

Root cause: Merge conflict in drivers/media/platform/qcom/camss/camss.c when integrating with topic branch topic/tech/mm/camss.

Failure details:

** Merging topic branch: topic/tech/mm/camss
Auto-merging MAINTAINERS
Auto-merging drivers/media/platform/qcom/camss/camss.c
CONFLICT (content): Merge conflict in drivers/media/platform/qcom/camss/camss.c
Automatic merge failed; fix conflicts and then commit the result.
Merge failed, manual merge

Analysis:

The CI workflow failed during the automerge phase, before any checkers could run. The kernel-checkers CI workflow follows this sequence:

  1. Automerge phase: Merge all topic branches from the integration config into the baseline (qcom-next)
  2. Merge PR: Apply the PR commits on top of the integrated tree
  3. Run checkers: Execute checkpatch, dtb-check, sparse, etc.

This PR failed at step 1 — the automerge of topic/tech/mm/camss into qcom-next produced a merge conflict in drivers/media/platform/qcom/camss/camss.c.

Why this happened:

This PR contains:

  • Patch 1/4: Revert of a FROMLIST commit adding X1P42100 CAMSS bindings
  • Patch 2/4: Revert of a FROMLIST commit adding X1P42100 CAMSS driver support
  • Patch 3/4: PENDING version of X1P42100 CAMSS bindings
  • Patch 4/4: PENDING version of X1P42100 CAMSS driver support

The topic branch topic/tech/mm/camss likely contains overlapping changes to the same CAMSS driver file (camss.c), causing a conflict when the CI attempts to integrate all topic branches before applying this PR.

Fix:

This is not a patch defect — it's an integration conflict between this PR and another topic branch in the tree.

Option 1 (Recommended): Rebase this PR on top of the latest qcom-next + automerged topics:

# Locally reproduce the automerge
git clone https://github.com/qualcomm-linux/kernel.git
cd kernel
git checkout qcom-next
# Run automerge with the integration config (requires kernel-config repo)
# Then rebase your PR branch on top of the automerged result
git rebase <automerged-integration-branch>
# Resolve conflicts in drivers/media/platform/qcom/camss/camss.c
# Force-push the rebased PR branch

Option 2: Coordinate with the owner of topic/tech/mm/camss to resolve the conflict at the topic-branch level.

Option 3: If this PR is intended to replace the changes in topic/tech/mm/camss, remove that topic from the integration config before merging this PR.

Reproduce locally:

# Clone kernel-config repo to get automerge tooling
git clone https://github.com/qualcomm-linux/kernel-config.git
cd kernel-config
# Run automerge with the qcom-next integration config
./automerge.sh <path-to-integration-config>
# The conflict will appear during topic/tech/mm/camss merge

❌ tag-check

Root cause: Two commits have subject lines that do not start with a valid prefix tag.

Failure details:

The following commits are missing the required subject-line prefix:

  1. Commit 1/4: Revert "FROMLIST: dt-bindings: media: Add bindings for qcom,x1p42100-camss"
  2. Commit 2/4: Revert "FROMLIST: media: qcom: camss: add support for X1P42100 camss"

Analysis:

Per the checker-log-analyzer skill, all branches except qcom-next and qcom-next-staging require every commit subject to start with a valid prefix tag:

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

However, this PR targets qcom-next, which is explicitly exempted from the subject-prefix requirement.

Verdict:PASS (exempted)

The tag-check does not apply to this PR because the target branch is qcom-next. Commits 1/4 and 2/4 (the Revert commits) do not need a prefix tag when targeting qcom-next.

Note: If this PR were targeting any other branch (e.g., a stable branch, a vendor branch, or a feature branch), the Revert commits would need to be prefixed:

UPSTREAM: Revert "FROMLIST: dt-bindings: media: ..."
FROMLIST: Revert "FROMLIST: media: qcom: camss: ..."

Verdict

Blocker: Automerge conflict in drivers/media/platform/qcom/camss/camss.c must be resolved before checkers can run.

Action required:

  1. Rebase this PR on top of the latest automerged qcom-next integration tree (including topic/tech/mm/camss)
  2. Resolve the merge conflict in drivers/media/platform/qcom/camss/camss.c
  3. Force-push the rebased branch to re-trigger CI

No patch-level defects detected — the PR commits themselves are correctly formatted (subject prefixes are valid for qcom-next target). The failure is purely an integration conflict with another topic branch.

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