[arpit-dev-geek]

arm64: dts: qcom: shikra: replace stale PENDING display patches with qcom-next versions

The Shikra CQS/CQM EVK display enablement and ili7807s panel nodes were
carried on this branch as PENDING patches, written before the series was
posted upstream. The series has since been reworked through v3 and applied
to qcom-next, so replace the stale PENDING patches with the versions that
actually landed there.

Reverts:
64cf482 PENDING: arm64: dts: qcom: shikra-cqs-evk: Enable display
e9c3ec4 PENDING: arm64: dts: qcom: shikra-cqm-evk: Enable display and add ili7807s panel

Picked from qcom-next:
100c10e arm64: dts: qcom: shikra-cqs-evk: Enable display and add ili7807s panel
ecbe8f2 arm64: dts: qcom: shikra-cqm-evk: Enable display and add ili7807s panel

Depends on #1326 (ILI7807S panel driver and DT binding), which
provides the "ilitek,ili7807s" compatible these nodes reference. Base
branch is set to shikra_update; GitHub will retarget it to qcom-6.18.y
once PR1 merges.

Signed-off-by: Arpit Saini arpit.saini@oss.qualcomm.com
Link: https://lore.kernel.org/r/20260713-shikra-dt-changes-v3-2-15102fca9570@oss.qualcomm.com
Link: https://lore.kernel.org/r/20260713-shikra-dt-changes-v3-3-15102fca9570@oss.qualcomm.com
qcom-next : 100c10e, ecbe8f2
CRs-Fixed: 4718454

[qlijarvis]

PR #1336 — validate-patch

PR: #1336

Verdict	Issues	Detailed Report
⚠️	0	Full report

Final Summary

1. Lore link present: Yes - all 8 commits have lore.kernel.org links
2. Lore link matches PR commits: Yes - all non-revert commits (3-4, 7-8) are faithful to their lore sources; revert commits (1-2, 5-6) correctly link to the replacement patches
3. Upstream patch status:
   • Commits 3-4 (ILI7807S v4): ✅ ACKed - Applied to drm-misc-next
   • Commits 7-8 (Shikra display): ⏳ Decision Pending - Reviewed-by present, no merge confirmation in lore thread yet, but present in qcom-next
4. PR present in qcom-next/topics: Fail - 4/8 commit(s) are missing from both qcom-next and topics

Verdict: ⚠️ — click to expand

🔍 Patch Validation

PR: #1336 - Update ILI7807S panel driver and Shikra display support to upstream versions
Commits: 8 commits (4 reverts + 2 UPSTREAM + 2 FROMLIST)
Verdict: ⚠️ PARTIAL

---

Summary by Commit

Commit 1/8: FROMLIST: Revert "FROMLIST: drm/panel: add Ilitek ILI7807S panel driver"

Lore link: https://lore.kernel.org/r/20260701-ili7807s-v4-2-c7d76d4780a5@oss.qualcomm.com
Type: Revert commit (removing old v1 FROMLIST to make way for v4 UPSTREAM)
Verdict: ✅ PASS

Check	Status	Note
Lore link present	✅	Links to the v4 upstream patch that will replace the reverted v1
Revert rationale clear	✅	"This was the v1 version posted upstream. Reverting so the final v4 version, as merged into mainline, can be applied in its place."
Authorship	✅	Arpit Saini (submitter)
Upstream status	✅ ACKed	v4 patch applied to drm-misc-next
qcom-next presence	⚠️	Missing from qcom-next/topics (revert commit not yet integrated)

---

Commit 2/8: FROMLIST: Revert "FROMLIST: dt-bindings: display: panel: add Ilitek ILI7807S panel controller"

Lore link: https://lore.kernel.org/r/20260701-ili7807s-v4-1-c7d76d4780a5@oss.qualcomm.com
Type: Revert commit (removing old v1 FROMLIST to make way for v4 UPSTREAM)
Verdict: ✅ PASS

Check	Status	Note
Lore link present	✅	Links to the v4 upstream patch that will replace the reverted v1
Revert rationale clear	✅	"This was the v1 version posted upstream. Reverting so the final v4 version, as merged into mainline, can be applied in its place."
Authorship	✅	Arpit Saini (submitter)
Upstream status	✅ ACKed	v4 patch applied to drm-misc-next
qcom-next presence	⚠️	Missing from qcom-next/topics (revert commit not yet integrated)

