Skip to content

Revert "PENDING: ARM: config: Enable ADC and RTC_GLINK defconfigs" - #1810

Open
raryan-qcom wants to merge 1 commit into
qualcomm-linux:tech/pmic/miscfrom
raryan-qcom:defconfig-revert
Open

raryan-qcom wants to merge 1 commit into
qualcomm-linux:tech/pmic/miscfrom
raryan-qcom:defconfig-revert

Conversation

@raryan-qcom

@raryan-qcom raryan-qcom commented Sep 10, 2026

Copy link
Copy Markdown

This reverts commit e7bb366.

CRs-Fixed: 4636784

This reverts commit e7bb366.

Signed-off-by: Raj Aryan <raryan@qti.qualcomm.com>
@qcomlnxci
qcomlnxci requested review from a team, QUIC-kamalw, fenglinw-qcom and kotarake and removed request for a team September 10, 2026 12:38
@qlijarvis

Copy link
Copy Markdown

PR #1810 — validate-patch

PR: #1810

Verdict Issues Detailed Report
0 Full report

Final Summary

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

🔍 Patch Validation

PR: #1810 - Revert "PENDING: ARM: config: Enable ADC and RTC_GLINK defconfigs"
Upstream commit: N/A (revert of vendor PENDING commit)
Verdict: ❌ FAIL

Commit Message

Check Status Note
Subject matches upstream N/A Revert of PENDING commit; no upstream source
Body preserves rationale Missing explanation of why revert is needed
Fixes tag present/correct N/A Not applicable for revert commits
Authorship preserved Correct author and sign-off
Backport note (if applicable) N/A Not a backport

Diff

File Status Notes
arch/arm64/configs/defconfig Clean revert: removes CONFIG_RTC_DRV_QCOM_GLINK=m and CONFIG_QCOM_SPMI_ADC5_GEN3=m

Issues

  1. Missing revert justification: Kernel best practice requires revert commits to explain why the revert is necessary. The commit message should state the reason (e.g., "causes boot regression", "feature not ready", "breaks subsystem X").
  2. Integration presence failure: Commit is missing from both qcom-next and all topic branches (0/1 commits present). This indicates the change has not been integrated into the kernel tree.

Verdict

Do not merge. The commit message must be amended to include a clear justification for the revert. Additionally, the integration presence failure suggests this change may not have been properly coordinated with the kernel integration workflow.

Final Summary

  1. Lore link present: No — revert of PENDING: commit; no lore link expected or required
  2. Lore link matches PR commits: N/A — no lore link to compare against (revert of vendor-only PENDING commit)
  3. Upstream patch status: N/A — revert of vendor-only PENDING change, not posted upstream
  4. PR present in qcom-next/topics: Fail — 1/1 commit(s) are missing from both qcom-next and topics (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] Revert "PENDING: ARM: config: Enable ADC and RTC_GLINK 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/1
partial_commits: 0/1
missing_commits: 1/1
topics_checked_for_commits: 1/1
final_summary: PR present in qcom-next/topics: Fail - 1/1 commit(s) are missing from both qcom-next and topics

@qlijarvis

Copy link
Copy Markdown

PR #1810 — checker-log-analyzer

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

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 Missing subject prefix

Detailed report: Full report

Checker analysis — click to expand

🤖 CI Checker Analysis (checker-log-analyzer)

PR: #1810 - Revert "PENDING: ARM: config: Enable ADC and RTC_GLINK defconfigs"
Source: https://github.com/qualcomm-linux/kernel-config/actions/runs/34477872306

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 Missing subject prefix

❌ CI Infrastructure — Automerge Failure

Root cause: All checker jobs failed during the automerge step with merge conflicts before any actual checks could run.

Failure details:

Automatic merge failed; fix conflicts and then commit the result.
Merge failed, manual merge

Conflicts in multiple files including:
- Documentation/devicetree/bindings/arm/qcom,coresight-ctcu.yaml
- Documentation/devicetree/bindings/arm/qcom,coresight-tnoc.yaml
- Documentation/devicetree/bindings/arm/qcom.yaml
- Documentation/devicetree/bindings/clock/qcom,glymur-evacc.yaml
- sound/soc/qcom/qdsp6/audioreach.h
- sound/soc/qcom/qdsp6/q6apm-lpass-dais.c
- sound/soc/qcom/qdsp6/q6dsp-lpass-clocks.c
- sound/soc/qcom/qdsp6/q6prm-clocks.c
- sound/soc/qcom/qdsp6/q6prm.h
- sound/soc/qcom/qdsp6/topology.c
- sound/soc/qcom/sc8280xp.c
(and many more)

Analysis: The CI workflow attempts to run automerge (topic branch integration) before applying the PR commits. This automerge step encountered extensive merge conflicts across devicetree bindings and sound subsystem files. Since automerge failed, the CI could not establish a clean baseline to test the PR against, causing all checker jobs to abort.

Important: This is a CI infrastructure/workflow issue, not a defect in the PR patch itself. The PR only modifies arch/arm64/configs/defconfig (removing 2 config lines), which has no relation to the files that conflicted during automerge.

