Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936977AbZLHXL2 (ORCPT ); Tue, 8 Dec 2009 18:11:28 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S936856AbZLHXLX (ORCPT ); Tue, 8 Dec 2009 18:11:23 -0500 Received: from chilli.pcug.org.au ([203.10.76.44]:47070 "EHLO smtps.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935888AbZLHXLW (ORCPT ); Tue, 8 Dec 2009 18:11:22 -0500 Date: Wed, 9 Dec 2009 10:11:26 +1100 From: Stephen Rothwell To: David Miller , , Michal Marek Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Reinette Chatre , "John W. Linville" , Sam Ravnborg Subject: Re: linux-next: net/kbuild trees build failure Message-Id: <20091209101126.35bf0fd3.sfr@canb.auug.org.au> In-Reply-To: <20091207200317.57820f0a.sfr@canb.auug.org.au> References: <20091207200317.57820f0a.sfr@canb.auug.org.au> X-Mailer: Sylpheed 3.0.0beta3 (GTK+ 2.18.4; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2051 Lines: 57 Hi Michal, On Mon, 7 Dec 2009 20:03:17 +1100 Stephen Rothwell wrote: > > Today's linux-next build (powerpc allyesconfig) failed like this: > > In file included from drivers/net/wireless/iwlwifi/iwl3945-base.c:57: > drivers/net/wireless/iwlwifi/iwl-core.h:66:30: error: linux/utsrelease.h: No such file or directory > > Caused by commit 250cce26d5d03337aec4ff8405121f026adb4a89 ("iwlwifi: > driver version track kernel version") from the net tree interacting with > commit 8e5c76aace9705b6983cfbf5eb2f2e869dab6738 ("kbuild: move > utsrelease.h to include/generated") from the kbuild tree. > > I applied this patch for today (and will carry it as necessary): With the merge of the net tree into Linus' tree today, this patch (or something else) is needed in the kbuild tree to avoid the above build failure. I have reproduced the patch below in case you want to use it. I will be applying it as a merge fix to the merge of the kbuild tree today. 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 --- 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 * -- 1.6.5.3 -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/