From patchwork Tue Nov 28 21:53:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 171010 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp4249360vqx; Tue, 28 Nov 2023 13:53:26 -0800 (PST) X-Google-Smtp-Source: AGHT+IGc2Yai6DWQFaqmFH+epyMvblyb9zSfHUFw/b/7nXJAWnYBUOneDdt1R71sPDoABR2Uu93p X-Received: by 2002:a17:902:e5c6:b0:1cf:de3e:e4ca with SMTP id u6-20020a170902e5c600b001cfde3ee4camr7980734plf.20.1701208405609; Tue, 28 Nov 2023 13:53:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701208405; cv=none; d=google.com; s=arc-20160816; b=aS9KOcFC+8TNPcpZkSfb898HHRiNZC2FnjSBoHtE5vPT7lb0FD7dMHEV394aHiZ3VZ rIrEuwcEA4Kx7cWOT4JnweueoBI1Jh0PHeWQdUNBsGUIJ3lOy0rzsU4G5i1qvRrzi6S/ X2FZMiTGQjbCcwqfUpsbACUmAn3izCSSiuLReEvo16jsdPLEuPK3y6AlS/uMfYcYBCsp EAWhI3+hynJzTqnZI+fj0FXpg9ewR2L+gaatBOjEu5huS+ZS1heAtpXxG3QD/b8ZWp8V 4E39Szpves1BNe+QIwzRqC8HheJ3Y4rNy4QRQN5HpnokApaKf1jlKla7ZgtNRai74rQ4 wwAw== 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=KO5V6pbvlN0x2mJFnkJQlZa+zZOJEiVHRwjRN/9mI7A=; fh=r3H+HhlzuWqcjPrWrElgFkGRXObXdMc++ALi44WYPJ4=; b=gkRghVbRN0SHQE3gsPpkCfm6uhS6ApNo/1/86dU4YltN3wysqoHSwWCGDyNBnwrZGj LAkiwwXi/GmBtV/fGT7VfVJtMjM9Hq2n6yZrazw2TvYfMmNpTf5KjiZFoMVlY1d4kl77 vvZtg9gh0+GXKorfgVwbFamaq9pDdRP+8ECJuTY2I8AwWrI2SF31YTYIiOiSS4qu7U2t 29NWiLmMJucKo0K6QHKaEyLkwxB4cvqRHIfNHf/Yxzk83q7SA1UvSF4h4d2OmkYd7XXn +fTerjxVW0jXdDS6aoCztSpzWk8sOFbXNUY+qn41MusDhORhRl1w1H0QVUOBzfmVoZxw M97A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=sadRXjrv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 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 lipwig.vger.email (lipwig.vger.email. [23.128.96.33]) by mx.google.com with ESMTPS id e8-20020a17090301c800b001cfdeb48e92si3946755plh.448.2023.11.28.13.53.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Nov 2023 13:53:25 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=sadRXjrv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id CECC88047D64; Tue, 28 Nov 2023 13:53:20 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229862AbjK1VxL (ORCPT + 99 others); Tue, 28 Nov 2023 16:53:11 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37610 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229543AbjK1VxL (ORCPT ); Tue, 28 Nov 2023 16:53:11 -0500 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 921AA18F; Tue, 28 Nov 2023 13:53:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1701208395; bh=KO5V6pbvlN0x2mJFnkJQlZa+zZOJEiVHRwjRN/9mI7A=; h=Date:From:To:Cc:Subject:From; b=sadRXjrv8ZUFmQsAB/olrq/FUo/SqVRnPZxRfspL2K6vKEGrCb2vFZBI0CLL+xuG/ lv2+03+R6pDHAUfZPEz2CRM8nZSsmPOAR5FoHynTV7l2gnv89rlHPFnfkkj3A0Rbu2 O/mUE/ODjgLM1Oa47wvlkqRa4vx4O+J+XRnjQ7JbN/9S1XAVvbdl3owZWRvO2VxVb/ 3K9TAJjr+xZrDHbMhgXdgCtVckV6a4Dip+FhocrG+iTfyPqa+/MxYJ3bQDm0lEhWXl cR86QrzFruLtJ3xpq5OM11aJUyFIUadZh0nxLMvEUHvrLTWHjrrvX3JOrnOq042aht X2sJZTlH0JwqQ== 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 X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4Sfx625QrNz4wc6; Wed, 29 Nov 2023 08:53:14 +1100 (AEDT) Date: Wed, 29 Nov 2023 08:53:14 +1100 From: Stephen Rothwell To: Arnaldo Carvalho de Melo , Namhyung Kim Cc: Arnaldo Carvalho de Melo , Athira Jajeev , Linux Kernel Mailing List , Linux Next Mailing List , Oliver Upton Subject: linux-next: manual merge of the perf tree with Linus' tree Message-ID: <20231129085314.50306434@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Tue, 28 Nov 2023 13:53:21 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783846305124625673 X-GMAIL-MSGID: 1783846305124625673 Hi all, Today's linux-next merge of the perf tree got a conflict in: tools/perf/Makefile.perf between commit: e2bdd172e665 ("perf build: Generate arm64's sysreg-defs.h and add to include path") from Lius' tree and commit: 1638b11ef815 ("perf tools: Add perf binary dependent rule for shellcheck log in Makefile.perf") from the perf 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/perf/Makefile.perf index 058c9aecf608,824cbc0af7d7..000000000000 --- a/tools/perf/Makefile.perf