From patchwork Mon Feb 19 03:44:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 202892 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2685:b0:108:e6aa:91d0 with SMTP id mn5csp1064834dyc; Sun, 18 Feb 2024 19:44:42 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCUhwh09S0WN0CdGk81MjOdfR8ujXNiHujAy8EvdXAnJ0rSmUJ/Ax5dopILtmsNnygU+mnMHip4u1ym9esfQHomx2qd2sg== X-Google-Smtp-Source: AGHT+IFVrGqJaCvJU0zRPqAFit7YVlR0umb1QIUQm25z1JP9/J7VIs7H3bnc7uabBwuRsGmAxkpR X-Received: by 2002:a05:6214:2264:b0:68f:67a9:a9ed with SMTP id gs4-20020a056214226400b0068f67a9a9edmr3122127qvb.62.1708314282386; Sun, 18 Feb 2024 19:44:42 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708314282; cv=pass; d=google.com; s=arc-20160816; b=acWfHRthju6wVDonL9X/9hMz6fESExRTwaRhmx8iz3GjBegZr6OqqnzOX2PF9gO9Uz j96w1T+hMtRN37Aj3gCiRSgWW4yJeEXrF65GkkyAgKgOzNxU9HjyPdbbIC490yNwRLpg j/Rpi7NKT6XaFJEz/k1b41qscY3SLZjh4vkn4F+9/RqOyny/UiGuJleNUjg0sqPrKgVI zJJNmBYVGB/6GRJRl9HsLDFhWVRJoC/VqL5A/fOVXj0eF562TGsz0u4zSoeZHWb6YmNB vCXWEfnF1WYl4Dy88o+6dN7kHPv9KD+KNJX7Q5Dramqigj8Y04vfZSN+RcBapZ+BuvqA rk8g== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:list-unsubscribe:list-subscribe:list-id:precedence :message-id:subject:cc:to:from:date:dkim-signature; bh=96l6UOsMkarkXDh/DNyDt/zjIlA9wUHgWmS9lK4mCYQ=; fh=vRQ6ilNETt5MNDuyKheQ7yn2wcy41DG56ZgEnUmr4no=; b=HpTgFeA1N+u3ji6z1kDO1eG/8l4J1cgRse5Ln5ajH3RghJ2BpxJXsEDDx/5YBNsReD nn69W/wmPoyLeU6BWjzZXzE+ruCsxj6JzEw7HY2ThtcU5jj2nbQ18MO+4vuakEU1WsRA Njt/8seyO7Iyr8aZ00ksnQWVOj/ZHHCBtu/mA4mKMK+JijNfHaampjApfu0srheS7d4c Io929I6p3ZLU+mPZpW0ngJKoDdAqimxi3eDkE84/g2+DNXBrLnwOAmp9tPGKIupobADT 6ZtYzQGUYm1w66cUo7m196CaWAYOer2e/jg9sggBoeQp/EdcDga/m0SDJqB+mcWFSQ3P Nwsw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=GRNN1dyc; arc=pass (i=1 spf=pass spfdomain=canb.auug.org.au dkim=pass dkdomain=canb.auug.org.au dmarc=pass fromdomain=canb.auug.org.au); spf=pass (google.com: domain of linux-kernel+bounces-70683-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-70683-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id jr5-20020a0562142a8500b0068f30acb43esi5298040qvb.225.2024.02.18.19.44.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Feb 2024 19:44:42 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-70683-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=GRNN1dyc; arc=pass (i=1 spf=pass spfdomain=canb.auug.org.au dkim=pass dkdomain=canb.auug.org.au dmarc=pass fromdomain=canb.auug.org.au); spf=pass (google.com: domain of linux-kernel+bounces-70683-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-70683-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 8CC811C219B3 for ; Mon, 19 Feb 2024 03:44:41 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id E66B5524B; Mon, 19 Feb 2024 03:44:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="GRNN1dyc" Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 45B4D4405; Mon, 19 Feb 2024 03:44:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=150.107.74.76 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708314269; cv=none; b=Fn7WKA+z/31+kYxcxcZF8otRomDBAsAzo0zzhM8JUpYWmve3IXBIvz+JGPc7e5hKPdR790QsegyVXyRc2mdkya8awgrVqsnBstmgRehaBU+F1WFYcMr5OtehrcEzi3Rm28Ld4Nx17+kXuVt06hKrpLs38KSese9j5TlEN7KG+40= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708314269; c=relaxed/simple; bh=XDDPkOc4JUM/9hqklG4JbKrMtBikDhra6T+KBoQ8t3U=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=FiB7WQhILB7HtrY4O0FfImbJgWNcvizdwKlyb3y8KQsF0eMtyTTpNaCg2h7QW4c84XIP8BesxO2F0G+NkbguZVcYUaN9+KszFs6UBfsDOUbsg/Z5JmPiuugM0e7u9TALM1Emr0M90i0P+DEowfml4BxOAOWgMks0C8QGNh8azzg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au; spf=pass smtp.mailfrom=canb.auug.org.au; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b=GRNN1dyc; arc=none smtp.client-ip=150.107.74.76 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canb.auug.org.au DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1708314265; bh=96l6UOsMkarkXDh/DNyDt/zjIlA9wUHgWmS9lK4mCYQ=; h=Date:From:To:Cc:Subject:From; b=GRNN1dyccv4Jrvfd1Imk9vq8w7P49Zp/MN+Qtv+f5kd9DMs4CGRHEr51qneq4B52Y VdJKl/SJ7sRLo5bfK3sGBi21HFRgJQd8OiVi4Tx+mmJIdUQBno8F30kkkWDRH62EwP ktFReM1JdcNwd5SX1rUL66DoN9i7Q9RmmIO6uFkAa/pNj/cbR020eq6qAeXJ+ZROB+ APz2O4iMJhOVWvw3OdxuXH4Gm7l0nWO0IQOr85L2Pfo6O1yaZ56/Fyo/ADzq2jxCJg h7KLCW8sa6/lF2vHUwmXmMTLZEnZO2btjCPpedmS+X5jtQQ2KIgofIcwY8I1CsQfQC LX9nB1wxRO8qA== 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 4TdT1P1tscz4wc4; Mon, 19 Feb 2024 14:44:25 +1100 (AEDT) Date: Mon, 19 Feb 2024 14:44:23 +1100 From: Stephen Rothwell To: Kishon Vijay Abraham I , Vinod Koul Cc: Dmitry Baryshkov , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the phy-next tree with the phy tree Message-ID: <20240219144423.16a76202@canb.auug.org.au> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791297356930603857 X-GMAIL-MSGID: 1791297356930603857 Hi all, Today's linux-next merge of the phy-next tree got a conflict in: drivers/phy/qualcomm/phy-qcom-qmp-usb.c between commit: d4c08d8b23b2 ("phy: qcom-qmp-usb: fix v3 offsets data") from the phy tree and commit: 52cfdc9c6c33 ("phy: qcom: qmp-usb: drop dual-lane handling") 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-qmp-usb.c index 5c003988c35d,6b6994cb77d7..000000000000 --- a/drivers/phy/qualcomm/phy-qcom-qmp-usb.c