From mboxrd@z Thu Jan 1 00:00:00 1970 From: "John W. Linville" Subject: Re: linux-next: manual merge of the wireless tree with the net tree Date: Thu, 18 Aug 2011 18:03:35 -0700 Message-ID: <20110819010334.GC2487@tuxdriver.com> References: <20110819105946.a46aa8a997f466d8a2e7f2f3@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from charlotte.tuxdriver.com ([70.61.120.58]:40641 "EHLO smtp.tuxdriver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751832Ab1HSPAR (ORCPT ); Fri, 19 Aug 2011 11:00:17 -0400 Content-Disposition: inline In-Reply-To: <20110819105946.a46aa8a997f466d8a2e7f2f3@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Jiri Pirko , David Miller , netdev@vger.kernel.org On Fri, Aug 19, 2011 at 10:59:46AM +1000, Stephen Rothwell wrote: > Hi John, > > Today's linux-next merge of the wireless tree got a conflict in > drivers/staging/ath6kl/os/linux/ar6000_drv.c between commit afc4b13df143 > ("net: remove use of ndo_set_multicast_list in drivers") from the net > tree and commit af2bf4b4ee58 ("staging: remove ath6kl") from the wireless > tree. > > I just removed the file. Cool, thanks. I imagine that any more "bombing runs" that touch ath6kl in staging will be able to resolved in the same fashion. Thanks! John -- John W. Linville Someday the world will need a hero, and you linville@tuxdriver.com might be all we have. Be ready.