From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755315AbZEVApn (ORCPT ); Thu, 21 May 2009 20:45:43 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755027AbZEVAp0 (ORCPT ); Thu, 21 May 2009 20:45:26 -0400 Received: from charlotte.tuxdriver.com ([70.61.120.58]:36870 "EHLO smtp.tuxdriver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753892AbZEVApY (ORCPT ); Thu, 21 May 2009 20:45:24 -0400 Date: Thu, 21 May 2009 20:35:47 -0400 From: "John W. Linville" To: David Miller Cc: sfr@canb.auug.org.au, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, abhijeet.kolekar@intel.com, reinette.chatre@intel.com Subject: Re: linux-next: manual merge of the net tree with the tree Message-ID: <20090522003546.GB2646@tuxdriver.com> References: <20090521140610.551574fc.sfr@canb.auug.org.au> <20090521.152511.171736740.davem@davemloft.net> <20090521.152910.256913910.davem@davemloft.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20090521.152910.256913910.davem@davemloft.net> 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 Thu, May 21, 2009 at 03:29:10PM -0700, David Miller wrote: > From: David Miller > Date: Thu, 21 May 2009 15:25:11 -0700 (PDT) > > > From: Stephen Rothwell > > Date: Thu, 21 May 2009 14:06:10 +1000 > > > >> Today's linux-next merge of the net tree got a conflict in > >> drivers/net/wireless/iwlwifi/iwl-agn.c > >> drivers/net/wireless/iwlwifi/iwl3945-base.c between commit > >> fbc9f97bbf5e1eaee562eba93dc60faaff3f3bfa ("iwlwifi: do not cancel delayed > >> work inside spin_lock_irqsave") from the wireless-current tree and commit > >> 727882d62477ed45d248e8cd6d53cf794537b073 ("iwl3945: use iwl_set_mode in > >> 3945") from the net tree. > >> > >> I removed iwl{3945,}_set_mode() from and applied the following patch. > > > > I'll sort this out right now, thanks Stephen. > > Sorry, I misread this. The conflict is created by the > wireless-current tree so it seems something John has to > sort out unless I've pulled that work into net-next-2.6 already. > > John which is it? I think what Stephen has done is good for now. I'll probably post a pull request for wireless-next-2.6 tommorrow. John -- John W. Linville Someday the world will need a hero, and you linville@tuxdriver.com might be all we have. Be ready.