From: Pawel Laszczak <pawell@cadence.com>
To: Geert Uytterhoeven <geert@linux-m68k.org>,
Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Felipe Balbi <balbi@kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Jayshri Dajiram Pawar <jpawar@cadence.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Rahul Kumar <kurahul@cadence.com>
Subject: RE: linux-next: manual merge of the usb-gadget tree with Linus' tree
Date: Tue, 14 Jan 2020 09:17:57 +0000 [thread overview]
Message-ID: <BYAPR07MB4709EC6AE89CFADC3E9B13FCDD340@BYAPR07MB4709.namprd07.prod.outlook.com> (raw)
In-Reply-To: <CAMuHMdVY2W1=9paE+WpJUHprocOdutRMcNUJenn+jz9A-iv90A@mail.gmail.com>
Hi,
It's looks like the same issue reported by Stephen Rothwell some days ago.
As I know, the first version of patch "usb: cdns3: Add streams support to cadence USB3 DRD driver"
was generated by Jayshri based on Felipe repository
(https://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git/log/?h=next - branch next).
I don't know why, but there is a lack of "usb: cdns3: Fix dequeue implementation.".
It's looks like from some reasons Felipe missed this patch in his next repo.
The latest version "[PATCH v2] usb: cdns3: Add streams support to cadence USB3 DRD driver"
has been created based on top of linux-next.git master branch.
In my opinion Felipe has to revert the 4f1fa63a6dc2 ("usb: cdns3: Add streams support to cadence USB3 DRD driver")
commit then should apply f616c3bda47e ("usb: cdns3: Fix dequeue implementation.") and again apply
new version of "usb: cdns3: Add streams support to cadence USB3 DRD driver" patch .
Regards,
Pawell
>
>Hi Stephen,
>
>On Fri, Jan 10, 2020 at 5:33 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>> Today's linux-next merge of the usb-gadget tree got a conflict in:
>>
>> drivers/usb/cdns3/gadget.c
>>
>> between commit:
>>
>> f616c3bda47e ("usb: cdns3: Fix dequeue implementation.")
>>
>> from Linus' tree and commit:
>>
>> 4f1fa63a6dc2 ("usb: cdns3: Add streams support to cadence USB3 DRD driver")
>>
>> from the usb-gadget tree.
>>
>> I have no idea how to handle this, so I just dropped the usb-gadget tree
>> for today - it clearly needs to be rebased on Linus' tree anyway (it
>> has a few shared patches that are different commits and there are
>> further changes to this file in Linus' tree as well. rebasing onto
>> (or merging with) v5.5-rc6 may be useful.
>
>For today's renesas-drivers, I'm using the attached conflict resolution.
>
>Gr{oetje,eeting}s,
>
> Geert
>
>--
>Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
>
>In personal conversations with technical people, I call myself a hacker. But
>when I'm talking to journalists I just say "programmer" or something like that.
> -- Linus Torvalds
next prev parent reply other threads:[~2020-01-14 9:18 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-10 4:32 Stephen Rothwell
2020-01-14 8:41 ` Geert Uytterhoeven
2020-01-14 9:17 ` Pawel Laszczak [this message]
2020-01-15 3:40 ` Stephen Rothwell
2020-01-15 6:56 ` Felipe Balbi
-- strict thread matches above, loose matches on Subject: below --
2017-06-13 6:11 Stephen Rothwell
2014-09-08 7:13 Stephen Rothwell
2014-09-08 13:28 ` Felipe Balbi
2014-09-08 7:06 Stephen Rothwell
2014-07-17 6:52 Stephen Rothwell
2014-07-17 15:05 ` Felipe Balbi
2013-08-01 5:32 Stephen Rothwell
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=BYAPR07MB4709EC6AE89CFADC3E9B13FCDD340@BYAPR07MB4709.namprd07.prod.outlook.com \
--to=pawell@cadence.com \
--cc=balbi@kernel.org \
--cc=geert@linux-m68k.org \
--cc=gregkh@linuxfoundation.org \
--cc=jpawar@cadence.com \
--cc=kurahul@cadence.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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
all inboxes | Powered by JetHome®