Skip to content

Kernels 2021-06-10#126540

Merged
Ma27 merged 12 commits intoNixOS:masterfrom
TredwellGit:linux
Jun 11, 2021
Merged

Kernels 2021-06-10#126540
Ma27 merged 12 commits intoNixOS:masterfrom
TredwellGit:linux

Conversation

@TredwellGit
Copy link
Member

Things done

@github-actions github-actions bot added the 6.topic: kernel The Linux kernel label Jun 10, 2021
@TredwellGit TredwellGit added 1.severity: security Issues which raise a security issue, or PRs that fix one 9.needs: port to stable A PR needs a backport to the stable release. labels Jun 10, 2021
@TredwellGit
Copy link
Member Author

@ofborg test kernel-latest kernel-lts latestKernel.login latestKernel.hardened

@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 Jun 10, 2021
Copy link
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.

LGTM

EDIT: Checked out the branch and building 5.9.10

EDIT2: Build complete, rebooting

EDIT3: Booted to 5.12.10-hardened

@Ma27 Ma27 merged commit 1fd7f21 into NixOS:master Jun 11, 2021
@github-actions
Copy link
Contributor

Successfully created backport PR #126589 for release-21.05.

@TredwellGit TredwellGit deleted the linux branch June 11, 2021 12:31
@TredwellGit TredwellGit 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 Jun 11, 2021
@github-actions
Copy link
Contributor

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-126540-to-release-21.05 origin/release-21.05
cd .worktree/backport-126540-to-release-21.05
git checkout -b backport-126540-to-release-21.05
ancref=$(git merge-base 6c32f4e17229ba9b1726c003262b7eac05baed98 c22128ed44db5b8c2fa0c66ed8a33e1660421739)
git cherry-pick -x $ancref..c22128ed44db5b8c2fa0c66ed8a33e1660421739

@Ma27
Copy link
Member

Ma27 commented Jun 11, 2021

@domenkozar perhaps this is a bug in the backport bot action: After merging this PR, a backport PR was successfully created. Then different labels changed and GHA tries to create another backport PR.

@domenkozar
Copy link
Member

#126825

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

1.severity: security Issues which raise a security issue, or PRs that fix one 6.topic: kernel The Linux kernel 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: 1001-2500 This PR causes many rebuilds on Linux and should target the staging branches.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants