From patchwork Tue Aug 15 00:37:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 13353415 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 1D438C001DB for ; Tue, 15 Aug 2023 00:38:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Content-Type: List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: MIME-Version:Message-ID:Subject:Cc:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=lzL+ihPwVq1OufXxwak3U66Xx7ZGGE/1fW4KycmPais=; b=vX2 ayukz3k9j6OcnwRbxJydfKjxqKUL5i5EkT4cXQ41rLF+r91tT48Om1jBmgXrO3C6BMxRttlU+2gYR X/Iuh00sPom1XPZwupqJfg/fPV/XMj6az77y9egZFNbCXkc3kw9jG0RGHB9tSLzJukMJ8gxCkMWIQ /x7owkvwOGUs++/2/JCOqaAjiBeGSQCXJ8jEtyAsf4b5JUQ/OtPhMNKSakxJR+OkPtfeSzgvS6D50 Nj3vJb0NakRgHi4TQxvjI4iXZXFECp30Ewf63/MnMEEu+dUTIJvZNPF4BkCb/ztbbEYkKCy6VrQ5/ +5Jpjr4CdsQFLJ8ows5EwsJbtJnmEPA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qVi4h-000biD-0s; Tue, 15 Aug 2023 00:38:19 +0000 Received: from mail.ozlabs.org ([2404:9400:2221:ea00::3] helo=gandalf.ozlabs.org) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qVi4d-000bfy-2J for linux-arm-kernel@lists.infradead.org; Tue, 15 Aug 2023 00:38:17 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1692059872; bh=TLQVjY3kxE2Np30YiLY3zv14XDCrBIX0I1ZNA+WIP5w=; h=Date:From:To:Cc:Subject:From; b=rkzMLqtHuBx6OZizRyf68NlrUy9vyA4jGebOuctXuEcHJY7h+yQKjFqmyqzVKieGK pGvCGJQr/azZBlfSalTVDV6vGhKm8kBWKnuybUwd96gpliNdZHFDswtS8Dk+04jZOS sKK1ORiR036NU7RVT4dPwqMBlMT6YDn/f+XJgEs6UIUtWFC5bZB0U8kywR/ZSSQsI2 1pcXsEdpRh71628FjBqQh6msP5U438Pxji+LXG56TodIXatsG9O8V2h8B5qCBXXzaQ S/EwQotBrIzLI64DtB8nEDwV4drN7o8IaM4LD7n8jjBb3xUG4L4MPPs1M4mkTHa06F vXgY/pu69oqcA== 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 (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4RPsmv1Rmxz4wxQ; Tue, 15 Aug 2023 10:37:50 +1000 (AEST) Date: Tue, 15 Aug 2023 10:37:50 +1000 From: Stephen Rothwell To: Sudeep Holla , Olof Johansson , Arnd Bergmann Cc: ARM , Cristian Marussi , Linux Kernel Mailing List , Linux Next Mailing List , Sibi Sankar Subject: linux-next: manual merge of the scmi tree with the arm-soc tree Message-ID: <20230815103750.18868b76@canb.auug.org.au> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230814_173816_188183_C795132F X-CRM114-Status: GOOD ( 16.85 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi all, Today's linux-next merge of the scmi tree got a conflict in: drivers/firmware/arm_scmi/perf.c between commit: 31c7c1397a33 ("firmware: arm_scmi: Add v3.2 perf level indexing mode support") from the arm-soc tree and commit: 3453de1ec6e4 ("firmware: arm_scmi: Fixup perf power-cost/microwatt support") from the scmi 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 drivers/firmware/arm_scmi/perf.c index c0cd556fbaae,b887d57aa446..000000000000 --- a/drivers/firmware/arm_scmi/perf.c