lkml.org 
[lkml]   [2014]   [Aug]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
SubjectRe: pull request: wireless-next 2014-08-01
From
From: Marcel Holtmann <marcel@holtmann.org>
Date: Mon, 4 Aug 2014 22:39:47 -0700

> Hi Dave,
>
>>>>> Please pull this last(?) batch of wireless change intended for the
>>>>> 3.17 stream...
>>>>
>>>> When I pull this I get tons of conflicts for:
>>>>
>>>> CONFLICT (content): Merge conflict in net/6lowpan/iphc.c
>>>>
>>>> I don't feel comfortable fixing these up, where are they coming
>>>> from?
>>>
>>> I was short on time yesterday, but now I checked up on this in detail. The merge conflicts are actually simple to resolve. You can just rely on John's tree to have the more recent net/6lowpan/ tree. I should have insisted on merging net/6lowpan/ through bluetooth-next and wireless-next way earlier to avoid conflicts.
>>>
>>> In the future we will avoid this by ensuring that all goes via bluetooth-next first. Sorry for this confusion. John mentioned these merge conflicts in his footnote.
>>>
>>> John, do you just want to resolve the merge conflicts and send Dave a new pull request?
>>
>> I'm happy to do that, if Dave wants. But as you say, once the initial
>> shock of all those conflicts passes the resolution really is fairly
>> simple. :-)
>
> do you want John to just do the merge conflict resolution? They are all trivial.

I am going to try and do it myself, I just haven't gotten around to it.

Thanks for asking.


\
 
 \ /
  Last update: 2014-08-05 08:41    [W:0.215 / U:0.020 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site