linux-kernel - Re: linux-next: manual merge of the xarray tree with the wireless-drivers-next 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: <1530172269.4988.1.camel@sipsolutions.net>
Date:   Thu, 28 Jun 2018 09:51:09 +0200
From:   Johannes Berg <johannes@...solutions.net>
To:     Stephen Rothwell <sfr@...b.auug.org.au>,
        Matthew Wilcox <willy@...radead.org>,
        Kalle Valo <kvalo@...eaurora.org>,
        Wireless <linux-wireless@...r.kernel.org>
Cc:     Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: Re: linux-next: manual merge of the xarray tree with the
 wireless-drivers-next tree

On Thu, 2018-06-28 at 14:59 +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the xarray tree got a conflict in:
> 
>   lib/Kconfig.debug
> 
> between commit:
> 
>   0e2dc70e3d0d ("bitfield: add tests")
> 
> from the wireless-drivers-next tree and commit:
> 
>   d968f529e39f ("xarray: Add XArray load operation")
> 
> from the xarray tree.

Thanks for the heads-up! Not really sure where/how we'll be able to get
that resolved before it hits Linus, but as the conflict seems rather
easy (overlapping additions), I guess it's not such a big deal.

johannes