Return-path: Received: from senator.holtmann.net ([87.106.208.187]:53435 "EHLO mail.holtmann.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753095AbaHEFje convert rfc822-to-8bit (ORCPT ); Tue, 5 Aug 2014 01:39:34 -0400 Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 7.3 \(1878.6\)) Subject: Re: pull request: wireless-next 2014-08-01 From: Marcel Holtmann In-Reply-To: <20140804145342.GB16658@tuxdriver.com> Date: Mon, 4 Aug 2014 22:39:47 -0700 Cc: "linux-wireless@vger.kernel.org Wireless" , Network Development , LKML Message-Id: (sfid-20140805_073954_121822_5B1AAE9D) References: <20140801165738.GA26953@tuxdriver.com> <20140802.193939.2179004210212543536.davem@davemloft.net> <20140804145342.GB16658@tuxdriver.com> To: "John W. Linville" , "David S. Miller" Sender: linux-wireless-owner@vger.kernel.org List-ID: 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. Regards Marcel