From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>,
David Miller <davem@davemloft.net>,
Networking <netdev@vger.kernel.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Ursula Braun <ubraun@linux.vnet.ibm.com>
Subject: linux-next: build failure after merge of the rcu tree
Date: Thu, 19 Jan 2017 14:34:45 +1100 [thread overview]
Message-ID: <20170119143445.6b65dc8b@canb.auug.org.au> (raw)
Hi Paul,
After merging the rcu tree, today's linux-next build (x86_64 allmodconfig)
failed like this:
net/smc/af_smc.c:102:16: error: 'SLAB_DESTROY_BY_RCU' undeclared here (not in a function)
.slab_flags = SLAB_DESTROY_BY_RCU,
^
Caused by commit
c7a545924ca1 ("mm: Rename SLAB_DESTROY_BY_RCU to SLAB_TYPESAFE_BY_RCU")
interacting with commit
ac7138746e14 ("smc: establish new socket family")
from the net-next tree.
I have applied the following merge fix patch (someone will need to
remember to mention this to Linus):
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 19 Jan 2017 14:29:12 +1100
Subject: [PATCH] smc: merge fix for "mm: Rename SLAB_DESTROY_BY_RCU to SLAB_TYPESAFE_BY_RCU"
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
net/smc/af_smc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/smc/af_smc.c b/net/smc/af_smc.c
index 4875e65f0c4a..a48260f9ebb7 100644
--- a/net/smc/af_smc.c
+++ b/net/smc/af_smc.c
@@ -99,7 +99,7 @@ struct proto smc_proto = {
.unhash = smc_unhash_sk,
.obj_size = sizeof(struct smc_sock),
.h.smc_hash = &smc_v4_hashinfo,
- .slab_flags = SLAB_DESTROY_BY_RCU,
+ .slab_flags = SLAB_TYPESAFE_BY_RCU,
};
EXPORT_SYMBOL_GPL(smc_proto);
--
2.10.2
--
Cheers,
Stephen Rothwell
next reply other threads:[~2017-01-19 3:45 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-19 3:34 Stephen Rothwell [this message]
2017-01-19 21:54 ` linux-next: build failure after merge of the rcu tree Paul McKenney
2017-02-13 2:21 ` Stephen Rothwell
2017-02-13 4:37 ` Paul E. McKenney
2017-02-13 6:43 ` Stephen Rothwell
2017-03-08 1:16 ` Stephen Rothwell
2017-03-08 1:37 ` Paul E. McKenney
2017-03-08 18:05 ` Paul E. McKenney
-- strict thread matches above, loose matches on Subject: below --
2010-09-17 2:42 Stephen Rothwell
2010-09-17 4:39 ` David Miller
2010-09-17 5:34 ` Eric Dumazet
2010-09-17 23:17 ` Paul E. McKenney
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=20170119143445.6b65dc8b@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=paulmck@linux.vnet.ibm.com \
--cc=ubraun@linux.vnet.ibm.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).