---

Commit 3/8: UPSTREAM: dt-bindings: display: panel: add Ilitek ILI7807S panel controller

Lore link: https://patch.msgid.link/20260701-ili7807s-v4-1-c7d76d4780a5@oss.qualcomm.com
Type: UPSTREAM (v4 version, replaces reverted v1)
Verdict: ✅ PASS

Check	Status	Note
Subject matches upstream	✅	Identical to lore v4 patch
Body preserves rationale	✅	Complete description preserved
Authorship preserved	✅	From: Arpit Saini matches lore author
Reviewed-by tags	✅	Krzysztof Kozlowski present
Signed-off-by chain	✅	Arpit Saini → Neil Armstrong (maintainer)
Cherry-pick note	✅	(cherry picked from commit 447a76a99e242fd04eaea33ecd9a6d73992e49a0)
Upstream status	✅ ACKed	Applied to drm-misc-next
qcom-next presence	✅	Present (patch-id match at 447a76a)

Diff: ✅ Faithful to lore patch - adds dt-bindings YAML for ilitek,ili7807s

---

Commit 4/8: UPSTREAM: drm/panel: add Ilitek ILI7807S panel driver

Lore link: https://patch.msgid.link/20260701-ili7807s-v4-2-c7d76d4780a5@oss.qualcomm.com
Type: UPSTREAM (v4 version, replaces reverted v1)
Verdict: ✅ PASS

Check	Status	Note
Subject matches upstream	✅	Identical to lore v4 patch
Body preserves rationale	✅	Complete description preserved
Authorship preserved	✅	From: Arpit Saini matches lore author
Reviewed-by tags	✅	Neil Armstrong present
Signed-off-by chain	✅	Arpit Saini → Neil Armstrong (maintainer)
Cherry-pick note	✅	(cherry picked from commit dd7ec83f456734de8efc115eac671e5add82777a)
Upstream status	✅ ACKed	Applied to drm-misc-next
qcom-next presence	✅	Present (all added lines found in qcom-next)

Diff: ✅ Faithful to lore patch - adds panel-ilitek-ili7807s.c driver (285 lines, v4 version)

---

Commit 5/8: FROMLIST: Revert "PENDING: arm64: dts: qcom: shikra-cqs-evk: Enable display"

Lore link: https://lore.kernel.org/r/20260713-shikra-dt-changes-v3-2-15102fca9570@oss.qualcomm.com
Type: Revert commit (removing old PENDING version to make way for FROMLIST v3)
Verdict: ✅ PASS

Check	Status	Note
Lore link present	✅	Links to the v3 patch that will replace the reverted PENDING version
Revert rationale clear	✅	"This was an early PENDING version. Reverting so the reworked version posted upstream and applied to qcom-next can be used in its place."
Conflict resolution documented	✅	Explains USB node context changes
Authorship	✅	Arpit Saini (submitter)
Upstream status	⏳ Pending	Reviewed-by: Konrad Dybcio; no merge signal yet in lore thread
qcom-next presence	⚠️	Missing from qcom-next/topics (revert commit not yet integrated)

---

Commit 6/8: FROMLIST: Revert "PENDING: arm64: dts: qcom: shikra-cqm-evk: Enable display"

Lore link: https://lore.kernel.org/r/20260713-shikra-dt-changes-v3-3-15102fca9570@oss.qualcomm.com
Type: Revert commit (removing old PENDING version to make way for FROMLIST v3)
Verdict: ✅ PASS

Check	Status	Note
Lore link present	✅	Links to the v3 patch that will replace the reverted PENDING version
Revert rationale clear	✅	"This was an early PENDING version. Reverting so the reworked version posted upstream and applied to qcom-next can be used in its place."
Authorship	✅	Arpit Saini (submitter)
Upstream status	⏳ Pending	Reviewed-by: Konrad Dybcio; no merge signal yet in lore thread
qcom-next presence	⚠️	Missing from qcom-next/topics (revert commit not yet integrated)

---

Commit 7/8: FROMLIST: arm64: dts: qcom: shikra-cqm-evk: Enable display and add ili7807s panel

