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,
Greg KH <greg@kroah.com>, Johannes Berg <johannes.berg@intel.com>
Subject: linux-next: build failure after merge of the wireless-next tree
Date: Thu, 13 Feb 2014 13:19:23 +1100 [thread overview]
Message-ID: <20140213131923.4a0b79959e0b27399c021aa7@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1466 bytes --]
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 cc01f9b55fe7 ("mac80211: remove module handling from
rate control ops") interacting with commit 3c05bedb5fef ("Staging:
rtl8812ae: Add Realtek 8821 PCI WIFI driver") which entered Linus' tree
before v3.14-rc1.
I added this merge fix patch and can carry it as necessary (John, if you
back merge v3.14-rc1, you should include this patch in the merge commit):
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 13 Feb 2014 13:14:13 +1100
Subject: [PATCH] Staging: rtl8812ae: remove modules field of rate_control_ops
This has been removed in further work.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/staging/rtl8821ae/rc.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/staging/rtl8821ae/rc.c b/drivers/staging/rtl8821ae/rc.c
index d387f13ea7dc..0cc32c60ddee 100644
--- a/drivers/staging/rtl8821ae/rc.c
+++ b/drivers/staging/rtl8821ae/rc.c
@@ -286,7 +286,6 @@ static void rtl_rate_free_sta(void *rtlpriv,
}
static struct rate_control_ops rtl_rate_ops = {
- .module = NULL,
.name = "rtl_rc",
.alloc = rtl_rate_alloc,
.free = rtl_rate_free,
--
1.9.rc1
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2014-02-13 2:19 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-13 2:19 Stephen Rothwell [this message]
2014-02-13 2:22 ` linux-next: build failure after merge of the wireless-next tree Stephen Rothwell
2014-02-13 17:31 ` Paul Gortmaker
2014-02-13 18:22 ` Paul Gortmaker
2014-02-13 18:28 ` 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-25 2:35 Stephen Rothwell
2014-02-25 19:07 ` John W. Linville
2014-02-25 20:47 ` Stephen Rothwell
2014-03-04 23:16 ` Stephen Rothwell
2014-03-04 23:21 ` Stephen Rothwell
2014-03-04 23:49 ` 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=20140213131923.4a0b79959e0b27399c021aa7@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=greg@kroah.com \
--cc=johannes.berg@intel.com \
--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).