From: Marcel Holtmann <mar...@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. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
