From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kalle Valo Subject: Re: linux-next: manual merge of the xarray tree with the wireless-drivers-next tree Date: Thu, 28 Jun 2018 11:51:40 +0300 Message-ID: <87in63s38j.fsf@kamboji.qca.qualcomm.com> References: <20180628145900.4ca1e648@canb.auug.org.au> <1530172269.4988.1.camel@sipsolutions.net> Mime-Version: 1.0 Content-Type: text/plain Return-path: In-Reply-To: <1530172269.4988.1.camel@sipsolutions.net> (Johannes Berg's message of "Thu, 28 Jun 2018 09:51:09 +0200") Sender: linux-kernel-owner@vger.kernel.org To: Johannes Berg Cc: Stephen Rothwell , Matthew Wilcox , Wireless , Linux-Next Mailing List , Linux Kernel Mailing List List-Id: linux-next.vger.kernel.org Johannes Berg writes: > 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. Yeah, I would assume this is business as usual for Linus and we don't need to do anything. But please do let me know if that's not the case. -- Kalle Valo