Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

meson64: bump edge from 6.11 to 6.12 via rename #7490

Merged
merged 7 commits into from
Nov 19, 2024
Merged

meson64: bump edge from 6.11 to 6.12 via rename #7490

merged 7 commits into from
Nov 19, 2024

Conversation

rpardini
Copy link
Member

@rpardini rpardini commented Nov 17, 2024 •
edited
Loading

meson64: bump edge from 6.11 to 6.12 via rename

  • meson64-6.11: rebase patches against 6.11.8 in preparation of 6.12 bump; no changes
  • meson64: bump edge from 6.11 to 6.12 via rename
  • meson64-6.12: borrow rockchip64-6.12's general-add-overlay-compilation-support.patch
  • meson64-6.12: Update meson-gx-socinfo patchset for 6.12
    Signed-off-by: Viacheslav Bocharov adeep@lexina.in
  • meson64-6.12: rebase onto 6.12-rc7, no changes
  • meson64-6.12: hackfix for add amlogic gpio to irq patch due to pinctrl: meson: Constify some structures
  • meson64-6.12: hackfix for meson-gx-socinfo patch 2
    • original from 6.11, re-done on top of Viacheslav's 6.12 fix which missed it
    • otherwise 
      drivers/soc/amlogic/meson-gx-socinfo-sm.c:178:19: error: initialization of 'void (*)(struct platform_device *)' from incompatible pointer type 'int (*)(struct platform_device *)' [-Werror=incompatible-pointer-types]
     178 |         .remove = meson_gx_socinfo_sm_remove,
         |                   ^~~~~~~~~~~~~~~~~~~~~~~~~~

@github-actions github-actions bot added size/large PR with 250 lines or more Needs review Seeking for review Hardware Hardware related like kernel, U-Boot, ... Patches Patches related to kernel, U-Boot, ... labels Nov 17, 2024
@rpardini rpardini requested review from adeepn and a team November 17, 2024 17:42
@rpardini
Copy link
Member Author

draft, branch is open for pushes

tested on

  • Khadas VIM3
  • Odroid HC4
  • GXM tvbox

@github-actions github-actions bot added size/small PR with less then 50 lines and removed size/large PR with 250 lines or more labels Nov 18, 2024
@adeepn
Copy link
Member

adeepn commented Nov 18, 2024

Return sockinfo-sm driver patchset.

@igorpecovnik igorpecovnik added the 02 Milestone: First quarter release label Nov 18, 2024
@pyavitz
Copy link
Collaborator

pyavitz commented Nov 18, 2024 

[🔨]     CC [M]  sound/soc/codecs/wm8731.o
[🔨]   drivers/soc/amlogic/meson-gx-socinfo-sm.c:178:19: error: initialization of 'void (*)(struct platform_device *)' from incompatible pointer type 'int (*)(struct platform_device *)' [-Werror=incompatible-pointer-types]
[🔨]     178 |         .remove = meson_gx_socinfo_sm_remove,
[🔨]         |                   ^~~~~~~~~~~~~~~~~~~~~~~~~~
[🔨]   drivers/soc/amlogic/meson-gx-socinfo-sm.c:178:19: note: (near initialization for 'meson_gx_socinfo_driver.<anonymous>.remove')
[🔨]   cc1: some warnings being treated as errors
[🔨]     CC [M]  net/netfilter/nf_conntrack_proto_icmpv6.o
[🔨]   make[6]: *** [scripts/Makefile.build:229: drivers/soc/amlogic/meson-gx-socinfo-sm.o] Error 1
[🔨]   make[5]: *** [scripts/Makefile.build:478: drivers/soc/amlogic] Error 2
[🔨]   make[4]: *** [scripts/Makefile.build:478: drivers/soc] Error 2
[🔨]   make[3]: *** [scripts/Makefile.build:478: drivers] Error 2
[🔨]   make[3]: *** Waiting for unfinished jobs....

@rpardini rpardini force-pushed the pr/meson64-bump-edge-from-611-to-612-via-rename branch from dde32ae to ad6dede Compare November 18, 2024 20:59
@rpardini rpardini marked this pull request as ready for review November 18, 2024 20:59
@rpardini
Copy link
Member Author

@adeepn thanks! I've re-picked my 6.11 fix for the int/void return type as also detected by @pyavitz (also thanks).

I will send a separate PR bumping to 6.12 final.

@rpardini
Copy link
Member Author

Also @adeepn I noticed GH shows as Partially verified GPG signature, as I reworded and squashed with my original removal. Hope you don't mind.

@rpardini rpardini force-pushed the pr/meson64-bump-edge-from-611-to-612-via-rename branch from ad6dede to 82c1ccd Compare November 18, 2024 23:38
@rpardini
Copy link
Member Author

Small fix for a stray trailling whitespace -- this is already 6.12 final clean.

@rpardini rpardini force-pushed the pr/meson64-bump-edge-from-611-to-612-via-rename branch from 82c1ccd to d6836ba Compare November 19, 2024 21:36
rpardini and others added 7 commits November 19, 2024 22:37
@rpardini
meson64-6.11: rebase patches against 6.11.8 in preparation of 6.12 bu…
5e99f67 
…mp; no changes
@rpardini
meson64: bump edge from 6.11 to 6.12 via rename
5aa27cb
@rpardini
meson64-6.12: borrow rockchip64-6.12's general-add-overlay-compilatio…
f641d8d 
…n-support.patch
@adeepn @rpardini
meson64-6.12: Update meson-gx-socinfo patchset for 6.12
363c4c7 
Signed-off-by: Viacheslav Bocharov <adeep@lexina.in>
@rpardini
meson64-6.12: rebase onto 6.12-rc7, no changes
d6b96c0
@rpardini
meson64-6.12: hackfix for add amlogic gpio to irq patch due to `pin…
7d511f4 
…ctrl: meson: Constify some structures`

- due to torvalds/linux@8a74a53 "pinctrl: meson: Constify some structures"
@rpardini
meson64-6.12: hackfix for meson-gx-socinfo patch 2
d8c3f00 
- original from 6.11, re-done on top of Viacheslav's 6.12 fix which missed it
- otherwise
  ```
  drivers/soc/amlogic/meson-gx-socinfo-sm.c:178:19: error: initialization of 'void (*)(struct platform_device *)' from incompatible pointer type 'int (*)(struct platform_device *)' [-Werror=incompatible-pointer-types]
       178 |         .remove = meson_gx_socinfo_sm_remove,
           |                   ^~~~~~~~~~~~~~~~~~~~~~~~~~
  ```
@rpardini rpardini force-pushed the pr/meson64-bump-edge-from-611-to-612-via-rename branch from d6836ba to d8c3f00 Compare November 19, 2024 21:37
@rpardini rpardini merged commit 333d99c into armbian:main Nov 19, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pyavitz pyavitz pyavitz approved these changes

@adeepn adeepn Awaiting requested review from adeepn adeepn is a code owner

@igorpecovnik igorpecovnik Awaiting requested review from igorpecovnik igorpecovnik is a code owner

Assignees
No one assigned
Labels
02 Milestone: First quarter release Hardware Hardware related like kernel, U-Boot, ... Needs review Seeking for review Patches Patches related to kernel, U-Boot, ... size/small PR with less then 50 lines
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@rpardini @adeepn @pyavitz @igorpecovnik