diff options
author | Linus Torvalds | 2022-07-17 08:27:30 -0700 |
---|---|---|
committer | Linus Torvalds | 2022-07-17 08:27:30 -0700 |
commit | 59c80f053d50467758c8284348b463fa820b1b1f (patch) | |
tree | 350d6f5e2e02595c0ca5449a7050d73bf5602272 /security/apparmor/path.c | |
parent | 2eccaca7b62b2836260c6fb22156a44e3d99a74a (diff) | |
parent | bcf163150cd37348a0cb59e95c916a83a9344b0e (diff) |
Merge tag 'x86_urgent_for_v5.19_rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Borislav Petkov:
- Improve the check whether the kernel supports WP mappings so that it
can accomodate a XenPV guest due to how the latter is setting up the
PAT machinery
- Now that the retbleed nightmare is public, here's the first round of
fallout fixes:
* Fix a build failure on 32-bit due to missing include
* Remove an untraining point in espfix64 return path
* other small cleanups
* tag 'x86_urgent_for_v5.19_rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/bugs: Remove apostrophe typo
um: Add missing apply_returns()
x86/entry: Remove UNTRAIN_RET from native_irq_return_ldt
x86/bugs: Mark retbleed_strings static
x86/pat: Fix x86_has_pat_wp()
x86/asm/32: Fix ANNOTATE_UNRET_SAFE use on 32-bit
Diffstat (limited to 'security/apparmor/path.c')
0 files changed, 0 insertions, 0 deletions