Fix:

  1. Immediate: Re-trigger the CI run. The automerge conflicts may be transient if topic branches have been updated.
  2. If conflicts persist: The target branch's topic integration configuration may need attention. Contact the maintainers to resolve the automerge conflicts in the baseline before this PR can be tested.

Reproduce locally:

# Clone the kernel-config repo and run automerge manually
git clone https://github.com/qualcomm-linux/kernel-config.git
cd kernel-config
# Follow the automerge workflow from the CI script

❌ tag-check — Missing Subject Prefix

Root cause: The commit subject line is a Revert commit without a required prefix before the word "Revert".

Failure details:

Commit 79dde3296f31842d3cc8b3db1270fde76f78807d
Subject: Revert "PENDING: ARM: config: Enable ADC and RTC_GLINK defconfigs"

The subject line starts with Revert but has no prefix tag (FROMLIST:, FROMGIT:, UPSTREAM:, BACKPORT:, QCLINUX:, PENDING:, or WORKAROUND:) before it.

Analysis: This PR targets a branch that is not qcom-next or qcom-next-staging (the CI log shows "non-qcom-next-staging path"). For all such branches, every commit subject must start with a valid prefix tag. Revert commits must also carry a prefix before the word Revert, for example:

  • UPSTREAM: Revert "..."
  • FROMLIST: Revert "..."
  • QCLINUX: Revert "..."

Fix:

git rebase -i HEAD~1   # mark the commit as 'edit'
git commit --amend -m "QCLINUX: Revert \"PENDING: ARM: config: Enable ADC and RTC_GLINK defconfigs\""
git rebase --continue
git push --force-with-lease

Choose the appropriate prefix based on the revert's context:

  • If this revert is vendor-specific → QCLINUX:
  • If this revert is posted to lore → FROMLIST:
  • If this revert is merged upstream → UPSTREAM:

Since the original commit being reverted had a PENDING: prefix (vendor work-in-progress), the revert is likely also vendor-specific, so QCLINUX: is the most appropriate prefix.

Reproduce locally:

# Check the commit subject
git log -1 --format="%s" 79dde3296f31842d3cc8b3db1270fde76f78807d

# Verify it lacks a valid prefix
echo "Revert \"PENDING: ARM: config: Enable ADC and RTC_GLINK defconfigs\"" | \
  grep -qE '^(FROMLIST|FROMGIT|UPSTREAM|BACKPORT|QCLINUX|PENDING|WORKAROUND):' || \
  echo "FAIL: Missing prefix"

Verdict

2 blockers must be fixed before merge:

  1. CI Infrastructure: Automerge conflicts prevent all checkers from running. Re-trigger CI or resolve baseline topic integration conflicts.

  2. Subject Prefix: Add a valid prefix tag before Revert in the commit subject (recommended: QCLINUX: Revert "...").

Note: Once the automerge issue is resolved and CI runs successfully, additional checker failures may surface. The tag-check failure is definite and should be fixed now. The patch content itself (removing 2 defconfig lines) is trivial and unlikely to cause checkpatch, sparse, or other checker failures.

@qlijarvis

Copy link
Copy Markdown

🔨 Build Failure Analysis — PR #1810

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

# Error File:Line PR-introduced? Root Cause
1 Merge conflict during automerge Documentation/devicetree/bindings/arm/qcom,coresight-ctcu.yaml No Pre-existing conflict between topic branches during CI integration testing
2 Merge conflict during automerge Documentation/devicetree/bindings/arm/qcom,coresight-tnoc.yaml No Pre-existing conflict between topic branches during CI integration testing
3 Merge conflict during automerge Documentation/devicetree/bindings/arm/qcom.yaml No Pre-existing conflict between topic branches during CI integration testing
4 Merge conflict during automerge Documentation/devicetree/bindings/clock/qcom,glymur-evacc.yaml No Pre-existing conflict between topic branches during CI integration testing
5 Merge conflict during automerge Multiple additional files (50+ conflicts) No Pre-existing conflicts between topic branches during CI integration testing

Verdict

All merge conflicts are pre-existing integration issues; none are introduced by this PR. The PR only removes two config lines from arch/arm64/configs/defconfig and does not touch any of the conflicting files. The build never reached compilation stage.

📎 Detailed analysis: Full report

@qlijarvis

Copy link
Copy Markdown

🔨 Build Failure Analysis — PR #1810

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

Analysis Result

Build Stage: Automerge (Integration)
Failure Type: Merge Conflicts (145 conflicts)
Compilation Status: Not reached

Category Count Details
Merge Conflicts 145 Conflicts across DT bindings, device trees, drivers, and subsystems
Compilation Errors 0 Build never reached compilation stage
PR-introduced Issues 0 PR changes are clean; conflicts are integration-related

Verdict

This PR does not introduce any build errors. The failure occurred during the automerge/integration step when attempting to merge the topic/tech/pmic/misc branch with other topic branches. The PR itself only removes two defconfig entries (CONFIG_RTC_DRV_QCOM_GLINK and CONFIG_QCOM_SPMI_ADC5_GEN3) and is a clean revert. All 145 conflicts are pre-existing integration issues between topic branches, not caused by this PR's changes.

📎 Detailed analysis: Full report

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