from ubuntu-hirsute upstream/master-next cherry-pick only the 2 patches, because master-next is 970 commits ahead of our current master. Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com> Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
