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

Kernel update to 6.7 #101

Merged
merged 5 commits into from
Jan 29, 2024
Merged

Conversation

ukleinek
Copy link

This is heavily inspired by @hnez's PR #73 . The resulting image should be quite similar, the upside is mostly better documented and more uptodate patches.

For now this is only build tested.

@hnez
Copy link
Member

hnez commented Jan 26, 2024

I'am about to runtime test this now. Could you add Signed-off-by:s based on the DCO in #100 in the meantime?

@hnez
Copy link
Member

hnez commented Jan 26, 2024

I've tested the patch now and ran the CI testsuite. Everything seems to be working! 🎉

Now we just need to get #100 merged and S-o-bs added to the commits, then this can be merged.

A bit pedantic, but when you have to touch the commit messages anyways, could you modify the linux-lxatac: Version bump to 6.6 commit message a bit? It contains the following:

…
The only other relevant change is that the RGMII clock line's drive
strength is reduced using device tree properties. See
0003-ARM-dts-stm32-lxa-tac-reduce-RGMII-interface-drive-s.patch
Note however this only starts working once commit v6.7-rc1~160^2~325^2
("net: dsa: microchip: Add drive strength configuration") is added to
the stack.

which implies that the mentioned commit does what we need and removes the need for the drive strength hack, which is not the case, because the drive strength setting in said commit is not re-applied after a reset of the switch (of which there are multiple in the drivers init sequence).

@hnez
Copy link
Member

hnez commented Jan 26, 2024

Hi @ukleinek,

PR #100 is now merged, so we now have a defined DCO policy. Are you okay with the policy and adding your S-o-b now?

Uwe Kleine-König and others added 5 commits January 29, 2024 11:34
Track the actually used config.

Signed-off-by: Uwe Kleine-König <[email protected]>
 - Add mainline status to various patches
 - Update pwm-stm32 and tty-trigger series to the newest revisions

Signed-off-by: Uwe Kleine-König <[email protected]>
The benefits are:

  - An uname -a does not show the kernel version as -dirty anymore (caused by the patches we applied to the git repository)
  - I get less confused when updating the PV does not do anything.
  - The initial download is a lot smaller.

Signed-off-by: Uwe Kleine-König <[email protected]>
Several patches entered linux 6.6, so they can be dropped there.

The tty-trigger series was updated to the changes that actually made it
into the mainline.

The only other relevant change is that the RGMII clock line's drive
strength is reduced using device tree properties. See
0003-ARM-dts-stm32-lxa-tac-reduce-RGMII-interface-drive-s.patch
Note however this only starts working once commit v6.7-rc1~160^2~325^2
("net: dsa: microchip: Add drive strength configuration") is added to
the stack.

Signed-off-by: Uwe Kleine-König <[email protected]>
One patch from the tty-trigger topic was applied in v6.7-rc1, so this is
dropped. Otherwise this is a clean rebase.

To fix a build failure related to perf, add a bbappend to work around
this. I found this in Leonard's linux-6.7 branch and just picked it from
there.

Signed-off-by: Uwe Kleine-König <[email protected]>
@ukleinek
Copy link
Author

Rebased on top of nanbield and added the now correctly formalized S-o-b lines

@hnez
Copy link
Member

hnez commented Jan 29, 2024

I ran a quick build test to make sure nothing broke with the meta layer updates that were merged in between.

Looks like nothing broke, so we are ready to merge. Thanks @ukleinek!

@hnez hnez merged commit 8e139f4 into linux-automation:nanbield Jan 29, 2024
2 checks passed
@ukleinek ukleinek deleted the kernel-update-6.7 branch January 29, 2024 10:56
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