diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-01-28 10:08:08 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-01-28 10:08:08 -0800 |
| commit | e5ff2cb9cf67a542f2ec7fb87e24934c88b32678 (patch) | |
| tree | f84294ec09eea320b5436137d80329a8a37485f4 /drivers/nfc/st95hf | |
| parent | 228345bf98cd78f91d007478a51f9a471489e44a (diff) | |
| parent | 2e92493637a09547734f92c62a2471f6f0cb9a2c (diff) | |
Merge tag 'for-linus-5.11-rc6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
Pull xen fixes from Juergen Gross:
- A fix for a regression introduced in 5.11 resulting in Xen dom0
having problems to correctly initialize Xenstore.
- A fix for avoiding WARN splats when booting as Xen dom0 with
CONFIG_AMD_MEM_ENCRYPT enabled due to a missing trap handler for the
#VC exception (even if the handler should never be called).
- A fix for the Xen bklfront driver adapting to the correct but
unexpected behavior of new qemu.
* tag 'for-linus-5.11-rc6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
x86/xen: avoid warning in Xen pv guest with CONFIG_AMD_MEM_ENCRYPT enabled
xen: Fix XenStore initialisation for XS_LOCAL
xen-blkfront: allow discard-* nodes to be optional
Diffstat (limited to 'drivers/nfc/st95hf')
0 files changed, 0 insertions, 0 deletions