Skip to content

linux_{4_14,4_19,5_4,5_10,5_13}_hardened: update patches#136944

Merged
ajs124 merged 5 commits intoNixOS:masterfrom
lovesegfault:hardened-update
Sep 7, 2021
Merged

linux_{4_14,4_19,5_4,5_10,5_13}_hardened: update patches#136944
ajs124 merged 5 commits intoNixOS:masterfrom
lovesegfault:hardened-update

Conversation

@lovesegfault
Copy link
Member

Motivation for this change
Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • 21.11 Release Notes (or backporting 21.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

@github-actions github-actions bot added the 6.topic: kernel The Linux kernel label Sep 7, 2021
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux. labels Sep 7, 2021
@ajs124
Copy link
Member

ajs124 commented Sep 7, 2021

I think we normally split this into one commit per kernel version.

@lovesegfault
Copy link
Member Author

@ajs124 split them up

@lovesegfault
Copy link
Member Author

@GrahamcOfBorg eval

@TredwellGit
Copy link
Member

Consider using update.sh next time.

@lovesegfault
Copy link
Member Author

Consider using update.sh next time.

Will do!

@github-actions
Copy link
Contributor

github-actions bot commented Sep 7, 2021

Successfully created backport PR #137029 for release-21.05.

@lovesegfault lovesegfault deleted the hardened-update branch September 7, 2021 21:35
@TredwellGit TredwellGit added the 1.severity: security Issues which raise a security issue, or PRs that fix one label Sep 7, 2021
@github-actions
Copy link
Contributor

github-actions bot commented Sep 7, 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-136944-to-release-21.05 origin/release-21.05
cd .worktree/backport-136944-to-release-21.05
git checkout -b backport-136944-to-release-21.05
ancref=$(git merge-base 82d19cb068d7213c8beaa96220f1d81d57a28381 abfa8098ace1c87c6591cb27f9c1ac19d6081e9b)
git cherry-pick -x $ancref..abfa8098ace1c87c6591cb27f9c1ac19d6081e9b

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 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants