Re: linux-next: build failure after merge of the rcu tree

On Mon, Feb 13, 2017 at 01:21:33PM +1100, Stephen Rothwell wrote:

Hi Paul,

On Thu, 19 Jan 2017 13:54:37 -0800 Paul McKenney [off-list ref] wrote:

quoted

On Wed, Jan 18, 2017 at 7:34 PM, Stephen Rothwell [off-list ref] wrote:

quoted

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):  

Thank you, Stephen!  I expect that there might be a bit more
bikeshedding on the name, but here is hoping...  :-/

The need for this merge fix patch has gone away today.  Is that a
permanent situation, or will it come back?

I chickened out on that commit for this merge window, so it will come
back at -rc1.  But I will cover that when I rebase to -rc1.

							Thanx, Paul