From patchwork Thu Nov 24 01:29:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 25280 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp3132811wrr; Wed, 23 Nov 2022 17:37:05 -0800 (PST) X-Google-Smtp-Source: AA0mqf5F/5UUdM3HCYIn6gPEpluyoUbYH/0CPu41T9M4z6vRM6rpcTFRaZebJNXG1rHvIkaI6yBV X-Received: by 2002:aa7:d648:0:b0:46a:aa4:8a17 with SMTP id v8-20020aa7d648000000b0046a0aa48a17mr6892495edr.416.1669253825671; Wed, 23 Nov 2022 17:37:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669253825; cv=none; d=google.com; s=arc-20160816; b=mCfrYjGPjhLYILVbHbSGRhomSzk+Aj361k6QQFYD00nsGm2DjZQKVSSWr7YfYSVj1s lbVVnBcAIs2CsWhOlkOJBS0MN78sOSyOasoxI2Y07zE2NEaBy0uSaFwlE/g0qtSyWc/4 a9Kmih0s8FUg30Cux9V7DxCxIoh/RfK2/1XVwpol/LcMXX1k/MHqT1wYncq8Xa9f3C+s udzpcBm2/Q2it1BwkEWzXCjXTio8T1My/6+5db35ayE1GV1RIUV0BvD9XPWGeSXmmQ7c Q8c9i0L+dH+UFsrsyWecPTcNuKId7b6hlMHwIAE5tBAgV8ltXZT738APt+V+/XPl5ys7 sKNA== 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=JBoFldnbFkQx64zlIrUVvIYpX+G+3s4hlaGLmsO4DLc=; b=Ws5mhDNoibIuwva/26qR7bXBNKXl8md3ZJ+LJlX+VbenpxLBdGMp35W4h4WKZuTdo6 /WsIRfdl3GlTCBMGNlNzjDs/2P0rYQnUJgw+8gCNcch8yMrvhKvj6ZJCb1cgKu3xiwfu TAFm/uZ8scJugKjFcsSXDOJLhL/cpLHJKx7GSYgtoq6DILO5kZcX3XKuG2a593MSk5sW VTWqEkDKn2wIAzAWKFiNm278sjsQG1PN16C8ar2YuAzyTRz7E2+XWOX/o4QotKGWdrpx AD1klhzybzlDbtg/+xs55ouRosBLfnoC9XI4qwrIdBYlsDBErR3HRVQlAoiGarVNVT2t Y7xA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=CmW7wn48; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id dd14-20020a1709069b8e00b0077d562462f5si1032162ejc.381.2022.11.23.17.36.42; Wed, 23 Nov 2022 17:37:05 -0800 (PST) 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=CmW7wn48; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229927AbiKXB3v (ORCPT + 99 others); Wed, 23 Nov 2022 20:29:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59596 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229906AbiKXB3n (ORCPT ); Wed, 23 Nov 2022 20:29:43 -0500 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 053867CB8A; Wed, 23 Nov 2022 17:29:41 -0800 (PST) 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 4NHgQS5PfWz4x2c; Thu, 24 Nov 2022 12:29:36 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1669253377; bh=JBoFldnbFkQx64zlIrUVvIYpX+G+3s4hlaGLmsO4DLc=; h=Date:From:To:Cc:Subject:From; b=CmW7wn482iyoUrRheIscrEyn6EGtgKfYyL6ulcErqB3VafsnutmmWgnDZ18WmCqWu HB4R/G7DpoGcZWestJx3AxYrx5+eB1nrbWwxM1EkVy6QgHL41/bH0nHXck8viqvNb6 T1rWTUGFu402173F6e5tvwjmAtEUbHRruukTKn8g/3iDQ8jSh4DeVuy+Zcf1tpcQLd LuQpWtvFxkAx3+vQ7zGQPKLwnQs5YfVl6NOTFo7lAv52FpMlET36+P6QHQcBprDz50 nuUVB+TXLZAURbB1SAxREtmhUsX8R3CNnXgKq4m1tDz3/aE1gbj4kbela6T5go8v8/ ID2qwCrcBPJSA== Date: Thu, 24 Nov 2022 12:29:31 +1100 From: Stephen Rothwell To: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , Michael Ellerman Cc: PowerPC , Christophe Leroy , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the tip tree with the powerpc-objtool tree Message-ID: <20221124122931.266df8c7@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 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?1750339499552893604?= X-GMAIL-MSGID: =?utf-8?q?1750339499552893604?= Hi all, Today's linux-next merge of the tip tree got a conflict in: tools/objtool/check.c between commit: efb11fdb3e1a ("objtool: Fix SEGFAULT") from the powerpc-objtool tree and commit: dbcdbdfdf137 ("objtool: Rework instruction -> symbol mapping") 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. diff --cc tools/objtool/check.c index 7580c66ca5c8,4f1a7384426b..000000000000 --- a/tools/objtool/check.c