linux-kernel - Re: linux-next: manual merge of the dmaengine tree with the wireless-drivers-next and Linus' trees

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] [day] [month] [year] [list]

Date:   Mon, 20 Jul 2020 08:33:12 +0000
From:   <Nicolas.Ferre@...rochip.com>
To:     <kvalo@...eaurora.org>, <sfr@...b.auug.org.au>
CC:     <vkoul@...nel.org>, <linux-wireless@...r.kernel.org>,
        <linux-next@...r.kernel.org>, <linux-kernel@...r.kernel.org>,
        <Ludovic.Desroches@...rochip.com>, <Ajay.Kathat@...rochip.com>,
        <vladimir.oltean@....com>, <davem@...emloft.net>,
        <alexandre.belloni@...tlin.com>
Subject: Re: linux-next: manual merge of the dmaengine tree with the
 wireless-drivers-next and Linus' trees

On 17/07/2020 at 14:05, Kalle Valo wrote:
> EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
> 
> Stephen Rothwell <sfr@...b.auug.org.au> writes:
> 
>> Today's linux-next merge of the dmaengine tree got a conflict in:
>>
>>    MAINTAINERS
>>
>> between commit:
>>
>>    5625f965d764 ("wilc1000: move wilc driver out of staging")
>>
>> from the wireless-drivers-next tree, commit:
>>
>>    6e701c299469 ("MAINTAINERS: merge entries for felix and ocelot drivers")
>>
>> from Linus' tree and commit:
>>
>>    c3846c4cce15 ("MAINTAINERS: dmaengine: Microchip: add Tudor Ambarus
>> as co-maintainer")
>>
>> from the dmaengine tree.
> 
> I think this is trivial enough that Linus can take care of it without
> any extra actions. Thanks for the report.

 From my perspective your resolution Stephen is good.

Thanks to both of you for the heads-up.

Best regards,
   Nicolas

> --
> https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
> 


-- 
Nicolas Ferre