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

[1.14.x] kernel: Update to 5.10.184 and 5.15.117 #3241

Merged

Conversation

foersleo
Copy link
Contributor

Issue number: -

Description of changes:

Backport of kernel updates from #3238 . Do not include the kernel-6.1 updates, because the 1.14.x releases do not include kernel 6.1 yet.

Terms of contribution:

By submitting this pull request, I agree that this contribution is dual-licensed under the terms of both the Apache License, version 2.0, and the MIT license.

Rebase to Amazon Linux upstream version based on 5.10.184.

Signed-off-by: Leonard Foerster <[email protected]>
(cherry picked from commit f2e7e91)
Signed-off-by: Leonard Foerster <[email protected]>
This reverts commit e2083a2.

The fix was introduced upstream into the 5.10 series starting with
version v5.10.180. We do not need to carry the patch downstream anymore.

Signed-off-by: Leonard Foerster <[email protected]>
(cherry picked from commit cade579)
Signed-off-by: Leonard Foerster <[email protected]>
Rebase to Amazon Linux upstream version based on 5.15.117.

Signed-off-by: Leonard Foerster <[email protected]>
(cherry picked from commit 97120a6)
Signed-off-by: Leonard Foerster <[email protected]>
This reverts commit a349613.

The fix was introduced into the stable 5.15 series upstream in version
v5.15.111. We do not need to carry the downstream variant anymore.

Signed-off-by: Leonard Foerster <[email protected]>
(cherry picked from commit ed9921a)
Signed-off-by: Leonard Foerster <[email protected]>
In the past we have built-in the upstream smartpqi driver for our metal
platforms and inherited the module build on aws/vmware platforms from
AL. AL recently introduced a newer version of that driver alongside the
in-tree driver. Keep the status quo by only building the in-tree
variant, effectively reducing the amount of code built and shipped.

Signed-off-by: Leonard Foerster <[email protected]>
(cherry picked from commit 75b8572)
Signed-off-by: Leonard Foerster <[email protected]>
We have not used and currently, do not have requests to support edac on
that style of hardware. Keep with our kernels small and at the status
quo.

Signed-off-by: Leonard Foerster <[email protected]>
(cherry picked from commit 9cfaa4e)
Signed-off-by: Leonard Foerster <[email protected]>
AL has recently added a bunch of IPMI drivers to their kernels. In
Bottlerocket those do not get used currently. Remove the unneeded
drivers.

Signed-off-by: Leonard Foerster <[email protected]>
(cherry picked from commit 590ad7e)
Signed-off-by: Leonard Foerster <[email protected]>
Amazon Linux introduced a port of the BBR2 congestion control
algorithm. As this is a comparably large patch set that has not made it
upstream yet and is marked as alpha/preview state.

Disabling it for now to keep our kernel more stable.

Signed-off-by: Leonard Foerster <[email protected]>
(cherry picked from commit 4ff9396)
Signed-off-by: Leonard Foerster <[email protected]>
@stmcginnis
Copy link
Contributor

Looks like this has everything needed - thanks!

@etungsten etungsten merged commit 8fee63c into bottlerocket-os:1.14.x Jun 30, 2023
43 checks passed
@stmcginnis stmcginnis mentioned this pull request Jun 30, 2023
6 tasks
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.

3 participants