netdev - Re: pull request: wireless-next 2014-08-01

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20140804145342.GB16658@tuxdriver.com>
Date:	Mon, 4 Aug 2014 10:53:43 -0400
From:	"John W. Linville" <linville@...driver.com>
To:	Marcel Holtmann <marcel@...tmann.org>
Cc:	"David S. Miller" <davem@...emloft.net>,
	"linux-wireless@...r.kernel.org Wireless" 
	<linux-wireless@...r.kernel.org>,
	Network Development <netdev@...r.kernel.org>,
	linux-kernel@...r.kernel.org
Subject: Re: pull request: wireless-next 2014-08-01

On Sun, Aug 03, 2014 at 10:37:16AM -0700, Marcel Holtmann wrote:
> 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. :-)

John
-- 
John W. Linville		Someday the world will need a hero, and you
linville@...driver.com			might be all we have.  Be ready.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html