From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754754AbZGHOQP (ORCPT ); Wed, 8 Jul 2009 10:16:15 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755438AbZGHOQA (ORCPT ); Wed, 8 Jul 2009 10:16:00 -0400 Received: from charlotte.tuxdriver.com ([70.61.120.58]:35990 "EHLO smtp.tuxdriver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755322AbZGHOP7 (ORCPT ); Wed, 8 Jul 2009 10:15:59 -0400 Date: Wed, 8 Jul 2009 10:04:25 -0400 From: "John W. Linville" To: Stephen Rothwell Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, "David S. Miller" Subject: Re: linux-next: manual merge of the wireless tree with the net-current tree Message-ID: <20090708140425.GE4253@tuxdriver.com> References: <20090708124005.ecbf2907.sfr@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20090708124005.ecbf2907.sfr@canb.auug.org.au> User-Agent: Mutt/1.5.18 (2008-05-17) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Jul 08, 2009 at 12:40:05PM +1000, Stephen Rothwell wrote: > Hi John, > > Today's linux-next merge of the wireless tree got a conflict in > drivers/net/wireless/p54/p54common.c between commit > 0ca1b08eba627b4245efd0f71b55a062bf163777 ("Revert "p54: Use SKB list > handling helpers instead of by-hand code."") from the net-current tree > and commit 373234a7c69600397aea39c1452806736df2dfc5 ("p54: Modify p54 > files for new organization") from the wireless tree. > > For today, I just ignored the net-current change. This will need fixing. There is some code reorganization happening in wireless-next-2.6, resulting in a couple of files getting deleted. I'm guessing that if/when Dave pulls net-2.6 into net-next-2.6 (which wireless-next-2.6 gets rebased upon) then this should resolve itself. Hth! John -- John W. Linville Someday the world will need a hero, and you linville@tuxdriver.com might be all we have. Be ready. ¡Viva Honduras Libre!