Skip to content

Kernels 2021-12-01#147446

Merged
alyssais merged 15 commits intoNixOS:masterfrom
TredwellGit:linux
Dec 8, 2021
Merged

Kernels 2021-12-01#147446
alyssais merged 15 commits intoNixOS:masterfrom
TredwellGit:linux

Conversation

@TredwellGit
Copy link
Copy Markdown
Member

@TredwellGit TredwellGit commented Nov 26, 2021

Things done

@TredwellGit TredwellGit added 1.severity: security Issues which raise a security issue, or PRs that fix one backport release-21.05 labels Nov 26, 2021
@github-actions github-actions bot added the 6.topic: kernel The Linux kernel label Nov 26, 2021
@ofborg ofborg bot requested review from a user, davidak and thoughtpolice November 26, 2021 01:46
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 1001-2500 This PR causes many rebuilds on Linux and should target the staging branches. labels Nov 26, 2021
@TredwellGit TredwellGit changed the title Kernels 2021-11-25 Kernels 2021-11-26 Nov 26, 2021
@ofborg ofborg bot added the 8.has: clean-up This PR removes packages or removes other cruft label Nov 26, 2021
@ofborg ofborg bot added 10.rebuild-linux: 2501-5000 This PR causes many rebuilds on Linux and should target the staging branches. and removed 10.rebuild-linux: 1001-2500 This PR causes many rebuilds on Linux and should target the staging branches. labels Nov 28, 2021
fabianhjr
fabianhjr approved these changes Nov 28, 2021
View reviewed changes
Copy link
Copy Markdown
Member

@fabianhjr fabianhjr left a comment

Choose a reason for hiding this comment

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

Been on 5.15.5 for a day.

@lorenz
Copy link
Copy Markdown
Contributor

lorenz commented Nov 29, 2021

I recommend skipping 5.15.5 because of https://lore.kernel.org/all/CAGnHSEmkTyq_QqP9S6TemsHOKxj2Gzq3R7X6+PxbQs_R-iBB7Q@mail.gmail.com/T/. The fix will be in 5.15.6.

@TredwellGit TredwellGit marked this pull request as draft November 29, 2021 19:58
@TredwellGit TredwellGit changed the title Kernels 2021-11-26 Kernels 2021-12-01 Dec 2, 2021
@TredwellGit TredwellGit marked this pull request as ready for review December 2, 2021 09:33
fabianhjr
fabianhjr approved these changes Dec 4, 2021
View reviewed changes
Copy link
Copy Markdown
Member

@fabianhjr fabianhjr left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Diff LGTM
Built and booted into 5.15.6

> cat /proc/version
Linux version 5.15.6 (nixbld@localhost) (gcc (GCC) 10.3.0, GNU ld (GNU Binutils) 2.35.2) #1-NixOS SMP Wed Dec 1 08:04:57 UTC 2021

ivan
ivan approved these changes Dec 7, 2021
View reviewed changes
Copy link
Copy Markdown
Member

@ivan ivan left a comment •
edited
Loading

Choose a reason for hiding this comment

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

5.10.83-hardened1 is working for me on x86_64 NixOS 21.11

@TredwellGit
Copy link
Copy Markdown
Member Author

TredwellGit commented Dec 7, 2021

Please go ahead and merge this if you have the time.

@alyssais alyssais merged commit 04bbfd1 into NixOS:master Dec 8, 2021
@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Dec 8, 2021

Backport failed for release-21.05, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally.

git fetch origin release-21.05
git worktree add -d .worktree/backport-147446-to-release-21.05 origin/release-21.05
cd .worktree/backport-147446-to-release-21.05
git checkout -b backport-147446-to-release-21.05
ancref=$(git merge-base 58371472fe78c979964df42542e9db0e74c5c2bd dae043cacae9dd43e74cb76a9709a250b584c074)
git cherry-pick -x $ancref..dae043cacae9dd43e74cb76a9709a250b584c074

@github-actions github-actions bot mentioned this pull request Dec 8, 2021
Merged
1 task
@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Dec 8, 2021

Successfully created backport PR #149489 for release-21.11.

@TredwellGit TredwellGit deleted the linux branch December 8, 2021 01:01
@TredwellGit TredwellGit added 9.needs: port to stable A PR needs a backport to the stable release. and removed backport release-21.05 labels Dec 8, 2021
@TredwellGit TredwellGit mentioned this pull request Dec 8, 2021
Merged
1 task
@jansol jansol mentioned this pull request Dec 11, 2021
Merged
1 task
@Ma27 Ma27 mentioned this pull request Dec 12, 2021
Merged
13 tasks
@Ma27 Ma27 added 8.has: port to stable This PR already has a backport to the stable release. and removed 9.needs: port to stable A PR needs a backport to the stable release. labels Dec 12, 2021
@rien rien mentioned this pull request Dec 13, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@fabianhjr fabianhjr fabianhjr approved these changes

@NeQuissimus NeQuissimus NeQuissimus approved these changes

@Ma27 Ma27 Awaiting requested review from Ma27

@alyssais alyssais Awaiting requested review from alyssais

@thoughtpolice thoughtpolice Awaiting requested review from thoughtpolice

@davidak davidak Awaiting requested review from davidak

+1 more reviewer

@ivan ivan ivan approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

1.severity: security Issues which raise a security issue, or PRs that fix one 6.topic: kernel The Linux kernel 8.has: clean-up This PR removes packages or removes other cruft 8.has: port to stable This PR already has a backport to the stable release. 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 2501-5000 This PR causes many rebuilds on Linux and should target the staging branches.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@TredwellGit @lorenz @ivan @fabianhjr @NeQuissimus @alyssais @Ma27