diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-08-27 15:38:00 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-08-27 15:38:00 -0700 |
| commit | 05519f2480a3e71053b892d4ea864e641949a77f (patch) | |
| tree | d5a0502417c8651d2fdd575c431a9ae61b6b8fe8 /arch | |
| parent | 17b28d4267d9d9dd11d42eea1d41cd3f5f5a4273 (diff) | |
| parent | c5deb27895e017a0267de0a20d140ad5fcc55a54 (diff) | |
| download | linux-rpi-05519f2480a3e71053b892d4ea864e641949a77f.tar.gz linux-rpi-05519f2480a3e71053b892d4ea864e641949a77f.tar.bz2 linux-rpi-05519f2480a3e71053b892d4ea864e641949a77f.zip | |
Merge tag 'for-linus-6.0-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
Pull xen fixes from Juergen Gross:
- two minor cleanups
- a fix of the xen/privcmd driver avoiding a possible NULL dereference
in an error case
* tag 'for-linus-6.0-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
xen/privcmd: fix error exit of privcmd_ioctl_dm_op()
xen: move from strlcpy with unused retval to strscpy
xen: x86: remove setting the obsolete config XEN_MAX_DOMAIN_MEMORY
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/configs/xen.config | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/configs/xen.config b/arch/x86/configs/xen.config index d9fc7139fd46..581296255b39 100644 --- a/arch/x86/configs/xen.config +++ b/arch/x86/configs/xen.config @@ -14,7 +14,6 @@ CONFIG_CPU_FREQ=y # x86 xen specific config options CONFIG_XEN_PVH=y -CONFIG_XEN_MAX_DOMAIN_MEMORY=500 CONFIG_XEN_SAVE_RESTORE=y # CONFIG_XEN_DEBUG_FS is not set CONFIG_XEN_MCE_LOG=y |