linux-kernel - RE: linux-next: manual merge of the usb-gadget tree with Linus' tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <BYAPR07MB4709EC6AE89CFADC3E9B13FCDD340@BYAPR07MB4709.namprd07.prod.outlook.com>
Date:   Tue, 14 Jan 2020 09:17:57 +0000
From:   Pawel Laszczak <pawell@...ence.com>
To:     Geert Uytterhoeven <geert@...ux-m68k.org>,
        Stephen Rothwell <sfr@...b.auug.org.au>
CC:     Felipe Balbi <balbi@...nel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Jayshri Dajiram Pawar <jpawar@...ence.com>,
        Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
        Rahul Kumar <kurahul@...ence.com>
Subject: RE: linux-next: manual merge of the usb-gadget tree with Linus' tree

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@...b.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@...ux-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