From patchwork Mon Dec 18 05:48:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 180139 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:24d3:b0:fb:cd0c:d3e with SMTP id r19csp1047133dyi; Sun, 17 Dec 2023 21:48:41 -0800 (PST) X-Google-Smtp-Source: AGHT+IGW0ahJtHf6shuKEc9BdAhx2it1sxfADzlCG+EhUqu8GBHRkwvnZBjmrH1UtyLPKHwffkYL X-Received: by 2002:a17:907:1c93:b0:a1f:78ab:e5c2 with SMTP id nb19-20020a1709071c9300b00a1f78abe5c2mr8841075ejc.75.1702878520637; Sun, 17 Dec 2023 21:48:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702878520; cv=none; d=google.com; s=arc-20160816; b=NrOvnJT9hOcYtpeXeryNBJy/kjSFscZj9iQJbMlwIU5Z5ieKlFT+MxTGSm4/vtKNT3 hFM+s/6nj1n5pv2iygIn7eUPi9Sh+zJembymBHqMM0VNxvjjJWkOtxAdedyEmPm8TCq/ EvJyudqQBg2m4U9XNh34kzUyshwszG6mOFp4J+t43jrKvm2+iJ6ODknXI4gHQU8pxClI KViucyvxOxpmv7LWBhzAk1qYyXpWqlxwC/6kfayYTlrVUnuq7HtmVWvsnlG2L264ye9O uhke4HmdMZWhEbmosQngPuaBWaL3I7PfPmRrcWDh37HKlS7Zm+K9lrQjEPYNPYc4gwoP OCVQ== ARC-Message-Signature: i=1; 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=6EkdkOoPvJi8d4K4K1G/cZM8HRKq5yRNGdpX+aZ6Yjc=; fh=CC/biNbYYyduvnZj2kOxvoxLxOCsBMtWO4jE25BnmBE=; b=NwIgTrvo3s0qU/bHl7W063tJATZLnYzje0hhY7h/nOwmm1jnqYArEGcEtQTr7r9myM L17MRwbYY3tsTKCq53tyD/uTxY6MOk+FyWNXXi5MpN11mTlulGLkHeUbko+HtuN1mwA1 8o/oLuHszrHOqByrsxBf7q7bsZUWUJ0IrEuQAB4TsqVX8nvTAJ0knlen/larT6tKBSj9 Z9FN0csGgW92v7C9oTWRmDTmIkCmUjIL0UwfpfV4+f0frrKP87iWPk0mFffguv5Y46rA izuCDCM4pR7kEFu/R77B1LlUc7y5t3lf+twj/BU9nkcfFTQOU5VNuv+mhI7olxJdKe7G xV6w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=AWD1oy6q; spf=pass (google.com: domain of linux-kernel+bounces-3013-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-3013-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id kl21-20020a170907995500b00a2326bf70b7si1890991ejc.915.2023.12.17.21.48.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Dec 2023 21:48:40 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-3013-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=AWD1oy6q; spf=pass (google.com: domain of linux-kernel+bounces-3013-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-3013-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 am.mirrors.kernel.org (Postfix) with ESMTPS id 337FE1F21F99 for ; Mon, 18 Dec 2023 05:48:40 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id D24F86FA4; Mon, 18 Dec 2023 05:48:25 +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="AWD1oy6q" X-Original-To: linux-kernel@vger.kernel.org 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 B8F7D63AA; Mon, 18 Dec 2023 05:48:20 +0000 (UTC) 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=1702878493; bh=6EkdkOoPvJi8d4K4K1G/cZM8HRKq5yRNGdpX+aZ6Yjc=; h=Date:From:To:Cc:Subject:From; b=AWD1oy6qUt+uq+WdrOBJGVSWoBWcE8iN1lRseSLkdXdjT3Dg3RBcRkquxcNNR2ptw Zt1TNoLujVn4cH9w0TxgFERKNiNColD9ZA/9jRILLqgRBICquQAH+j6Cjq2Qc9M6hq WLT8ZHQo7NH+2fN0Pry2G0wS+DjuEwrs9R+K/zA77PnUIHXDsjwK0oxdupHDk+OHwe zuIkPvvk+kgwTSwqA88mxNQhR0OWitMux3EKrMjRhGSpOnwSST5qHBurWXdkJhqQH5 65SXfU+sMNw+vl7fCYHE2o/Mw1h3ilsRKFHKaWT0aDrm2Q1CV+m4niwetyib5PAG5T vxAT3EAOu87VQ== 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 4StplK15nmz4xCp; Mon, 18 Dec 2023 16:48:13 +1100 (AEDT) Date: Mon, 18 Dec 2023 16:48:12 +1100 From: Stephen Rothwell To: Rob Herring , Greg KH Cc: Dmitry Baryshkov , Greg Kroah-Hartman , Kyle Tso , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the devicetree tree with the usb tree Message-ID: <20231218164812.327db2af@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: 1785597547495202885 X-GMAIL-MSGID: 1785597547495202885 Hi all, Today's linux-next merge of the devicetree tree got a conflict in: Documentation/devicetree/bindings/connector/usb-connector.yaml between commits: 76cd718a9ffd ("dt-bindings: connector: usb: add accessory mode description") d1756ac67e7f ("dt-bindings: connector: usb: add altmodes description") from the usb tree and commit: 0d3a771610d0 ("dt-bindings: connector: Add child nodes for multiple PD capabilities") from the devicetree 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 Documentation/devicetree/bindings/connector/usb-connector.yaml index f5966b3a2d9a,5a93cdb9fdbc..000000000000 --- a/Documentation/devicetree/bindings/connector/usb-connector.yaml