linux-next: manual merge of the kspp tree with the arm64-fixes tree

Hi all,

Today's linux-next merge of the kspp tree got a conflict in:

include/asm-generic/vmlinux.lds.h

between commit:

13b0566962914 ("vmlinux.lds.h: CFI: Reduce alignment of jump-table to function alignment")

from the arm64-fixes tree and commit:

89245600941e4 ("cfi: Switch to -fsanitize=kcfi")

from the kspp tree.

I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts.

diff --cc include/asm-generic/vmlinux.lds.h
index ae63dd8a3a2cf,7501edfce11ea..0000000000000

[The block updated in Will's commit is just plain removed with no equivalent in kspp]

Right, this is correct. 13b0566962914 (a fix for the previous CFI implementation) becomes useful for -stable backports, but is entirely removed for the new CFI implementation.

Kees Cook