From patchwork Mon Sep 25 03:10:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 144225 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp1011566vqu; Sun, 24 Sep 2023 23:26:53 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEyBYNBHlZuc/4G+fqXPlfIrNJObv9hh//Q7h8VgarQ3QEr0jF4pBnhaoKTH6nfSlT7MaZA X-Received: by 2002:a05:6a00:18a0:b0:68a:3b25:50cc with SMTP id x32-20020a056a0018a000b0068a3b2550ccmr4781774pfh.30.1695623212825; Sun, 24 Sep 2023 23:26:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695623212; cv=none; d=google.com; s=arc-20160816; b=PakD6AgJ1AUUfQa0LfPHHjJrPBCbpzo1Q3amvODgNjYJnE+OaiIWlgGFSB5CH0wY3S igP1dtlzpyX9DaIWqIrLxu3lJUhC8ubfGdZ6L3Oa/hiT6qNTQDrdKlaFDaADeQall5Qn E5F117T4eKWS3rA8R2OjE3jdz9VfB6M3rVXWba9Yum8nXe4oaZURyQy4Eifi2RSI/wre Vs4Mli5dHq0NOE08crPIxyqZRd+qE12JxJaU2934ddTytBO1vdSK53OsjjSZOLRhRw73 v+CKD2GOkRcZoKEOikZrA/bTqchkaxF/LZgwnSWqyOW3EXULZ5PiVRLj1386Dq+XMdSb PvMw== 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=EbNGHdwWsbSS+G8Yx4d/omzpYIk/5RTo9vgMOuaOGsk=; fh=uznfN8XKcRkUeMjaRa8JcVycdZj+TPpQ8xMBidMS7tM=; b=ErH7tzvgA4HUB480mmdQSQZeXp1XW6f0iafzGCh3ROna4YPXTyMvfRhSNK9iDoGbqi q2O+inviSmgrAMb+IpY2hCriVJ/oTMw+PjB7/OLPP+MMs7cT5KrElnIRKzr3Rl6GjLWh syODzBMuA2B3of5+CUvisNSwW5ICCTVPO4b/O7AkFd1DII82oeDLx9VqC8tTaymM3nbs YsHcyE2RyZ9gm7thCgPA2rDbcGOQ5/sQSelUmm5Um9d8jhu0ikzkMPEGnU38GKZ+qOCs +h099RYJ+BIxhBjXYr/o3SHOgUPP2md2MWiqQDZZIGKJPyTRDKEEGJzPCO/L1LarGM6U hsKQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=huqIWdwy; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 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 groat.vger.email (groat.vger.email. [2620:137:e000::3:5]) by mx.google.com with ESMTPS id f1-20020a056a00228100b00690c6f48aa7si10092286pfe.51.2023.09.24.23.26.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Sep 2023 23:26:52 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=huqIWdwy; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 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 groat.vger.email (Postfix) with ESMTP id 618EF8098490; Sun, 24 Sep 2023 20:10:48 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230084AbjIYDKe (ORCPT + 30 others); Sun, 24 Sep 2023 23:10:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52170 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229846AbjIYDKd (ORCPT ); Sun, 24 Sep 2023 23:10:33 -0400 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D9D7AA4; Sun, 24 Sep 2023 20:10:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1695611424; bh=EbNGHdwWsbSS+G8Yx4d/omzpYIk/5RTo9vgMOuaOGsk=; h=Date:From:To:Cc:Subject:From; b=huqIWdwy29RSMhMGyq9M5/+2nDhHxt1GrppB6PllYNvPJYoVH+yegIH1dFaAxAM3x jPnpmd+AXkiDoC8ZivLv8pG1gyUopN1lHkjaIJegZw16WRWy/D6+0XGj006QJl5zTy sjTQuGC08qw9jrmkNkLQwiNDTJG6Y53TRqVbiDf6jJQmT/MN+iSkXJ4cPM9Jt6CdJD NG6rSJz/vi43oQcXShN0l50ZHX9bA2pqLASw7b/3Nt8Qke93TVK/DSyhZWP0R+GrwO cAnKwDwuxkOc2FmiaFhLYIUzQHUiRqYmSzB1E/IRKK3IpiXhRK71llCpvIQ0fH8EQJ UzrUiQe4agNrg== 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 4Rv7Cz56Kfz4xF8; Mon, 25 Sep 2023 13:10:23 +1000 (AEST) Date: Mon, 25 Sep 2023 13:10:22 +1000 From: Stephen Rothwell To: Kishon Vijay Abraham I , Vinod Koul Cc: Linux Kernel Mailing List , Linux Next Mailing List , Nitheesh Sekar , Varadarajan Narayanan , Yang Yingliang Subject: linux-next: manual merge of the phy-next tree with the phy tree Message-ID: <20230925131022.24514a20@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 autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.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 (groat.vger.email [0.0.0.0]); Sun, 24 Sep 2023 20:10:48 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777977908852139128 X-GMAIL-MSGID: 1777989805976376115 Hi all, Today's linux-next merge of the phy-next tree got a conflict in: drivers/phy/qualcomm/phy-qcom-m31.c between commits: 5f7cd740a6b6 ("phy: qcom: phy-qcom-m31: fix wrong pointer pass to PTR_ERR()") 426e05ce126e ("phy: qcom: phy-qcom-m31: change m31_ipq5332_regs to static") from the phy tree and commits: 90f7af497a78 ("phy: qcom: m31: Fix indentation issues") 68320e35f8cb ("phy: qcom-m31: Add compatible, phy init sequence for IPQ5018") from the phy-next 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/phy/qualcomm/phy-qcom-m31.c index 5cb7e79b99b3,d5af4dde6960..000000000000 --- a/drivers/phy/qualcomm/phy-qcom-m31.c