* linux-next: manual merge of the usb-gadget-fixes tree with the usb.current tree
@ 2015-01-12 0:13 Stephen Rothwell
2015-01-12 16:15 ` Thierry Reding
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2015-01-12 0:13 UTC (permalink / raw)
To: Felipe Balbi, Greg KH
Cc: linux-next, linux-kernel, Maxime Ripard, Thierry Reding
[-- Attachment #1: Type: text/plain, Size: 589 bytes --]
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).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: linux-next: manual merge of the usb-gadget-fixes tree with the usb.current tree
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
0 siblings, 0 replies; 2+ messages in thread
From: Thierry Reding @ 2015-01-12 16:15 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Felipe Balbi, Greg KH, linux-next, linux-kernel, Maxime Ripard
[-- 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 --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-01-12 16:15 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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 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).