From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E594FC54EE9 for ; Tue, 27 Sep 2022 19:03:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230283AbiI0TD0 (ORCPT ); Tue, 27 Sep 2022 15:03:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58748 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231496AbiI0TDY (ORCPT ); Tue, 27 Sep 2022 15:03:24 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 627A11CEDCA; Tue, 27 Sep 2022 12:03:24 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 000D761B44; Tue, 27 Sep 2022 19:03:23 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 26D8EC433D7; Tue, 27 Sep 2022 19:03:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1664305403; bh=I8bCAI3GcknRsGWFi5y4kb0GXANrzOyH5tFRETHYIpc=; h=From:To:Cc:Subject:Date:From; b=Ls7LIYi6mlIW2fL6r3rmqh9Jz+48o4mONAIpixPMaKQ6J2Hya1jqdTmSWGnhmxecy Q0W8hjNcGUJNmI5V7KpISQnjxoGUByQJ3eHNITXlx4IYKwGqxtsiY5N2j2qv3ec+pJ hXrYhs0rImoMV5tq4zgzxG1FDONef2OpUxFgrmifnDNbxM4Z/Bx+wsBJBaxF3EJ/m8 ZxCrpTkSpXqXoFWSlHWU25EjgIcvriKvw2x6pAGneHjura+a+plZtIro8mVD/PWYAo thl/3HF1UlUzgNBCOH+9hd48F2N+xRHbucAScvk0/8v01DYit3zJ14J/ZDZXwLwOZM CEj6stT3FgkyA== From: broonie@kernel.org To: Kees Cook Cc: Linux Kernel Mailing List , Linux Next Mailing List , Sami Tolvanen , Will Deacon 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> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org 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]