Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   broonie@kernel.org
To:     Kees Cook <keescook@chromium.org>
Cc:     Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Sami Tolvanen <samitolvanen@google.com>,
        Will Deacon <will@kernel.org>
Subject: linux-next: manual merge of the kspp tree with the arm64-fixes tree
Date:   Tue, 27 Sep 2022 20:03:18 +0100
Message-Id: <20220927190318.513999-1-broonie@kernel.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

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]