From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-1292091-1525089311-5-621322328464670395 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, ME_NOAUTH 0.01, RCVD_IN_DNSWL_HI -5, LANGUAGES en, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='198.145.29.99', Host='mail.kernel.org', Country='US', FromHeader='org', MailFrom='org' X-Spam-charsets: plain='us-ascii' X-Attached: signature.asc X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: sre@kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=fm2; t= 1525089311; b=g183TOwHrSDtQ/KhWQp2cNm3hunHAfM3q7Mt0PvQvQVYNY4PPj iOjE9MZhnosKGVDFGpj8eprshITZOuhXIESQIKcG4v7INoSy1KbriQDw2s8z3PBS r7QLM7wnD1vCXcStK10mcgmRq+4/hCUoXsTKd9vP2/+T3tRlmQENApxYeqiqm3mK eBhJSBNc0Ix+ZWBzbyWx7Macst9WheBZnJbqxim5dF4Un6OuBJsSJOxSJUSxZIVO AxIbTHr2hUNlXDc/3fTwhGrVZhHLBYRK7NPXtFN9Uj6TLuvflc8FCglbgf78lDy6 KQc8q9C01sMlp+pRtXn2UsqovcBAZzvlQNdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=date:from:to:cc:subject:message-id :references:mime-version:content-type:in-reply-to; s=fm2; t= 1525089311; bh=1JsagSFWitDKUCanPwL67mP+zCeMlHw8X5+p4c/YTn4=; b=h EZXalIGbSt6zJd30BR1IAalf+aVf93pNBFziI+vp0th7AaB6OwqQ+PsNVDdQoZue 0a6xGalTsCYB0pqz9fBvGcPQTRtISxIVnxDSz9E4MHDdL+G8ebISM5zxAc7cSvnH oZe0C0c+S62M4VfjQ/IfoF+iibqjIQ5VeZi1gd/PUQi2OhbwgHMoWZrdH0DMN9SW oy+FdCFhz5AVAE9fsjUcUr3yf/eoj8Wz9ONBCME7hB2hgSJLRKFbeKEJXNanr5p+ JoIPSlsinxkGHTZzuFB6PuLia/pu0X6OI++M/PwWbrv1VaM+Tv14aL9I6ZK8ehtW yvpH6UN/A9k4OyVVTSeZA== ARC-Authentication-Results: i=1; mx5.messagingengine.com; arc=none (no signatures found); dkim=none (no signatures found); dmarc=none (p=none,d=none) header.from=kernel.org; iprev=pass policy.iprev=198.145.29.99 (mail.kernel.org); spf=none smtp.mailfrom=sre@kernel.org smtp.helo=mail.kernel.org; x-aligned-from=pass (Address match); x-cm=none score=0; x-ptr=pass x-ptr-helo=mail.kernel.org x-ptr-lookup=mail.kernel.org; x-return-mx=pass smtp.domain=kernel.org smtp.result=pass smtp_is_org_domain=yes header.domain=kernel.org header.result=pass header_is_org_domain=yes; x-tls=pass version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128; x-vs=clean score=-100 state=0 Authentication-Results: mx5.messagingengine.com; arc=none (no signatures found); dkim=none (no signatures found); dmarc=none (p=none,d=none) header.from=kernel.org; iprev=pass policy.iprev=198.145.29.99 (mail.kernel.org); spf=none smtp.mailfrom=sre@kernel.org smtp.helo=mail.kernel.org; x-aligned-from=pass (Address match); x-cm=none score=0; x-ptr=pass x-ptr-helo=mail.kernel.org x-ptr-lookup=mail.kernel.org; x-return-mx=pass smtp.domain=kernel.org smtp.result=pass smtp_is_org_domain=yes header.domain=kernel.org header.result=pass header_is_org_domain=yes; x-tls=pass version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128; x-vs=clean score=-100 state=0 X-ME-VSCategory: clean X-CM-Envelope: MS4wfMqmC5tPsPFkIgbNIoYuhtxe8hHVEvESVKGPgwOfpP4T6rVVTzUtaS8gXtA6d/pUbiGvTzuvywxN0JDVAoSjYNMHfoUbPHD2+iIpP7DqENcATfrJkjvD c8zRQFyxTtAxa5ydjC8E9C3jht1Wywzr4N4CrJtLrdqiyeI9nQ1qq57GFKvEiMJJmOMcVrkwpCI9Hg== X-CM-Analysis: v=2.3 cv=NPP7BXyg c=1 sm=1 tr=0 a=czNdAM+YcK12vDHDihaDnQ==:117 a=czNdAM+YcK12vDHDihaDnQ==:17 a=Kd1tUaAdevIA:10 a=rOUgymgbAAAA:8 a=UCr_w0ueFpTsN3GStV8A:9 a=CjuIK1q_8ugA:10 a=jKWTw12svUOaRx_U0J0A:9 a=ONNS8QRKHyMA:10 a=MP9ZtiD8KjrkvI0BhSjB:22 X-ME-CMScore: 0 X-ME-CMCategory: none DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5D9F02184E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=sre@kernel.org Date: Mon, 30 Apr 2018 13:55:05 +0200 From: Sebastian Reichel To: Stephen Rothwell , Greg KH Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Martin Blumenstingl , Johan Hovold Subject: Re: linux-next: manual merge of the usb tree with the usb.current tree Message-ID: <20180430115505.v6krohceeezbutnm@earth.universe> References: <20180423130444.0672fb80@canb.auug.org.au> <20180430113410.6bb4d6ea@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="5gsy5quxnybolmdr" Content-Disposition: inline In-Reply-To: <20180430113410.6bb4d6ea@canb.auug.org.au> User-Agent: NeoMutt/20180323 X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: --5gsy5quxnybolmdr Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi, On Mon, Apr 30, 2018 at 11:34:10AM +1000, Stephen Rothwell wrote: > Hi all, >=20 > On Mon, 23 Apr 2018 13:04:44 +1000 Stephen Rothwell wrote: > > > > Today's linux-next merge of the usb tree got a conflict in: > >=20 > > drivers/usb/core/hcd.c > >=20 > > between commit: > >=20 > > 63cb03f5c11e ("usb: core: split usb_phy_roothub_{init,alloc}") > >=20 > > from the usb.current tree and commit: > >=20 > > bc40f5341741 ("USB: core: hcd: drop support for legacy phys") > >=20 > > from the usb tree. > >=20 > > I fixed it up (see below - though I am not sure what happens to the > > phy_roothub allocation when usb_phy_roothub_init fails) 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 > > --=20 > > Cheers, > > Stephen Rothwell > >=20 > > diff --cc drivers/usb/core/hcd.c > > index 0a42c5df3c0f,ac5bcf449d7d..000000000000 > > --- a/drivers/usb/core/hcd.c > > +++ b/drivers/usb/core/hcd.c > > @@@ -2742,35 -2740,11 +2743,15 @@@ int usb_add_hcd(struct usb_hcd *hcd > > int retval; > > struct usb_device *rhdev; > > =20 > > - if (IS_ENABLED(CONFIG_USB_PHY) && !hcd->skip_phy_initialization) { > > - struct usb_phy *phy =3D usb_get_phy_dev(hcd->self.sysdev, 0); > > -=20 > > - if (IS_ERR(phy)) { > > - retval =3D PTR_ERR(phy); > > - if (retval =3D=3D -EPROBE_DEFER) > > - return retval; > > - } else { > > - retval =3D usb_phy_init(phy); > > - if (retval) { > > - usb_put_phy(phy); > > - return retval; > > - } > > - hcd->usb_phy =3D phy; > > - hcd->remove_phy =3D 1; > > - } > > - } > > -=20 > > if (!hcd->skip_phy_initialization && usb_hcd_is_primary_hcd(hcd)) { > > - hcd->phy_roothub =3D usb_phy_roothub_init(hcd->self.sysdev); > > + hcd->phy_roothub =3D usb_phy_roothub_alloc(hcd->self.sysdev); > > - if (IS_ERR(hcd->phy_roothub)) { > > - retval =3D PTR_ERR(hcd->phy_roothub); > > - goto err_phy_roothub_alloc; > > - } > > + if (IS_ERR(hcd->phy_roothub)) > > + return PTR_ERR(hcd->phy_roothub); > > =20 > > + retval =3D usb_phy_roothub_init(hcd->phy_roothub); > > + if (retval) > > - goto err_phy_roothub_alloc; > > ++ return retval; > > + > > retval =3D usb_phy_roothub_power_on(hcd->phy_roothub); > > if (retval) > > goto err_usb_phy_roothub_power_on; >=20 > This is now a conflict between the battery tree (since it merged the > usb tree) and Linus' tree (since it merged the usb.current tree). Thanks for the heads up! I guess using a topic branch for the tcpm changes would have been the better choice :( As far as I can see there is not much I can do except for mentioning it to Linus when I send my pull request. -- Sebastian --5gsy5quxnybolmdr Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEE72YNB0Y/i3JqeVQT2O7X88g7+poFAlrnBBYACgkQ2O7X88g7 +ppNtg/+I79HzIydv7XIAwubowvmgUrdP9I8BNkc5O4br4RHVYTRD4qqJCPcjNXj 7XQR/H705VWCho26t0ltsjWNLKQBe1nWjRslz6jj4ErVETZiyk/pMIlh5c8VEyeL ahy7hmc5T83aWMuznOSq4oY+wCWV2FyQOv1RWeMnHGhKjEK6xgDXOqFpo09iTI0f 8VYO8rYzWOhXsVYIC8jm1H+pE0c9kZWzWEoRaPoGJaHsLKElmsmp4pFjHvWU1MpP aLK+T0n5s1KYBb98K64fL49qJq4BCxCSgdPf/ZHEpZd0QCgqzQ2fvTSxowqmE4/3 N2cQf8rXb0djFqvOZ9IbuVPVcorVJs6hiyCagdMlHSlPfc7AyIIII88lkI1wp4RM K50G09zhNBx/GJ+KSfBAKzKN9fWxTua4XU08xKbl1fU6aeXTe7bvuARyEetfYktL HP6ronQ+JYwtanU+MqkX41RBYVmhooR3NxpLcTC7T3YtS3E5oV1LKrSdi2gwH7Nt 8r2qMD0VZx0YAx8C73NJ1GJZ9qSYMM81CopbGfET6zYR1cseo8UHxt2P8nCWgGyt oJCzxuPzDIZX94qar3kdQpmeQgwwZ41jyqjAG4P3h60OOycX455gGnyuNMRwhL3+ T+Nlij62znxQZsS6B46lbcxqxgqKVtXtK1wUd5AJSoCfkMfynNQ= =/ef/ -----END PGP SIGNATURE----- --5gsy5quxnybolmdr--