From: Thierry Reding <treding@nvidia.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Felipe Balbi <balbi@ti.com>, Greg KH <greg@kroah.com>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Maxime Ripard <maxime.ripard@free-electrons.com>
Subject: Re: linux-next: manual merge of the usb-gadget-fixes tree with the usb.current tree
Date: Mon, 12 Jan 2015 17:15:27 +0100 [thread overview]
Message-ID: <20150112161526.GD16118@ulmo.nvidia.com> (raw)
In-Reply-To: <20150112111339.591e766e@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 787 bytes --]
On Mon, Jan 12, 2015 at 11:13:39AM +1100, Stephen Rothwell wrote:
> * PGP Signed by an unknown key
>
> Hi Felipe,
>
> Today's linux-next merge of the usb-gadget-fixes tree got a conflict in
> drivers/usb/phy/phy.c between commit 9c9d82492b73 ("usb: phy: Fix
> deferred probing") from the usb.current tree and commit c818a94c77a9
> ("usb: phy: Restore deferred probing path") from the usb-gadget-fixes
> tree.
>
> These seem to try to fix the same problem (from reading their commit messages).
>
> I fixed it up (I used the version from the usb-gadget-fixes tree) and
> can carry the fix as necessary (no action is required).
Sounds good to me. There was a discussion on the mailing lists and
c818a94c77a9 was what we settled on as being the better fix.
Thierry
[-- Attachment #2: Type: application/pgp-signature, Size: 819 bytes --]
prev parent reply other threads:[~2015-01-12 16:15 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-12 0:13 linux-next: manual merge of the usb-gadget-fixes tree with the usb.current tree Stephen Rothwell
2015-01-12 16:15 ` Thierry Reding [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150112161526.GD16118@ulmo.nvidia.com \
--to=treding@nvidia.com \
--cc=balbi@ti.com \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=maxime.ripard@free-electrons.com \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).