Skip to content

meson64-6.12: drop upstreamed pinctrl-meson can_sleep patch - #10650

Merged
igorpecovnik merged 1 commit into
armbian:mainfrom
jethome-iot:bugfix/meson64-6.12-drop-upstreamed-cansleep
Sep 7, 2026
Merged

meson64-6.12: drop upstreamed pinctrl-meson can_sleep patch#10650
igorpecovnik merged 1 commit into
armbian:mainfrom
jethome-iot:bugfix/meson64-6.12-drop-upstreamed-cansleep

Conversation

@adeepn

@adeepn adeepn commented Sep 7, 2026

Copy link
Copy Markdown
Member

Description

Removes patch/kernel/archive/meson64-6.12/general-pinctrl-meson-restore-non-sleeping-gpio.patch, which no longer applies.

meson64 oldlts pins no KERNELBRANCH, so it builds branch:linux-6.12.y (rolling stable). The patch sets pc->chip.can_sleep = false; upstream stable did the same in v6.12.97, so the hunk is now rejected as previously applied. The state the patch wanted is already in-tree, so dropping it is safe.

Same as d1506c3 ("meson64-6.18: drop upstreamed pinctrl-meson can_sleep patch") for current/6.18.

How Has This Been Tested?

  • can_sleep at drivers/pinctrl/meson/pinctrl-meson.c:622 in linux-stable: true at v6.12.96, false from v6.12.97 through v6.12.108 (current tip of linux-6.12.y).

Checklist:

  • I have performed a self-review of my own code
  • My changes generate no new warnings

Summary by CodeRabbit

  • Bug Fixes
    • Restored non-sleeping GPIO behavior for Meson controllers, allowing GPIO values to be accessed safely in atomic contexts.

Fixes patching failure on linux-6.12.y: the patch sets
pc->chip.can_sleep = false, which upstream stable already did in
v6.12.97, so the hunk is now rejected as previously applied.

Signed-off-by: Viacheslav Bocharov <v@baodeep.com>
@github-actions github-actions Bot added size/medium PR with more then 50 and less then 250 lines 11 Milestone: Fourth quarter release labels Sep 7, 2026
@coderabbitai

coderabbitai Bot commented Sep 7, 2026

Copy link
Copy Markdown
Contributor

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Team

Run ID: fff47352-aa5d-4bcc-9bb4-7eb9755afcb6

📥 Commits

Reviewing files that changed from the base of the PR and between 10d9e4d and 2436285.

📒 Files selected for processing (1)
  • patch/kernel/archive/meson64-6.12/general-pinctrl-meson-restore-non-sleeping-gpio.patch
💤 Files with no reviewable changes (1)
  • patch/kernel/archive/meson64-6.12/general-pinctrl-meson-restore-non-sleeping-gpio.patch

Included review availability: Your plan provides up to 8 included reviews per hour; 7 remain after this review.


📝 Walkthrough

Walkthrough

The Meson GPIO controller is marked as non-sleeping again. Atomic GPIO value access can use the regmap-MMIO callbacks.

Changes

Cohort / File(s) Summary
Meson GPIO pinctrl
patch/kernel/archive/meson64-6.12/general-pinctrl-meson-restore-non-sleeping-gpio.patch
Restores gpio_chip.can_sleep = false for the Meson GPIO controller.

Estimated code review effort: 1 (Trivial) | ~2 minutes

Merge Risk: ⚪ Minimal · up to 24362

This removes a patch whose intended change is already in the upstream 6.12 stable kernel, avoiding patch application failures without introducing an identified merge risk.

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check name Status Explanation
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check. Docstring coverage is scoped to functions touched by this diff. Analyzed 0 functions across 0…
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title clearly states that the upstreamed Meson pinctrl patch is being removed. This matches the pull request objective and the reported patching failure.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@github-actions github-actions Bot added Needs review Seeking for review Hardware Hardware related like kernel, U-Boot, ... Patches Patches related to kernel, U-Boot, ... labels Sep 7, 2026
@github-actions github-actions Bot added the Ready to merge Reviewed, tested and ready for merge label Sep 7, 2026
@github-actions

github-actions Bot commented Sep 7, 2026

Copy link
Copy Markdown
Contributor

✅ This PR has been reviewed and approved — all set for merge!

@github-actions github-actions Bot removed the Needs review Seeking for review label Sep 7, 2026
@igorpecovnik
igorpecovnik merged commit edb17ed into armbian:main Sep 7, 2026
13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

11 Milestone: Fourth quarter release Hardware Hardware related like kernel, U-Boot, ... Patches Patches related to kernel, U-Boot, ... Ready to merge Reviewed, tested and ready for merge size/medium PR with more then 50 and less then 250 lines

Development

Successfully merging this pull request may close these issues.

2 participants