From: Felipe Balbi <balbi@ti.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Felipe Balbi <balbi@ti.com>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Jingoo Han <jg1.han@samsung.com>, Greg KH <greg@kroah.com>,
Tuomas Tynkkynen <ttynkkynen@nvidia.com>
Subject: Re: linux-next: manual merge of the usb-gadget tree with the usb tree
Date: Fri, 2 Aug 2013 10:23:03 +0300 [thread overview]
Message-ID: <20130802072303.GC24465@radagast> (raw)
In-Reply-To: <20130802163818.e29c7e6d3472cf161703ae60@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 552 bytes --]
Hi,
On Fri, Aug 02, 2013 at 04:38:18PM +1000, Stephen Rothwell wrote:
> Today's linux-next merge of the usb-gadget tree got a conflict in
> drivers/usb/host/ehci-tegra.c between commit d4f09e28d7bc ("USB: host:
> use dev_get_platdata()") from the usb tree and commit d50642794508 ("usb:
> tegra: host: Remove references to plat data") from the usb-gadget tree.
>
> I fixed it up (the latter just removed the code updated by the former, so
> I did that) and can carry the fix as necessary (no action is required).
Thank you
--
balbi
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
WARNING: multiple messages have this Message-ID (diff)
From: Felipe Balbi <balbi@ti.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Felipe Balbi <balbi@ti.com>, <linux-next@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, Jingoo Han <jg1.han@samsung.com>,
Greg KH <greg@kroah.com>,
Tuomas Tynkkynen <ttynkkynen@nvidia.com>
Subject: Re: linux-next: manual merge of the usb-gadget tree with the usb tree
Date: Fri, 2 Aug 2013 10:23:03 +0300 [thread overview]
Message-ID: <20130802072303.GC24465@radagast> (raw)
In-Reply-To: <20130802163818.e29c7e6d3472cf161703ae60@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 552 bytes --]
Hi,
On Fri, Aug 02, 2013 at 04:38:18PM +1000, Stephen Rothwell wrote:
> Today's linux-next merge of the usb-gadget tree got a conflict in
> drivers/usb/host/ehci-tegra.c between commit d4f09e28d7bc ("USB: host:
> use dev_get_platdata()") from the usb tree and commit d50642794508 ("usb:
> tegra: host: Remove references to plat data") from the usb-gadget tree.
>
> I fixed it up (the latter just removed the code updated by the former, so
> I did that) and can carry the fix as necessary (no action is required).
Thank you
--
balbi
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
next prev parent reply other threads:[~2013-08-02 7:23 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-02 6:38 linux-next: manual merge of the usb-gadget tree with the usb tree Stephen Rothwell
2013-08-02 7:23 ` Felipe Balbi [this message]
2013-08-02 7:23 ` Felipe Balbi
-- strict thread matches above, loose matches on Subject: below --
2020-05-21 7:21 Stephen Rothwell
2020-03-16 3:23 Stephen Rothwell
2020-03-16 7:25 ` Greg KH
2020-03-16 8:18 ` Greg KH
2018-05-17 4:03 Stephen Rothwell
2018-05-17 7:07 ` Greg KH
2017-10-18 14:49 Mark Brown
[not found] ` <20171018144912.qlc7vlnhdqmr5tdd-7j8lgAiuQgnQXOPxS62xeg@public.gmane.org>
2017-10-18 15:40 ` Kees Cook
2017-10-18 15:40 ` Kees Cook
2017-10-18 16:04 ` Mark Brown
2017-10-18 14:42 Mark Brown
2017-10-18 15:40 ` Kees Cook
2017-10-19 7:37 ` Felipe Balbi
2017-04-07 4:45 Stephen Rothwell
2017-04-07 4:41 Stephen Rothwell
2014-11-06 3:58 Stephen Rothwell
2014-11-06 4:59 ` Felipe Balbi
2014-11-06 4:59 ` Felipe Balbi
2014-04-28 5:20 Stephen Rothwell
2014-04-28 16:11 ` Felipe Balbi
2014-04-28 16:11 ` Felipe Balbi
2013-04-04 4:18 Stephen Rothwell
2013-04-04 6:27 ` Thierry Reding
2013-04-04 7:08 ` Felipe Balbi
2013-04-04 7:08 ` Felipe Balbi
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=20130802072303.GC24465@radagast \
--to=balbi@ti.com \
--cc=greg@kroah.com \
--cc=jg1.han@samsung.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=ttynkkynen@nvidia.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.