From patchwork Fri Jun 9 02:08:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 105234 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp665098vqr; Thu, 8 Jun 2023 19:18:11 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5rru2habHwEUdOALkngO3BcclhCtk21bR6Ns/KE5GzNKlrM5hqAULNlroCrr8H4+BTK13H X-Received: by 2002:a17:90b:4a8e:b0:256:1700:5ec9 with SMTP id lp14-20020a17090b4a8e00b0025617005ec9mr92533pjb.31.1686277090655; Thu, 08 Jun 2023 19:18:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686277090; cv=none; d=google.com; s=arc-20160816; b=eDqf6kJGE2EI2/s2Mr42Bo/E2pmpx1olHPbWcnC05aIsJS1S40JlfJqjF2V745XrG+ 7rLdCOMNq0U9T16dglP+TAqDKg87We3ZjcrzO6XMbHdYkNCqwM//uWnUEU/LI/AoCBoT +ZnuxqxwZhXta+lXZlGO2YcnkeZQy/VssROSjoGv9hvN5x0MBBcZtElNwD8kbbXLuO/a 78C6cKjpCAtvxfVLmvjRuGrGUEvr9UI7V4qw/t3SBxJd6/pX48h+QkpIHLOjJrGK4u3Q ZZUno4KlrJSp4qnGVLnfNyyaanC77Y2F7n8uuPdRX4vzJH5LayaEtnxOG1l4g1SMkhA8 pVDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:subject:cc:to:from:date :dkim-signature; bh=NIszPXRk3qHLJzPQeo2lhi/iY+O826ijY8OrUUoadcM=; b=mXEgDicqVOrxO2COYbbxWrcTTPGcZuoEOx8F1fwSu3ECwL3M+5rBxgUmCUalMwERwS 9Uv8iBBBfPxaTbq0vaDsqq7Jayegr2SLY1OE8/y4DDGkAttaS4cdthiwy7gu+QIOcmqG thmFG5DlbePnDqZHL5jxVmXRByZmsroia3E2x68qKq06otRsabbjvfJsquZ6B61KtVos JsAxC16xpUIfHEbPKAP8gIeZ9sgNhnFkPzCvgLAAxQn8pBLop1UTLfpjAXeO2YDwnGmt PEId7ttnjOEHzxSpbqzeWBvYb+5RU1A9ixrloBnvRXV+tlPr/Yk3/GFyLuZhuNfnWCLl uOBg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=dXWhVUKi; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id mi13-20020a17090b4b4d00b0024753ec4dccsi1908675pjb.124.2023.06.08.19.17.56; Thu, 08 Jun 2023 19:18:10 -0700 (PDT) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=dXWhVUKi; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238254AbjFICJG (ORCPT + 99 others); Thu, 8 Jun 2023 22:09:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33772 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238182AbjFICJE (ORCPT ); Thu, 8 Jun 2023 22:09:04 -0400 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E0B6530FF; Thu, 8 Jun 2023 19:08:32 -0700 (PDT) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4QckyF6vPLz4x4H; Fri, 9 Jun 2023 12:08:21 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1686276503; bh=NIszPXRk3qHLJzPQeo2lhi/iY+O826ijY8OrUUoadcM=; h=Date:From:To:Cc:Subject:From; b=dXWhVUKisOD0UgPf9rdcOn8WHCbknA+UrjTfveGyLpqobrDYMMebdUqxHvnVMkt8z 7jZm4gQnedhACeGmC6GU8TotPXl+iMNqEEEkWI7HSj9y/Fzq0tWs2tssxU78f9/sZ3 TEFqPUV1nXSje0JLeeheGlS6NM6GgnkpE6dT8s4Xni7/hLBSzild+VQuwUevv1k7c3 M93rpNFb5R7QlJESzKxFEaXgfSPv6HmezYL5EMVg69iTGqMJV74wH+Vde4944oAuML 6BTfzf5cD7XrU3lTQOilmEXaRHP0CgCf3x7jdyS+Rc9hzPfwFnodHRugZMCjwUL23R kQxIRk2p1gF1w== Date: Fri, 9 Jun 2023 12:08:19 +1000 From: Stephen Rothwell To: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra Cc: David Sterba , Josh Poimboeuf , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the tip tree with the btrfs tree Message-ID: <20230609120819.7e8e18c7@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_MED,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768189686329190611?= X-GMAIL-MSGID: =?utf-8?q?1768189686329190611?= Hi all, FIXME: Add owner of second tree to To: Add author(s)/SOB of conflicting commits. Today's linux-next merge of the tip tree got a conflict in: tools/objtool/check.c between commit: 7e786ec9bdaa ("btrfs: print assertion failure report and stack trace from the same line") from the btrfs tree and commit: 6245ce4ab670 ("objtool: Move noreturn function list to separate file") from the tip tree. I fixed it up (I used the letter version of this file and applied the following patch) 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. From: Stephen Rothwell Date: Fri, 9 Jun 2023 12:02:56 +1000 Subject: [PATCH] fix up for "objtool: Move noreturn function list to separate file" interacting with "btrfs: print assertion failure report and stack trace from the same line" Signed-off-by: Stephen Rothwell --- tools/objtool/noreturns.h | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/objtool/noreturns.h b/tools/objtool/noreturns.h index 1514e84d5cc4..e45c7cb1d5bc 100644 --- a/tools/objtool/noreturns.h +++ b/tools/objtool/noreturns.h @@ -14,7 +14,6 @@ NORETURN(__stack_chk_fail) NORETURN(__ubsan_handle_builtin_unreachable) NORETURN(arch_call_rest_init) NORETURN(arch_cpu_idle_dead) -NORETURN(btrfs_assertfail) NORETURN(cpu_bringup_and_idle) NORETURN(cpu_startup_entry) NORETURN(do_exit)