linux-next: manual merge of the kspp tree with the tip tree

Hi all, Today's linux-next merge of the kspp tree got a conflict in: Documentation/x86/x86_64/mm.txt between commits: 5b1290406579 ("x86/mm/doc: Clean up the x86-64 virtual memory layout descriptions") 32b89760ddf4 ("x86/mm/doc: Enhance the x86-64 virtual memory layout descriptions") f

linux-next: manual merge of the kspp tree with the tip tree

Hi Kees, Today's linux-next merge of the kspp tree got a conflict in: drivers/misc/lkdtm/core.c between commit: bef459026b16 ("lkdtm: Test copy_to_user() on bad kernel pointer under KERNEL_DS") from the tip tree and commit: f90d1e0c7804 ("lkdtm: Add a test for STACKLEAK") from the ksp