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.

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

[LE12] linux update to 6.6.57 #9450

Merged
merged 1 commit into from
Nov 1, 2024

Conversation

sky42src
Copy link
Contributor

build tested with my community release 12.0.1-#241027 for Generic, RPi, AW, RK
run tested on Generic, RPi4, RPi5

RK needed some patch adjustments
deleted: projects/Rockchip/patches/linux/default/linux-0003-pinctrl--rockchip--correct-RK3328-iomux-width-flag-for-GPIO2-B-pins.patch
modified: projects/Rockchip/patches/linux/default/linux-1000-drm-rockchip.patch removed hunks 11 and 47

deleted:  projects/Rockchip/patches/linux/default/linux-0003-pinctrl--rockchip--correct-RK3328-iomux-width-flag-for-GPIO2-B-pins.patch
modified: projects/Rockchip/patches/linux/default/linux-1000-drm-rockchip.patch removed hunks 11 and 47
@chewitt
Copy link
Member

chewitt commented Oct 30, 2024

@sky42src can you please confirm the dropped patches/hunks are the result of upstream merges? (not simply things that aren't applying anymore).

@sky42src
Copy link
Contributor Author

I am not really sure how to look that up, but patch asked if it should reverse the patch.
For all the hunks i removed i did it only when scripts/unpack linux stated
Reversed (or previously applied) patch detected! Assume -R? [n] and only then i removed this hunk.
For the big patch i split it up and checked hunk by hunk.

@vpeter4
Copy link
Contributor

vpeter4 commented Oct 30, 2024

I am not really sure how to look that up

Open the patch file and linux source file and compare the content.

@sky42src
Copy link
Contributor Author

Sorry but me reading source code and comparing it manually to the patch is definitively less reliable then patch saying Reversed (or previously applied) patch detected! Assume -R? [n].
I checked that hunk by hunk with scripts/unpack linux and for that i split up the big patch of 2972 lines in one file per hunk. If that is not good enough just close the PR and i carry that my self in my community release.

@vpeter4
Copy link
Contributor

vpeter4 commented Oct 31, 2024

Checking source code just adds some more confirmation.

And btw: this PR is ok :)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@chewitt chewitt merged commit 79636cc into LibreELEC:libreelec-12.0 Nov 1, 2024
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.

4 participants