From patchwork Thu Apr 27 13:43:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 88270 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp281858vqo; Thu, 27 Apr 2023 06:50:56 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ44gqkXwr8IZsaI3KiiO84Z0ubBkUpbSrx60SqOlUUtwVbZ0WjBQ1o8km7PGieKxD+Fan/x X-Received: by 2002:a17:902:ecca:b0:19c:be57:9c82 with SMTP id a10-20020a170902ecca00b0019cbe579c82mr1806453plh.65.1682603455719; Thu, 27 Apr 2023 06:50:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682603455; cv=none; d=google.com; s=arc-20160816; b=rx5au4a3hzMg0vAloWScaDLBKIVhb1Rf9qo/2QBKjF0tx7CjflqHUJN0GwWii7d3aH u2zj2OsSCSfk+sBuiRUjGBFpoiwQORARhfSqA9/IfhT6xthC/BYf5lOUdOObzB3Lzsg+ 9J2maE5bTQL/bzyRSlz6uKIiRzL2M/A2h+3hnfLXrClbB9I9LmJLFM5r+g1N8aH8lUex VGEPH++VC5wPNArHmN7KWvGP27Ki71t0m60v4/J3qaJCt+6ySDsQ+7x8NUpRHoNFh//G y2Fzgm4jsfAO3JTC6d27opIENSTQnMQKDcyCp4kpCvYwobCzm0zbOwK8SmXG4P3JVJ/R 9/IA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=IoyWpzuPF5Bg7dX3KPg7Vole41GdmZb4BsZhrAyqop0=; b=Pglzf8zM3PPY7KNdeNRyF1xTCZ4LrES14hR2iJdF4npzQ90YhaZt2pITCQrnELMR84 BebhORGxmBMlIl2CoQU4WAESINwjH7GW1reH7460SCjq9gSZA2VaT4srU7YALATo1CaC 2AJNTKRDvO8YIRoGxqmQE9u4bFAruncdUpr4DaXpXg3z1otCEF2AxAnpjYbgzL337pW0 9pKNgrPbY3Wek0LNfGiundsETAnBOeZS+u+viRl4BCdZucCEHU9KrilVwgBf1+BO3C1e ebWzyEJg9BPH6kp+NBMp3T7bMDBeeQPGPVvo+9nMTA0A1KUTRdmbcZcbw1pa58CxwG1v KsRw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=C48jjRFd; 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=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id o12-20020a170902d4cc00b001a878485664si20175246plg.318.2023.04.27.06.50.41; Thu, 27 Apr 2023 06:50:55 -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=@kernel.org header.s=k20201202 header.b=C48jjRFd; 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=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243218AbjD0NnV (ORCPT + 99 others); Thu, 27 Apr 2023 09:43:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50632 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232885AbjD0NnU (ORCPT ); Thu, 27 Apr 2023 09:43:20 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3D07F19AC; Thu, 27 Apr 2023 06:43:19 -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 CA9B861444; Thu, 27 Apr 2023 13:43:18 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 634C4C433EF; Thu, 27 Apr 2023 13:43:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1682602998; bh=mP3zZ2WOxYXRJhsA5VsEIgXN9HuZoulQG9PKo94GzvU=; h=From:To:Cc:Subject:Date:From; b=C48jjRFdCt14kncc2Y42SttpbJ+fBR0xmzaHIp2kx3SdP8ngjnbKSYeK8FTqnKXH6 EP3+PIseLFytsRd3+EqOjmtpheHYZE74k6DsGiNI4xp6MO7UIVhWmF36UJgijaz+He r85VEWDAKJLmIZS516+EzwH0XYDmpvH5pLpraMJTEuFsrJd0OAtbgmq9YBROYTEZ0K wfxW1h8BZD/T+nZSijnGLlR6XaPk2nX/yGE3dC0aJvkJ4WBcJkiLGz2TyatT3mV5Sw QuWb4cBJoz035bWOO/WKyJdgNM2R4sn9bwI/5RXcAboXyxWJcRhXJV3SOYVM94phYa 2avdy3pCHOBXA== From: broonie@kernel.org 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 origin tree Date: Thu, 27 Apr 2023 14:43:13 +0100 Message-Id: <20230427134313.45596-1-broonie@kernel.org> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE 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?1764337601423487430?= X-GMAIL-MSGID: =?utf-8?q?1764337601423487430?= Hi all, Today's linux-next merge of the tip tree got a conflict in: tools/objtool/check.c between commit: f372463124df5 ("btrfs: mark btrfs_assertfail() __noreturn") from the origin tree and commits: 071c44e427815 ("sched/idle: Mark arch_cpu_idle_dead() __noreturn") 09c5ae30d0075 ("btrfs: Mark btrfs_assertfail() __noreturn") 9ea7e6b62c2bd ("init: Mark [arch_call_]rest_init() __noreturn") from the tip 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. +++ b/tools/objtool/check.c diff --cc tools/objtool/check.c index 931cdb7dba190,5b600bbf2389b..0000000000000 --- a/tools/objtool/check.c