Re: linux-next: manual merge of the xarray tree with the wireless-drivers-next tree

Johannes Berg
2018-06-28T07:51:09Z

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