Lore link: https://lore.kernel.org/r/20260713-shikra-dt-changes-v3-3-15102fca9570@oss.qualcomm.com
Type: FROMLIST (v3 version, replaces reverted PENDING)
Verdict: ⚠️ REVIEW - Prefix inconsistency

Check	Status	Note
Subject matches upstream	✅	Matches lore v3 patch
Body preserves rationale	✅	Complete description preserved
Authorship (FROMLIST)	✅	From: Arpit Saini (submitter); Nabige Aala Signed-off-by present (original author)
Signed-off-by chain	✅	Arpit Saini → Nabige Aala (original lore author)
Cherry-pick note	⚠️	(cherry picked from commit ecbe8f2588e7c4836f5e20b609265f4988345b0f) - suggests already in qcom-next
Upstream status	⏳ Pending	Reviewed-by: Konrad Dybcio; no merge confirmation in lore thread
qcom-next presence	✅	Present (all added lines found in qcom-next)

Issue: Commit is marked FROMLIST: but has a cherry-pick note and is present in qcom-next. If the commit is already in qcom-next, the prefix should be FROMGIT: (from maintainer tree) rather than FROMLIST: (from mailing list, not yet merged).

Diff: ✅ Adds display support for shikra-cqm-evk with ili7807s panel

---

Commit 8/8: FROMLIST: arm64: dts: qcom: shikra-cqs-evk: Enable display and add ili7807s panel

Lore link: https://lore.kernel.org/r/20260713-shikra-dt-changes-v3-2-15102fca9570@oss.qualcomm.com
Type: FROMLIST (v3 version, replaces reverted PENDING)
Verdict: ⚠️ REVIEW - Prefix inconsistency

Check	Status	Note
Subject matches upstream	✅	Matches lore v3 patch
Body preserves rationale	✅	Complete description preserved
Authorship (FROMLIST)	✅	From: Arpit Saini (submitter); Nabige Aala Signed-off-by present (original author)
Signed-off-by chain	✅	Arpit Saini → Nabige Aala (original lore author)
Cherry-pick note	⚠️	(cherry picked from commit 100c10e28b6aa6bc9b77b99c65dfb39da06514ec) - suggests already in qcom-next
Upstream status	⏳ Pending	Reviewed-by: Konrad Dybcio; no merge confirmation in lore thread
qcom-next presence	✅	Present (all added lines found in qcom-next)

Issue: Commit is marked FROMLIST: but has a cherry-pick note and is present in qcom-next. If the commit is already in qcom-next, the prefix should be FROMGIT: (from maintainer tree) rather than FROMLIST: (from mailing list, not yet merged).

Diff: ✅ Adds display support for shikra-cqs-evk with ili7807s panel

---

Issues Found

1. Commits 7-8: Prefix inconsistency - Both commits are marked FROMLIST: but include cherry-pick notes and are present in qcom-next. According to kernel commit prefix conventions:

   • FROMLIST: = Posted to mailing list, not yet merged into any tree
   • FROMGIT: = In a maintainer's git tree (e.g., qcom-next) but not yet in Linus's tree

   Since these commits are already in qcom-next (per integration_presence_report.md and the cherry-pick notes), they should use FROMGIT: prefix instead of FROMLIST:.

2. Commits 1-2, 5-6: Revert commits missing from qcom-next - The four revert commits are not present in qcom-next or topics. This is expected for new revert commits that haven't been integrated yet, but it means the PR introduces a temporary inconsistency: it reverts old versions that are in the tree and adds new versions that are also in the tree, creating potential conflicts during integration.

Recommendation

Merge with minor corrections:

1. Update commit prefixes for commits 7-8: Change FROMLIST: to FROMGIT: since these commits are already in qcom-next (as evidenced by the cherry-pick notes and integration presence report).

2. Verify revert necessity: Confirm that commits 1-2 and 5-6 are actually reverting commits that exist in the target branch. If the old v1/PENDING versions are not in the target integration branch, these reverts may be unnecessary.

3. Consider squashing the revert+add pairs: An alternative approach would be to squash each revert+add pair (1+3, 2+4, 5+8, 6+7) into single commits that directly update from old to new versions, which would be cleaner for integration.

The core content is correct and faithful to upstream - the issues are primarily about commit metadata and integration workflow.

---

Final Summary

