Re: [PATCH 8/9] usb: host: ehci-tegra: fix PHY error handling

[Felipe Balbi <balbi-l0cyMroinI0@public.gmane.org>]

[-- Attachment #1: Type: text/plain, Size: 1039 bytes --]

On Mon, Mar 18, 2013 at 09:25:34AM -0600, Stephen Warren wrote:
> On 03/18/2013 02:02 AM, Felipe Balbi wrote:
> > Hi,
> > 
> > On Fri, Mar 15, 2013 at 03:12:08PM -0600, Stephen Warren wrote:
> >> On 03/15/2013 03:12 AM, Felipe Balbi wrote:
> >>> PHY layer no longer returns NULL, we must switch from
> >>> IS_ERR_OR_NULL() to IS_ERR().
> >> 
> >> This change will definitely conflict with some Tegra
> >> EHCI/USB-PHY changes that Venu plans to submit very soon, for
> >> 3.10. This is relevant
> > 
> > but this is such a small change that, even if it conflicts,
> > resolution will be trivial.
> 
> Well, Venu's changes re-organize exactly the code you're modifying.
> Wouldn't it be simpler to simply take all the Tegra USB patches
> through the PHY tree and avoid any conflicts at all?

alright, I will take all patches, so please create a very small
immutable branch which I can merge then I'll take all other patches.

Let's just try to avoid this sort of situation whenever possible.

cheers

-- 
balbi

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]