From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753344AbZLIRcN (ORCPT ); Wed, 9 Dec 2009 12:32:13 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1750913AbZLIRcM (ORCPT ); Wed, 9 Dec 2009 12:32:12 -0500 Received: from rcsinet12.oracle.com ([148.87.113.124]:23276 "EHLO rcsinet12.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750804AbZLIRcL (ORCPT ); Wed, 9 Dec 2009 12:32:11 -0500 Date: Wed, 9 Dec 2009 09:31:08 -0800 From: Randy Dunlap To: Michal Marek Cc: Linus Torvalds , linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, Stephen Rothwell Subject: Re: [GIT PULL] kbuild updates for 2.6.33 Message-Id: <20091209093108.387b2736.randy.dunlap@oracle.com> In-Reply-To: <20091209093349.GA11837@sepie.suse.cz> References: <20091208133004.GA22750@sepie.suse.cz> <20091209093349.GA11837@sepie.suse.cz> Organization: Oracle Linux Eng. X-Mailer: Sylpheed 2.7.1 (GTK+ 2.12.0; x86_64-unknown-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Auth-Type: Internal IP X-Source-IP: acsinet15.oracle.com [141.146.126.227] X-CT-RefId: str=0001.0A090203.4B1FDEE3.00FB:SCFMA922111,ss=1,fgs=0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 9 Dec 2009 10:33:49 +0100 Michal Marek wrote: > On Tue, Dec 08, 2009 at 02:30:04PM +0100, Michal Marek wrote: > > Hi Linus, > > > > these are the kbuild patches I collected for 2.6.33. There might be a few > > more later, but this is the main part. > > > > Thanks, > > Michal > > > > The following changes since commit 6ec22f9b037fc0c2e00ddb7023fad279c365324d: > > Linus Torvalds (1): > > Merge branch 'x86-debug-for-linus' of git://git.kernel.org/.../tip/linux-2.6-tip > > > > are available in the git repository at: > > > > git://repo.or.cz/linux-kbuild.git for-next > > Hi Linus, > > The kbuild tree now breaks with 250cce26 ("iwlwifi: driver version > track kernel version") which you merged yesterday. Stephen Rothwell > kindly provided a fix, which I would normally apply to the kbuild tree, > but I don't want to rebase it as I already sent the pull request. Could > you please apply the following one-liner when merging the kbuild tree? > Thanks! Hi > Michal, Is there anything that tells us when we should/must use ? Thanks. > From: Stephen Rothwell > Date: Mon, 7 Dec 2009 19:56:42 +1100 > Subject: [PATCH] net: fix for utsrelease.h moving to generated > > Signed-off-by: Stephen Rothwell > Signed-off-by: Michal Marek > --- > drivers/net/wireless/iwlwifi/iwl-core.h | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/drivers/net/wireless/iwlwifi/iwl-core.h b/drivers/net/wireless/iwlwifi/iwl-core.h > index 675b7df..27ca859 100644 > --- a/drivers/net/wireless/iwlwifi/iwl-core.h > +++ b/drivers/net/wireless/iwlwifi/iwl-core.h > @@ -63,7 +63,7 @@ > #ifndef __iwl_core_h__ > #define __iwl_core_h__ > > -#include > +#include > > /************************ > * forward declarations * > -- --- ~Randy