From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752101AbdASD6s (ORCPT ); Wed, 18 Jan 2017 22:58:48 -0500 Received: from ozlabs.org ([103.22.144.67]:47819 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751971AbdASD6r (ORCPT ); Wed, 18 Jan 2017 22:58:47 -0500 Date: Thu, 19 Jan 2017 14:34:45 +1100 From: Stephen Rothwell To: "Paul E. McKenney" , David Miller , Networking Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Ursula Braun Subject: linux-next: build failure after merge of the rcu tree Message-ID: <20170119143445.6b65dc8b@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 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 --- 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