Hi all,
Today's linux-next merge of the tip tree got a conflict in:
arch/arm64/kernel/vdso.c
between commit:
6742f72d084b ("mseal sysmap: enable arm64")
from the mm tree and commit:
0b3bc3354eb9 ("arm64: vdso: Switch to generic storage implementation")
from the tip tree.
I didn't fix it up - couldn't figure it out, so just reverted the former
for today as it was simpler.
It looks like VM_SEALED_SYSMAP needs to be added to
vdso_install_vvar_mapping(), but that is generic across all the
architectures using GENERIC_VDSO_DATA_STORE.
and we have the same between commit
035f34159d61 ("mseal sysmap: enable x86-64")
from the mm tre and commit
dafde29605eb ("x86/vdso: Switch to generic storage implementation")
So I have reverted 035f34159d61 as well.
--
Cheers,
Stephen Rothwell
Attachment:
pgpYnT16NyOlU.pgp
Description: OpenPGP digital signature
