From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758896Ab0GUWPY (ORCPT ); Wed, 21 Jul 2010 18:15:24 -0400 Received: from mail-px0-f174.google.com ([209.85.212.174]:64036 "EHLO mail-px0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751559Ab0GUWPV (ORCPT ); Wed, 21 Jul 2010 18:15:21 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:date:from:to:cc:subject:message-id:reply-to:references :mime-version:content-type:content-disposition:in-reply-to :user-agent; b=ZGFUkuQpdhD2XrRI56BpgjIsZwKK0+qWeU0yYGEVhS9Wxan11qjGU70NuzAUKJxOMH kbLeUshfDJ3bGA4swru2nNYlyaOu+7CPRhmufjZeKIvlWkm+aEZV5cJSuQQrDXCEQfgZ zI/QurSe7rq26PoQCFSe66guWUDnywpVCbU1c= Date: Wed, 21 Jul 2010 15:15:16 -0700 From: mark gross To: Stephen Rothwell Cc: "Rafael J. Wysocki" , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, James Bottomley , mark gross , "John W. Linville" Subject: Re: linux-next: manual merge of the suspend tree with the wireless tree Message-ID: <20100721221516.GC2610@gvim.org> Reply-To: markgross@thegnar.org References: <20100721132006.ff026db8.sfr@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20100721132006.ff026db8.sfr@canb.auug.org.au> User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Jul 21, 2010 at 01:20:06PM +1000, Stephen Rothwell wrote: > Hi Rafael, > > Today's linux-next merge of the suspend tree got a conflict in > drivers/net/wireless/ipw2x00/ipw2100.c between commit > d267be307a3345ef06889511cad2aa1fecc83db7 ("ipw2100: mark > ipw2100_pm_qos_req static") from the wireless tree and commit > 82f682514a5df89ffb3890627eebf0897b7a84ec ("pm_qos: Get rid of the > allocation in pm_qos_add_request()") from the suspend tree. > > I fixed it up (see below) and can carry the fix as necessary. > -- > Cheers, > Stephen Rothwell sfr@canb.auug.org.au > > diff --cc drivers/net/wireless/ipw2x00/ipw2100.c > index 5bbff4c,7f0d98b..0000000 > --- a/drivers/net/wireless/ipw2x00/ipw2100.c > +++ b/drivers/net/wireless/ipw2x00/ipw2100.c > @@@ -174,7 -174,7 +174,7 @@@ that only one external action is invoke > #define DRV_DESCRIPTION "Intel(R) PRO/Wireless 2100 Network Driver" > #define DRV_COPYRIGHT "Copyright(c) 2003-2006 Intel Corporation" > > - static struct pm_qos_request_list *ipw2100_pm_qos_req; > -struct pm_qos_request_list ipw2100_pm_qos_req; > ++static struct pm_qos_request_list ipw2100_pm_qos_req It should be static. Thanks --mgross > > /* Debugging stuff */ > #ifdef CONFIG_IPW2100_DEBUG