From: reinette chatre <reinette.chatre@intel.com>
To: Michal Marek <mmarek@suse.cz>
Cc: "John W. Linville" <linville@tuxdriver.com>,
Sam Ravnborg <sam@ravnborg.org>,
Stephen Rothwell <sfr@canb.auug.org.au>,
David Miller <davem@davemloft.net>,
"netdev@vger.kernel.org" <netdev@vger.kernel.org>,
"linux-next@vger.kernel.org" <linux-next@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: net/kbuild trees build failure
Date: Mon, 07 Dec 2009 14:04:03 -0800 [thread overview]
Message-ID: <1260223443.4653.794.camel@rc-desk> (raw)
In-Reply-To: <4B1D76B1.6070601@suse.cz>
On Mon, 2009-12-07 at 13:42 -0800, Michal Marek wrote:
> It seems there is some misunderstanding.
> The original problem reported by Stephen was that linux/utsrelease.h was
> moved to generated/utsrelease.h in the kbuild tree (that commit also
> patched init/version.c and all other users known at that time). This
> change in kbuild broke the new iwlwifi in the net tree. Stephen attached
> the most obvious fix, i.e. change linux/utsrelease.h to
> generated/utsrelease.h in the iwlwifi source
> (http://lkml.org/lkml/2009/12/7/121). My suggestion was to let Stephen
> carry the fix in linux-next for now, and once one of the trees (kbuild
> or net) hits mainline, the other tree would apply Stephen's patch. Would
> that work for everyone?
I am not involved in the merging part and would thus not be the one
applying Stephen's patch. I would like the iwlwifi patch that uses
UTS_RELEASE as well as Stephen's fix to find it in the right place to go
in though (end up in linux-2.6).
> Now if someone wants to remove the DRV_VERSION macro from iwlwifi or rip
> the UTS_RELEASE part out of it, that would make this problem go away,
> but I don't think it's necessary _just_ because of the kbuild change.
This is perhaps something John and I should discuss separately.
Thank you
Reinette
next prev parent reply other threads:[~2009-12-07 22:04 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-07 9:03 linux-next: net/kbuild trees build failure Stephen Rothwell
2009-12-07 11:41 ` Sam Ravnborg
2009-12-07 12:22 ` Michal Marek
2009-12-07 16:09 ` John W. Linville
2009-12-07 18:12 ` reinette chatre
2009-12-07 21:42 ` Michal Marek
2009-12-07 22:04 ` reinette chatre [this message]
2009-12-07 22:28 ` John W. Linville
2009-12-08 5:38 ` Sam Ravnborg
2009-12-08 14:54 ` John W. Linville
2009-12-08 23:11 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1260223443.4653.794.camel@rc-desk \
--to=reinette.chatre@intel.com \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=mmarek@suse.cz \
--cc=netdev@vger.kernel.org \
--cc=sam@ravnborg.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).