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] [day] [month] [year] [list]
Date:   Fri, 16 Oct 2020 09:01:00 +0300
From:   Kalle Valo <>
To:     Stephen Rothwell <>
Cc:     Wireless <>,
        David Miller <>,
        Networking <>,
        Ido Schimmel <>,
        Jakub Kicinski <>,
        Linux Kernel Mailing List <>,
        Linux Next Mailing List <>,
        Michael Jeanson <>
Subject: Re: linux-next: manual merge of the wireless-drivers tree with the net tree

Stephen Rothwell <> writes:

> Hi all,
> Today's linux-next merge of the wireless-drivers tree got a conflict in:
>   tools/testing/selftests/net/Makefile
> between commit:
>   1a01727676a8 ("selftests: Add VRF route leaking tests")
> from the net tree and commit:
>   b7cc6d3c5c91 ("selftests: net: Add drop monitor test")
> from the wireless-drivers (presumably because it has merged part of the
> net-next tree) tree.

Correct, I fast forwarded wireless-drivers from net-next to prepare for
sending bug fixes in the end of the merge window. But I didn't realise
that it might break linux-next build, so wireless-drivers should always
follow net tree and not net-next. Sorry about that.


Powered by blists - more mailing lists