From: Thierry Reding <thierry.reding@gmail.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Felipe Balbi <balbi@kernel.org>,
linux-usb@vger.kernel.org, linux-tegra@vger.kernel.org
Subject: Re: [GIT PULL] usb: tegra: Changes for v5.7-rc1
Date: Thu, 19 Mar 2020 00:20:22 +0100 [thread overview]
Message-ID: <20200318232022.GB2885069@ulmo> (raw)
In-Reply-To: <20200317185835.GC1480055@kroah.com>
[-- Attachment #1: Type: text/plain, Size: 1291 bytes --]
On Tue, Mar 17, 2020 at 07:58:35PM +0100, Greg Kroah-Hartman wrote:
> On Fri, Mar 13, 2020 at 06:07:30PM +0100, Thierry Reding wrote:
> > Hi Greg, Felipe,
> >
> > The following changes since commit bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9:
> >
> > Linux 5.6-rc1 (2020-02-09 16:08:48 -0800)
> >
> > are available in the Git repository at:
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tags/for-5.7-usb
> >
> > for you to fetch changes up to 9dd4fbef2f88ccf46f5294805bf121d6554791e8:
> >
> > usb: gadget: tegra-xudc: Support multiple device modes (2020-03-13 17:16:28 +0100)
> >
> > It occurred to me that I could just as well send this pull request to
> > you guys, rather than take it via ARM SoC. Kishon already acked all the
> > patches for the PHY tree that this series depends on, so I've included
> > them here as a dependency.
> >
> > Let me know if you'd prefer that I take this through ARM SoC.
>
> I tried to merge this into my usb-next branch, but get merge issues in
> drivers/usb/gadget/udc/tegra-xudc.c that I really don't know how to
> resolve.
>
> Can you give me a clue as to what to do here?
Let me rebase this on top of your usb-next branch and resend this PR
after resolving the conflict.
Thierry
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next prev parent reply other threads:[~2020-03-18 23:20 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-13 17:07 [GIT PULL] usb: tegra: Changes for v5.7-rc1 Thierry Reding
2020-03-17 18:58 ` Greg Kroah-Hartman
2020-03-18 23:20 ` Thierry Reding [this message]
2020-03-19 14:34 ` [GIT PULL v2] " Thierry Reding
2020-03-19 15:02 ` Greg Kroah-Hartman
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=20200318232022.GB2885069@ulmo \
--to=thierry.reding@gmail.com \
--cc=balbi@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-tegra@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
/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).