linux-usb.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Peter Chen <peter.chen@nxp.com>
To: Roger Quadros <rogerq@ti.com>, "balbi@kernel.org" <balbi@kernel.org>
Cc: "linux-usb@vger.kernel.org" <linux-usb@vger.kernel.org>,
	dl-linux-imx <linux-imx@nxp.com>,
	"pawell@cadence.com" <pawell@cadence.com>,
	"gregkh@linuxfoundation.org" <gregkh@linuxfoundation.org>,
	Jun Li <jun.li@nxp.com>
Subject: RE: [PATCH 1/4] usb: cdns3: core: get role switch node from firmware
Date: Thu, 2 Apr 2020 09:37:28 +0000	[thread overview]
Message-ID: <AM7PR04MB7157ABD50D68ACEB669FF2C08BC60@AM7PR04MB7157.eurprd04.prod.outlook.com> (raw)
In-Reply-To: <1b745ded-b0b2-1c4b-3052-41aaccad8a9c@ti.com>

> >>
> >
> > Hi Roger,
> >
> > I use 5.6-rc4.  Which conflict you have met? Do you have below patch?
> >
> > 8708a9fa2938 usb: roles: Provide the switch drivers handle to the
> > switch in the API
> 
> Applying: usb: cdns3: core: get role switch node from firmware
> error: patch failed: drivers/usb/cdns3/core.c:528
> error: drivers/usb/cdns3/core.c: patch does not apply Patch failed at 0001 usb:
> cdns3: core: get role switch node from firmware Use 'git am --show-current-patch'
> to see the failed patch When you have resolved this problem, run "git am --
> continue".
> If you prefer to skip this patch, run "git am --skip" instead.
> To restore the original branch and stop patching, run "git am --abort".
> 
 
I just tried the latest Greg's usb-next, it could apply. Do you have the patch I mentioned?
What's the conflict in source file?

Peter 

  reply	other threads:[~2020-04-02  9:37 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-31  8:10 [PATCH 1/4] usb: cdns3: core: get role switch node from firmware Peter Chen
2020-03-31  8:10 ` [PATCH 2/4] usb: cdns3: delete role_override Peter Chen
2020-03-31  8:10 ` [PATCH 3/4] usb: cdns3: change "cdsn3" to"cdns3" Peter Chen
2020-03-31  8:10 ` [PATCH 4/4] usb: cdns3: change dev_info to dev_dbg for debug message Peter Chen
2020-04-02  8:53 ` [PATCH 1/4] usb: cdns3: core: get role switch node from firmware Roger Quadros
2020-04-02  9:24   ` Peter Chen
2020-04-02  9:26     ` Roger Quadros
2020-04-02  9:37       ` Peter Chen [this message]
2020-04-02  9:45         ` Roger Quadros
2020-04-02 11:49 ` Roger Quadros

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=AM7PR04MB7157ABD50D68ACEB669FF2C08BC60@AM7PR04MB7157.eurprd04.prod.outlook.com \
    --to=peter.chen@nxp.com \
    --cc=balbi@kernel.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=jun.li@nxp.com \
    --cc=linux-imx@nxp.com \
    --cc=linux-usb@vger.kernel.org \
    --cc=pawell@cadence.com \
    --cc=rogerq@ti.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 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).