From patchwork Mon Jul 24 23:31:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 125225 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp2129244vqg; Mon, 24 Jul 2023 17:03:15 -0700 (PDT) X-Google-Smtp-Source: APBJJlHNYf1dkL8akreNKmypOp/Q5zZ00M0rg1xMv1Gc9nQKehQLtWZy7B6r/MOEbAXHintmhbYD X-Received: by 2002:a05:6a20:244b:b0:123:152d:d46b with SMTP id t11-20020a056a20244b00b00123152dd46bmr989560pzc.26.1690243394618; Mon, 24 Jul 2023 17:03:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690243394; cv=none; d=google.com; s=arc-20160816; b=IuOQVCQaTgnmy8Pdi8w4lxzsNOJa5AqQtig5PiqJBk75zY+oJaQTwzgR16RY2Eofan oVOri4wPgKM6d8MyVhWO5no0li34/BshwK+jKFXd3zgZ3p/WOKSZRQcVuiSJPA3BWFTe 1CDp64JyL8D5ylmaVzG1YyWsJhR1X6r9kVAEj2a/Sn5Q3teD0UAew862Ap1AWmtCOMUf Ho6lGecWDbR1GqTncArCVgzihbqQnXzAcScBVTyGpjxfsB43ZkPgxp71V5ePAK8tMEVi PsEjxGx6om4q9DPY1VpL3yXG1fhN/E9W9I3m7MDluyCCD0Xt/uMYFjNtbWDuDisimzac jUmA== 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=rUL962e/sq0yjskMcWvQ79vbePqOGQRbrHppxbF7p0A=; fh=ToQCYK0IEfvKl8LBbLYzl8tQLrsJxWCSSM/iM9s5YcA=; b=wSPRzRxuRTxDLqAXeFBssVnBNhT0nWNDj24wWpy4OKk1YchEe0bFAUNZJ3l8EchK0E Usgi8zYs42W55y5KSy6+RypPKPhjGkDtyA+gSFTrWB1L0glKd1AtjPfHRczuuqz+gQma Nq3QaqVAcfeer8rvKTsX7eIP0fMH+6LhsD+Aztd9xfdzfHKFp/eddSohKQ80duRJAn61 R1sWd2Edbs4gq/vY7RiWqtfvAl4BmZOG3hBcRcFGNIJEJSsJbHlxHHn8AYjXATNQcVnJ fjiEQuqv1iFAL1JK599Qb0bR24kM8HU4wlvlbrG2tZiCfVQOqp+xtemaHGZbvB8/hXJP iLeg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=StrA6aO7; 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=canb.auug.org.au Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id bt18-20020a056a00439200b00675807330bfsi10117671pfb.194.2023.07.24.17.03.01; Mon, 24 Jul 2023 17:03:14 -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=@canb.auug.org.au header.s=201702 header.b=StrA6aO7; 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=canb.auug.org.au Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230077AbjGXXbX (ORCPT + 99 others); Mon, 24 Jul 2023 19:31:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42234 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229459AbjGXXbV (ORCPT ); Mon, 24 Jul 2023 19:31:21 -0400 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CB9ED10F0; Mon, 24 Jul 2023 16:31:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1690241474; bh=rUL962e/sq0yjskMcWvQ79vbePqOGQRbrHppxbF7p0A=; h=Date:From:To:Cc:Subject:From; b=StrA6aO7PYmq8dEi9fVpzKjd1B9x3Lo5cSdRkqIPGQOwkDt8ce9hS3jy8zr6SxI+j 4SHxeRKDH2xZ/DNXP9mS2GAqbB4uJKWXxQrAhkCw2QO8QFqHlpPAjSE+5GcEXEyWSg JcvM9//Ueqss/l/pPfHDLn91msrIur0BqE45DR6mWWAqGmD9VC2H0kQBRnThG7uUI/ K+eJV4i40MDKJPW4xvUlgCa2ehsweioSZGLtHLfCSEwU11WyYA4erSud41W30Y4V/u bIFzP23Fz5I5KvdlpD3U1odHpVm70nQifTt0WfFFR4BGvaWAbTGf7fy4N11bPWqELU 16gLZ6LZnBTLg== 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 4R8xHj0BYvz4wZw; Tue, 25 Jul 2023 09:31:12 +1000 (AEST) Date: Tue, 25 Jul 2023 09:31:10 +1000 From: Stephen Rothwell To: Hector Martin , Olof Johansson , Arnd Bergmann Cc: ARM , Linux Kernel Mailing List , Linux Next Mailing List , Ulf Hansson Subject: linux-next: manual merge of the asahi-soc tree with the arm-soc tree Message-ID: <20230725093110.285eb858@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, 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: INBOX X-GMAIL-THRID: 1772348658158104743 X-GMAIL-MSGID: 1772348658158104743 Hi all, Today's linux-next merge of the asahi-soc tree got a conflict in: drivers/soc/apple/Makefile between commit: 869b9dd3339a ("soc: apple: Move power-domain driver to the genpd dir") from the arm-soc tree and commits: 6fca0adc61cf ("soc: apple: mailbox: Add ASC/M3 mailbox driver") eaf935fa48ec ("soc: apple: mailbox: Rename config symbol to APPLE_MAILBOX") from the asahi-soc 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/Makefile index b241e6a65e5b,20feee6f3943..000000000000 --- a/drivers/soc/apple/Makefile