From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "John W. Linville" <linville@tuxdriver.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: linux-next: build failure after merge of the wireless-next tree
Date: Wed, 26 Feb 2014 07:47:38 +1100 [thread overview]
Message-ID: <20140226074738.0b530aebe4cde54216698d91@canb.auug.org.au> (raw)
In-Reply-To: <20140225190715.GA4384@tuxdriver.com>
[-- Attachment #1: Type: text/plain, Size: 1672 bytes --]
Hi John,
On Tue, 25 Feb 2014 14:07:16 -0500 "John W. Linville" <linville@tuxdriver.com> wrote:
>
> On Tue, Feb 25, 2014 at 01:35:37PM +1100, Stephen Rothwell wrote:
> > Hi John,
> >
> > After merging the wireless-next tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> >
> > drivers/staging/rtl8821ae/rc.c:289:2: error: unknown field 'module' specified in initializer
> > .module = NULL,
> > ^
> >
> > Caused by commit 161d78555435 ("Revert "Staging: rtl8812ae: remove
> > modules field of rate_control_ops"").
> >
> > The commit "Staging: rtl8812ae: remove modules field of rate_control_ops"
> > was needed in the wireless-next tree - I said so at the time of reporting
> > the original breakage:
> >
> > > Actually, your tree is based on -rc2, so you need this patch already (it
> > > should have bee included in the merge commit 841577c3d33b ("Merge branch
> > > 'for-john' of
> > > git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next").
> >
> > And now that part of the wireless-next tree has migrated to the net-next tree.
> >
> > I have no idea why you thought you should revert the fix.
> >
> > I have used the wireless tree from next-20140224 for today.
>
> The fix should go through Greg's tree. I shouldn't have merged it at all.
No, the fix was only required in your tree (since it was a patch in your
tree that caused the breakage). And that fix is now in Dave's tree, so
reverting it in your tree just rebreaks stuff in your tree (and in Dave's
tree if your tree is merged by Dave again).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next prev parent reply other threads:[~2014-02-25 20:47 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-25 2:35 linux-next: build failure after merge of the wireless-next tree Stephen Rothwell
2014-02-25 19:07 ` John W. Linville
2014-02-25 20:47 ` Stephen Rothwell [this message]
2014-03-04 23:16 ` Stephen Rothwell
2014-03-04 23:21 ` Stephen Rothwell
2014-03-04 23:49 ` Greg KH
-- strict thread matches above, loose matches on Subject: below --
2014-09-08 8:42 Stephen Rothwell
2014-09-09 23:28 ` Stephen Rothwell
2014-09-09 23:37 ` David Miller
2014-09-10 17:46 ` John W. Linville
2014-07-16 3:28 Stephen Rothwell
2014-07-16 14:09 ` John W. Linville
2014-04-23 3:47 Stephen Rothwell
2014-04-23 20:54 ` Bing Zhao
2014-03-06 2:43 Stephen Rothwell
2014-03-06 8:53 ` Arend van Spriel
2014-03-06 2:24 Stephen Rothwell
2014-02-13 2:19 Stephen Rothwell
2014-02-13 2:22 ` Stephen Rothwell
2014-02-13 17:31 ` Paul Gortmaker
2014-02-13 18:22 ` Paul Gortmaker
2014-02-13 18:28 ` Greg KH
2013-07-23 1:32 Stephen Rothwell
2013-07-23 7:24 ` Hauke Mehrtens
2013-04-02 2:34 Stephen Rothwell
2013-04-02 3:07 ` Larry Finger
2013-04-02 3:31 ` Stephen Rothwell
2013-04-02 4:07 ` Larry Finger
2012-04-12 2:24 Stephen Rothwell
2011-12-20 2:18 Stephen Rothwell
2011-12-20 2:42 ` Luis R. Rodriguez
2011-12-20 2:57 ` Stephen Rothwell
2011-12-20 3:24 ` Luis R. Rodriguez
2011-11-22 3:35 Stephen Rothwell
2011-11-22 8:03 ` Stanislaw Gruszka
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=20140226074738.0b530aebe4cde54216698d91@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linville@tuxdriver.com \
/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).