1. Lore link present: Yes - all 8 commits have lore.kernel.org links
2. Lore link matches PR commits: Yes - all non-revert commits (3-4, 7-8) are faithful to their lore sources; revert commits (1-2, 5-6) correctly link to the replacement patches
3. Upstream patch status:
   • Commits 3-4 (ILI7807S v4): ✅ ACKed - Applied to drm-misc-next
   • Commits 7-8 (Shikra display): ⏳ Decision Pending - Reviewed-by present, no merge confirmation in lore thread yet, but present in qcom-next
4. PR present in qcom-next/topics: Partial - 4/8 commits present (commits 3-4, 7-8); 4/8 commits missing (revert commits 1-2, 5-6)

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/8	[PATCH 1/8] FROMLIST: Revert "FROMLIST: drm/panel: add Ilitek	missing - no subject, patch-id, or full tree-content match found	missing - no subject, patch-id, or full tree-content match found	missing
2/8	[PATCH 2/8] FROMLIST: Revert "FROMLIST: dt-bindings: display: panel:	missing - no subject, patch-id, or full tree-content match found	missing - no subject, patch-id, or full tree-content match found	missing
3/8	[PATCH 3/8] UPSTREAM: dt-bindings: display: panel: add Ilitek	present - exact patch-id match at 447a76a	skipped - not checked because qcom-next already contains the change	present
4/8	[PATCH 4/8] UPSTREAM: drm/panel: add Ilitek ILI7807S panel driver	present - all checked added lines are present	skipped - not checked because qcom-next already contains the change	present
5/8	[PATCH 5/8] FROMLIST: Revert "PENDING: arm64: dts: qcom:	missing - no subject, patch-id, or full tree-content match found	missing - no subject, patch-id, or full tree-content match found	missing
6/8	[PATCH 6/8] FROMLIST: Revert "PENDING: arm64: dts: qcom:	missing - no subject, patch-id, or full tree-content match found	missing - no subject, patch-id, or full tree-content match found	missing
7/8	[PATCH 7/8] FROMLIST: arm64: dts: qcom: shikra-cqm-evk: Enable	present - all checked added lines are present	skipped - not checked because qcom-next already contains the change	present
8/8	[PATCH 8/8] FROMLIST: arm64: dts: qcom: shikra-cqs-evk: Enable	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: 4/8
partial_commits: 0/8
missing_commits: 4/8
topics_checked_for_commits: 4/8
final_summary: PR present in qcom-next/topics: Fail - 4/8 commit(s) are missing from both qcom-next and topics

[qlijarvis]

PR #1336 — checker-log-analyzer

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

Checker	Result	Summary
Checker	Result	Summary
checkpatch	❌	1 warning: DT binding split required
dt-binding-check	✅	Passed
dtb-check	✅	Passed
sparse-check	✅	Passed
check-uapi-headers	✅	Passed
check-patch-compliance	❌	6 commits: content mismatch with upstream
tag-check	✅	All commits have valid prefixes (FROMLIST:/UPSTREAM:)

Detailed report: Full report

Checker analysis — click to expand

🤖 CI Checker Analysis (checker-log-analyzer)

PR: #1336 - Revert and re-apply Ilitek ILI7807S panel driver with upstream versions
Source: https://github.com/qualcomm-linux/kernel-config/actions/runs/39947887538
Target branch: qcom-6.18.y

Checker	Result	Summary
checkpatch	❌	1 warning: DT binding split required
dt-binding-check	✅	Passed
dtb-check	✅	Passed
sparse-check	✅	Passed
check-uapi-headers	✅	Passed
check-patch-compliance	❌	6 commits: content mismatch with upstream
tag-check	✅	All commits have valid prefixes (FROMLIST:/UPSTREAM:)

---

❌ checkpatch

Root cause: Commit 4ec9c60 reverts a DT binding but checkpatch flags it as needing to be split from code changes.

Failure details:

Commit 4ec9c60f3b96 ("FROMLIST: Revert "FROMLIST: dt-bindings: display: panel: add Ilitek ILI7807S panel controller"")
WARNING: DT binding docs and includes should be a separate patch. See: Documentation/devicetree/bindings/submitting-patches.rst

4ec9c60f3b966a1eae4330447f593ed2d735e3b3 total: 0 errors, 1 warnings, 0 checks, 13 lines checked

