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  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]
Date:   Fri, 17 Jul 2020 15:05:34 +0300
From:   Kalle Valo <>
To:     Stephen Rothwell <>
Cc:     Vinod Koul <>,
        Wireless <>,
        Linux Next Mailing List <>,
        Linux Kernel Mailing List <>,
        Ludovic Desroches <>,
        Ajay Singh <>,
        Vladimir Oltean <>,
        "David S. Miller" <>
Subject: Re: linux-next: manual merge of the dmaengine tree with the wireless-drivers-next and Linus' trees

Stephen Rothwell <> writes:

> Today's linux-next merge of the dmaengine tree got a conflict in:
> 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.


Powered by blists - more mailing lists