* linux-next: manual merge of the kspp tree with the arm64-fixes tree
@ 2022-09-27 19:03 broonie
2022-09-27 19:29 ` Kees Cook
0 siblings, 1 reply; 2+ messages in thread
From: broonie @ 2022-09-27 19:03 UTC (permalink / raw)
To: Kees Cook
Cc: Linux Kernel Mailing List, Linux Next Mailing List,
Sami Tolvanen, Will Deacon
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
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
[The block updated in Will's commit is just plain removed with no
equivalent in kspp]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the kspp tree with the arm64-fixes tree
2022-09-27 19:03 linux-next: manual merge of the kspp tree with the arm64-fixes tree broonie
@ 2022-09-27 19:29 ` Kees Cook
0 siblings, 0 replies; 2+ messages in thread
From: Kees Cook @ 2022-09-27 19:29 UTC (permalink / raw)
To: broonie
Cc: Linux Kernel Mailing List, Linux Next Mailing List,
Sami Tolvanen, Will Deacon
On Tue, Sep 27, 2022 at 08:03:18PM +0100, broonie@kernel.org wrote:
> 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
> --- a/include/asm-generic/vmlinux.lds.h
> +++ b/include/asm-generic/vmlinux.lds.h
>
> [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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-09-27 19:29 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-27 19:03 linux-next: manual merge of the kspp tree with the arm64-fixes tree broonie
2022-09-27 19:29 ` Kees Cook
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).