Fix: This is a false positive for a revert commit. Revert commits by definition undo a previous change atomically and should not be split. The warning can be safely ignored for revert commits. If you want to suppress it, you could add a note in the commit message explaining that this is a revert and the original commit was a single atomic change.

Reproduce locally:

./scripts/checkpatch.pl --strict --ignore FILE_PATH_CHANGES --git 113239da311aa1301351cda3a2f4c941bf5118d5..cacfa1bb5f8462186a15950afd3fc43278177c30

---

❌ check-patch-compliance

Root cause: Six commits report "Change is different from the one mentioned in Link" — the checker detected differences between the PR patches and the upstream lore patches they reference.

Failure details:

Checking commit: FROMLIST: Revert "FROMLIST: drm/panel: add Ilitek ILI7807S panel driver"
Change is different from the one mentioned in Link

Checking commit: FROMLIST: Revert "FROMLIST: dt-bindings: display: panel: add Ilitek ILI7807S panel controller"
Change is different from the one mentioned in Link

Checking commit: FROMLIST: Revert "PENDING: arm64: dts: qcom: shikra-cqs-evk: Enable display"
Change is different from the one mentioned in Link

Checking commit: FROMLIST: Revert "PENDING: arm64: dts: qcom: shikra-cqm-evk: Enable display and add ili7807s panel"
Change is different from the one mentioned in Link

Checking commit: FROMLIST: arm64: dts: qcom: shikra-cqm-evk: Enable display and add ili7807s panel
Change is different from the one mentioned in Link

Checking commit: FROMLIST: arm64: dts: qcom: shikra-cqs-evk: Enable display and add ili7807s panel
Change is different from the one mentioned in Link

Analysis:

The first four commits are revert commits. Revert commits inherently differ from the original patches they reference because:

1. They invert the diff (+ becomes -, - becomes +)
2. They may revert patches that were already modified during previous integration

The last two commits are forward patches that may have legitimate adaptations for the vendor tree (e.g., different base context, additional vendor-specific changes).

Fix:

For revert commits (commits 1, 2, 5, 6):

• This is a known checker limitation. The check-patch-compliance tool compares the PR diff against the upstream lore patch, but for reverts, the diff is inverted by design.
• No action needed — document in the PR description that these are clean reverts of previously applied patches.

For forward patches (commits 7, 8):

• Fetch the upstream patches and compare manually:

  b4 am --single-message -C -l -3 https://lore.kernel.org/r/20260713-shikra-dt-changes-v3-3-15102fca9570@oss.qualcomm.com -o /tmp/out
  b4 am --single-message -C -l -3 https://lore.kernel.org/r/20260713-shikra-dt-changes-v3-2-15102fca9570@oss.qualcomm.com -o /tmp/out

• Compare the +/- lines:

  diff <(git format-patch -1 00101d4ba2f2 --stdout | awk '/^diff/,/^--$/' | grep -E '^[+-][^+-]') \
       <(awk '/^diff/,/^--$/' /tmp/out/*.mbx | grep -E '^[+-][^+-]')

• If differences are context-only (line number shifts), no action needed.
• If there are legitimate adaptations (e.g., vendor-specific DTS nodes), document them in the commit message with a note like:

  [Adapted for qcom-6.18.y: added vendor-specific XYZ node]
  

Reproduce locally:

cd /path/to/kernel
bash ../kernel-checkers/check-patch-compliance.sh --base 113239da311aa1301351cda3a2f4c941bf5118d5 --head 5fe6ef0514ebca888fccac22e8e30392f627adb4

---

Verdict

2 blockers to address before merge:

1. checkpatch warning (low priority): The DT binding split warning on the revert commit is a false positive and can be ignored. If desired, add a note in the commit message clarifying that this is a revert.

2. check-patch-compliance failures (medium priority):

   • The 4 revert commits are expected to differ from upstream (inverted diffs) — this is a known checker limitation. Document in the PR description that these are clean reverts.
   • The 2 forward patches (commits 7-8) need manual verification to confirm whether the differences are context-only or legitimate adaptations. If adaptations exist, document them in the commit messages.

Recommendation: Verify the forward patches (commits 7-8) manually using b4 am and diff as shown above. If differences are context-only, the PR is ready to merge. If there are intentional adaptations, document them in the commit messages and proceed.