Message ID | 20230925111007.46e31ba2@canb.auug.org.au |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp949204vqu; Sun, 24 Sep 2023 20:08:05 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGORT8KwPZ2Sdsr93EUM7cHSZyn4FqlkaJ59bPZWV5wMXzu1a1nLsXdGMbSwZ5nXmZxei0B X-Received: by 2002:a25:e787:0:b0:d7f:95f6:e13e with SMTP id e129-20020a25e787000000b00d7f95f6e13emr5073491ybh.33.1695611284941; Sun, 24 Sep 2023 20:08:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695611284; cv=none; d=google.com; s=arc-20160816; b=SCgnWZil/KGJk1PblTj2vhQuEPV1p3G2/jJTqFQxGa8uJXYLeBQl9S31Hm8IoxdGbb h14WyTCRhSD8+3z1tX8Q9Ru8eu/wAXONnxM3gud8Gu37JbI/VmDYeRZ4P4nWa1OnY7Bd EPEE1HcO8KxNdhG6XrJnh9eF0Im5YORMre0y4mFNtlk7eH9i2aFwd2H74pZE2MLEmqB7 h7nkM/5xzR97jKSMCRjTNKbYHNM9y5ddtNIaxo3R2S2Xth4pgL+xbNBFEg9rtj1WChs2 EmVbEu3/eNL5MP+KTYNWXZJys+v6bSzujetaYAzJH1ikt+pX1H8TIWdRjEFU3/ozoIic lLFQ== 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=NZtOTu9nfPR2vyU3CtBKvKUXPFl6+5told3vzt5YVTY=; fh=7FyO7DBWnT7YuNWxl7q5lFMrhI36xfZtJjpqRF2LgFQ=; b=CxJR9lNmn7d2KGe1xHxuzylvblSjuFrJ/OW2lZOPt7qM8qclQv1plkypYcLPhhPzsd niOmDKPpQYShrFzaQojMytPD8QHnfLB/U9fQGDgzfMfhSST9DxiKjZMZTKVumop2z5+A R2IERkK9IPUl1+rs1kW0DrxT48XZuqiiuRwSyppiiz5EY+iIReQtjmXd7iOS5HuSBAEQ u4y0hza+2nsQURgBUaIw3udydeo/evao60yTEE4sJGZgRwBVjuw71lIS1LWfn7JnXAIq xWqDMzTl/R5RZtmOJE1AlL9VGEcMTth7R6r6hJZYBe7yMm0/JevocCdLXO70UbtOO93s tTzQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=m0nuTNWH; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 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 agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id l73-20020a63914c000000b0055be9526b7fsi9044135pge.416.2023.09.24.20.08.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Sep 2023 20:08:04 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=m0nuTNWH; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 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 agentk.vger.email (Postfix) with ESMTP id 4EE13817712A; Sun, 24 Sep 2023 18:10:28 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231397AbjIYBKX (ORCPT <rfc822;pusanteemu@gmail.com> + 29 others); Sun, 24 Sep 2023 21:10:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47058 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229514AbjIYBKW (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Sun, 24 Sep 2023 21:10:22 -0400 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 17E2FC4; Sun, 24 Sep 2023 18:10:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1695604209; bh=NZtOTu9nfPR2vyU3CtBKvKUXPFl6+5told3vzt5YVTY=; h=Date:From:To:Cc:Subject:From; b=m0nuTNWHXJqlyf1dQTvOua6J+IOtmyoNrCaXlNyrVGDihrdcsxjE4JAtkMK5Gaq4T gw2Kbp4Ce/vT1u4c8tyruJ1aWXepPwq1/KvNZLDd4JugSGGrMlRerC/YTU78TcM7Rs tvfwO/bnJFBl/mJS4pT77R7mq2qYAkLN+9/x9sKNVr9+9WJNQ9vcNWrqFr4lhF4fY/ 0jj2Ar+j5qsKDWYo4MSafZeLl5bUgVInKdfX5W/7+2LLf9eMQ/pGACsSD3kluh39Qa SxdLg3ItSimSaZj/Yer2IgzhjdbKOXQ6KhJsm+7gTBT0XdmqY1LsBqxIaWjYteBzME 9tDeEjjPrMhiA== 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 4Rv4YD6dk2z4xF1; Mon, 25 Sep 2023 11:10:08 +1000 (AEST) Date: Mon, 25 Sep 2023 11:10:07 +1000 From: Stephen Rothwell <sfr@canb.auug.org.au> To: Ulf Hansson <ulf.hansson@linaro.org>, Hector Martin <marcan@marcan.st> Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Linux Next Mailing List <linux-next@vger.kernel.org> Subject: linux-next: manual merge of the pmdomain tree with the asahi-soc tree Message-ID: <20230925111007.46e31ba2@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/ltiG98nSm+H76LejjrqZ81W"; protocol="application/pgp-signature"; micalg=pgp-sha256 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 autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Sun, 24 Sep 2023 18:10:28 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777977298392916669 X-GMAIL-MSGID: 1777977298392916669 |
Series |
linux-next: manual merge of the pmdomain tree with the asahi-soc tree
|
|
Commit Message
Stephen Rothwell
Sept. 25, 2023, 1:10 a.m. UTC
Hi all, Today's linux-next merge of the pmdomain tree got a conflict in: drivers/soc/apple/Kconfig between commit: 6fca0adc61cf ("soc: apple: mailbox: Add ASC/M3 mailbox driver") from the asahi-soc tree and commit: 1bfadf2edd65 ("pmdomain: apple: Move Kconfig option to the pmdomain subsystem") from the pmdomain 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.
Comments
Hi all, On Mon, 25 Sep 2023 11:10:07 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote: > > Today's linux-next merge of the pmdomain tree got a conflict in: > > drivers/soc/apple/Kconfig > > between commit: > > 6fca0adc61cf ("soc: apple: mailbox: Add ASC/M3 mailbox driver") > > from the asahi-soc tree and commit: > > 1bfadf2edd65 ("pmdomain: apple: Move Kconfig option to the pmdomain subsystem") > > from the pmdomain 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/soc/apple/Kconfig > index c5203c388bf4,eff486a77337..000000000000 > --- a/drivers/soc/apple/Kconfig > +++ b/drivers/soc/apple/Kconfig > @@@ -4,35 -4,9 +4,22 @@@ if ARCH_APPLE || COMPILE_TES > > menu "Apple SoC drivers" > > - config APPLE_PMGR_PWRSTATE > - bool "Apple SoC PMGR power state control" > - depends on PM > - select REGMAP > - select MFD_SYSCON > - select PM_GENERIC_DOMAINS > - select RESET_CONTROLLER > - default ARCH_APPLE > - help > - The PMGR block in Apple SoCs provides high-level power state > - controls for SoC devices. This driver manages them through the > - generic power domain framework, and also provides reset support. > - > +config APPLE_MAILBOX > + tristate "Apple SoC mailboxes" > + depends on PM > + depends on ARCH_APPLE || (64BIT && COMPILE_TEST) > + default ARCH_APPLE > + help > + Apple SoCs have various co-processors required for certain > + peripherals to work (NVMe, display controller, etc.). This > + driver adds support for the mailbox controller used to > + communicate with those. > + > + Say Y here if you have an Apple SoC. > + > config APPLE_RTKIT > tristate "Apple RTKit co-processor IPC protocol" > - depends on MAILBOX > + depends on APPLE_MAILBOX > depends on ARCH_APPLE || COMPILE_TEST > default ARCH_APPLE > help This is now a conflict between the asahi-soc tree and Linus' tree.
diff --cc drivers/soc/apple/Kconfig index c5203c388bf4,eff486a77337..000000000000 --- a/drivers/soc/apple/Kconfig