From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id ADFAAC433FE for ; Tue, 21 Sep 2021 03:14:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8C38261264 for ; Tue, 21 Sep 2021 03:14:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231953AbhIUDQB (ORCPT ); Mon, 20 Sep 2021 23:16:01 -0400 Received: from bilbo.ozlabs.org ([203.11.71.1]:50825 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229973AbhIUCcF (ORCPT ); Mon, 20 Sep 2021 22:32:05 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1632191435; bh=vTQXciGMsRDBZPI3BtUp0IkecWENffXTdzLmGGjwXEY=; h=Date:From:To:Cc:Subject:From; b=fAVuU1PJi5/E6E2oL4KQgp/Ason8H5fS60aStrxWBBbRJcjnrlVu580PUxZWFgye2 PIOc96sKhQgGWcO5B0C2qYeCTSkpXAIVHEaEHInlVYZbXoOpEBQ3H6BfvCVqSxjtCO JGFeuL7pe4vP5xq2yCZCj6eJnnngKgvJvzgYSmzyj2tlLNJ35KtPjUrYxlNAzULH2H /azRWXoaG59ZAmTNKBqELEC7lNzvgH82XzGYQve/5S4st0Ylyig4uPgugR/r1SpsnC y1GNzpHVHYxTSy7PS+CopyPmyVZxVcCF2wtHj8MK3yDRQ7Godiu9GYY8qLzASouaU2 po//ol4w2Am5Q== 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 (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4HD54n4QRQz9sW5; Tue, 21 Sep 2021 12:30:33 +1000 (AEST) Date: Tue, 21 Sep 2021 12:30:32 +1000 From: Stephen Rothwell To: Greg KH , Andy Gross Cc: Baruch Siach , Bjorn Andersson , Greg Kroah-Hartman , Kathiravan T , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the usb tree with the qcom tree Message-ID: <20210921123032.02cd498b@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/a01qS2U2KELLuIltukzra2."; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org --Sig_/a01qS2U2KELLuIltukzra2. Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the usb tree got a conflict in: arch/arm64/boot/dts/qcom/ipq6018.dtsi between commit: 261e8a95d9aa ("arm64: dts: qcom: ipq6018: add usb3 DT description") from the qcom tree and commit: 9da2c3f76164 ("arm64: qcom: ipq6018: add usb3 DT description") from the usb tree. Same author, same date, but the former has this committer comment: bjorn: Changed dwc3 node name to usb, per binding So I used that version. I fixed it up (see above) 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. --=20 Cheers, Stephen Rothwell --Sig_/a01qS2U2KELLuIltukzra2. Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmFJQ8gACgkQAVBC80lX 0GwsbAf/VxEFKaQYvUE4SCGt/iMkHoiyBRMCeoGLRHDqs5kxqbziyAmvYvwUwbL1 +PzFSDZ11YoLEsQ4G0DAv4G5wgvtYg7UUtXMt4NLykz5frQ3b72dYqin1ZdcuZI7 rFdx+7EtSl917uon2trZE/cFMGYuFNuCL7CSUxF4tpz2TUu0qxjD48TnRkZca8nm xv7Uv1TZ1Zkb6Cuy16KocqYqQJKOkXgmnfaIRjlLNc2rg+Av3UiGH5Pm9hPv8RvB vDo4LnjOihNc1LhY8uzRhHfvIuGIQEE9MhgLLlWAJmZMN9Rrhq5dec2VSMdfPmfA /x7e9MrZGsrkuOWvJqmBnbC96JDNfA== =Vymu -----END PGP SIGNATURE----- --Sig_/a01qS2U2KELLuIltukzra2.--