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 33558C54EE9 for ; Tue, 27 Sep 2022 19:08:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231167AbiI0TIZ (ORCPT ); Tue, 27 Sep 2022 15:08:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40198 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230376AbiI0TIY (ORCPT ); Tue, 27 Sep 2022 15:08:24 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2951B1CDB59; Tue, 27 Sep 2022 12:08:23 -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 ams.source.kernel.org (Postfix) with ESMTPS id CFD46B81D31; Tue, 27 Sep 2022 19:08:21 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 858B0C433C1; Tue, 27 Sep 2022 19:08:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1664305700; bh=cpFun7PV4yOAi/XYvfmGgsS3jnA3S2FJPFFNhYVbJGs=; h=From:To:Cc:Subject:Date:From; b=DERmri9s50L00blRES7fBQ6TJ3PQ/QMP28KZC88Qc7fBSNP2vKroyPQxDxcdSmkh/ S7cSfvxizq0Wy4xFfgIebsY8dH2WQY+46YjfcbRqACjNYICUddsUoyAJvtbMYr+7uv 9NvjLC2edaalR06mitroSrSPpyuLFIwDWnKs2gaW1jJy7msAZ1qk2VBa5TEKj9ATJV 1ahIa3b7iVYTr/vSaQSXeAnaZBimKAEMNitSkvDefVCmV5fGcsnNVQnFGwWp+oWl29 15zPy1Roj9krA8yg1m05Nd7kzfTX9JUJlOhiUi+m3Ns5IJLHwwIDB5w8ebdTM7fLF7 9XSFJdU/C633A== From: broonie@kernel.org To: Kees Cook Cc: Daniel Borkmann , Jiri Olsa , Linux Kernel Mailing List , Linux Next Mailing List , Peter Zijlstra , Sami Tolvanen , Thomas Gleixner Subject: linux-next: manual merge of the kspp tree with the bpf-next tree Date: Tue, 27 Sep 2022 20:08:11 +0100 Message-Id: <20220927190811.514527-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: tools/objtool/check.c between commit: 9440155ccb948 ("ftrace: Add HAVE_DYNAMIC_FTRACE_NO_PATCHABLE") from the bpf-next tree and commit: 3c68a92d17add ("objtool: Disable CFI warnings") 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 tools/objtool/check.c index fcc4d8ea8cec3,48e18737a2d18..0000000000000 --- a/tools/objtool/check.c +++ b/tools/objtool/check.c @@@ -4124,7 -4118,7 +4128,8 @@@ static int validate_ibt(struct objtool_ !strcmp(sec->name, "__ex_table") || !strcmp(sec->name, "__jump_table") || !strcmp(sec->name, "__mcount_loc") || - !strcmp(sec->name, ".kcfi_traps")) ++ !strcmp(sec->name, ".kcfi_traps")) || + strstr(sec->name, "__patchable_function_entries")) continue; list_for_each_entry(reloc, &sec->reloc->reloc_list, list)