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

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1260 bytes --]

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.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc lib/Kconfig.debug
index f2be7503f87c,df1ea92d924c..000000000000
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@@ -1802,13 -1802,9 +1802,16 @@@ config TEST_BITMA
  
  	  If unsure, say N.
  
 +config TEST_BITFIELD
 +	tristate "Test bitfield functions at runtime"
 +	help
 +	  Enable this option to test the bitfield functions at boot.
 +
 +	  If unsure, say N.
 +
+ config TEST_XARRAY
+ 	tristate "Test the XArray code at runtime"
+ 
  config TEST_UUID
  	tristate "Test functions located in the uuid module at runtime"
  

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[Johannes Berg]

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

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

[Matthew Wilcox]

On Thu, Jun 28, 2018 at 09:51:09AM +0200, Johannes Berg wrote:
> 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.

I don't care which order the tests are presented in.  I'll happily move the
XArray addition to a different location in the file.

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

[Kalle Valo]

Johannes Berg <johannes@sipsolutions.net> 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

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

[Johannes Berg]

On Thu, 2018-06-28 at 01:46 -0700, Matthew Wilcox wrote:
> On Thu, Jun 28, 2018 at 09:51:09AM +0200, Johannes Berg wrote:
> > 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.
> 
> I don't care which order the tests are presented in.  I'll happily move the
> XArray addition to a different location in the file.

Good point, that works.

Thanks!

johannes