From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Felipe Balbi <balbi@ti•com>, Greg KH <greg@kroah•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Maxime Ripard <maxime.ripard@free-electrons•com>,
Thierry Reding <treding@nvidia•com>
Subject: linux-next: manual merge of the usb-gadget-fixes tree with the usb.current tree
Date: Mon, 12 Jan 2015 11:13:39 +1100 [thread overview]
Message-ID: <20150112111339.591e766e@canb.auug.org.au> (raw)
[-- 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 --]
next reply other threads:[~2015-01-12 0:13 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-12 0:13 Stephen Rothwell [this message]
2015-01-12 16:15 ` linux-next: manual merge of the usb-gadget-fixes tree with the usb.current tree Thierry Reding
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=20150112111339.591e766e@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=balbi@ti$(echo .)com \
--cc=greg@kroah$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=maxime.ripard@free-electrons$(echo .)com \
--cc=treding@nvidia$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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