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=-0.9 required=3.0 tests=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 DFC3FC10F29 for ; Mon, 16 Mar 2020 02:47:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B30A5206BE for ; Mon, 16 Mar 2020 02:47:49 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="iS/ulcNP" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729606AbgCPCrs (ORCPT ); Sun, 15 Mar 2020 22:47:48 -0400 Received: from ozlabs.org ([203.11.71.1]:50067 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729348AbgCPCrr (ORCPT ); Sun, 15 Mar 2020 22:47:47 -0400 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 48gghJ2pnvz9sPJ; Mon, 16 Mar 2020 13:47:44 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1584326864; bh=DoUkaH/rxc24XM5Szk1/HHvy8luioLiTJomLUmaTHmc=; h=Date:From:To:Cc:Subject:From; b=iS/ulcNPQrmtX4/kMAw1bnA5T7T8VrmzNa8ILY835t3Qhp5UcsOU7vpSepoivbMlL 3+CnglD2397/XRNqqvV9995yVPCE66F1QVGjLh/MaK+hNDgcksVHJLNujsC+LEXuwG TkMkgnIqhf6nvzUHVKcrg++hv6Ws7gD1nQFoHUWCdU9mw5KyVGd2lMhHsjxLIqJCsu D1WLxqYb+xHq3v9He7oOxNoBr64Yo57jIyC9a8egZN1sgDy0Eq4nx0D4t8FGQ34pIK +ooNjfblG0bMk3C0uzfSeQxhaAbkyzWtIweiJD6tTTuqMHjay9o+mFPb9rwyM8oSoU 73lLOB13pmX4Q== Date: Mon, 16 Mar 2020 13:47:43 +1100 From: Stephen Rothwell To: Greg KH , Colin Cross , Olof Johansson , Thierry Reding Cc: Linux Next Mailing List , Linux Kernel Mailing List , Nagarjuna Kristam , JC Kuo , Mathias Nyman Subject: linux-next: manual merge of the usb tree with the tegra tree Message-ID: <20200316134743.71fbbef8@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/R3YEV=vD2dUOfJFfa+a5SK_"; protocol="application/pgp-signature"; micalg=pgp-sha256 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/R3YEV=vD2dUOfJFfa+a5SK_ 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: drivers/usb/host/xhci-tegra.c between commit: 5d06652ebfd2 ("usb: xhci-tegra: Add OTG support") from the tegra tree and commit: cbb23d5572f0 ("usb: host: xhci-tegra: Tegra186/Tegra194 LPM") from the usb 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. --=20 Cheers, Stephen Rothwell diff --cc drivers/usb/host/xhci-tegra.c index 32f630b0513e,a6e36b3c968f..000000000000 --- a/drivers/usb/host/xhci-tegra.c +++ b/drivers/usb/host/xhci-tegra.c @@@ -206,7 -203,7 +206,8 @@@ struct tegra_xusb_soc=20 =20 bool scale_ss_clock; bool has_ipfs; + bool otg_reset_sspi; + bool lpm_support; }; =20 struct tegra_xusb_context { --Sig_/R3YEV=vD2dUOfJFfa+a5SK_ Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl5u6M8ACgkQAVBC80lX 0Gy1MAf/flY6KY232xZi6TOk/EO9EggBU0TVPObY6SxNcY1ZlzrZC1GN4EjpmLrv Lb9twXGANwz27bPyhx68DEAoEvmxKC5cSlVj8PQh3D0o0Yz1pYyTrwJwOTMWeCSM AiMJAMg/NDpJ5e6uD5IBwSylfLpdnzUmuDyjMg7SGTuyYGiEZyNvcuZ4tNCBkbSq 9vj3b5eWEu4lGIxEPI9FrrGNAEaEbdjoy6pnfzPlTDSU2pPfZJbk7XSVKEUvzN+x zUHtILIWB6Bp092hIjrdm+8Ru2ZJ3QKvVtOSpi8Itg7W3ombUOIkWiZ9A4DDOXpB wgtjZRjtitQsDO3Mq1NHYHs7vABYZw== =zJZx -----END PGP SIGNATURE----- --Sig_/R3YEV=vD2dUOfJFfa+a5SK_--