Messages in this thread Patch in this message | | | Date | Wed, 9 Dec 2009 10:33:49 +0100 | From | Michal Marek <> | Subject | Re: [GIT PULL] kbuild updates for 2.6.33 |
| |
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!
Michal
From: Stephen Rothwell <sfr@canb.auug.org.au> Date: Mon, 7 Dec 2009 19:56:42 +1100 Subject: [PATCH] net: fix for utsrelease.h moving to generated
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Michal Marek <mmarek@suse.cz> --- 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 <linux/utsrelease.h> +#include <generated/utsrelease.h> /************************ * forward declarations *
| |