linux-next: build failure after merge of the v4l-dvb tree

From: Stephen Rothwell
Date: Mon Jul 14 2014 - 23:30:17 EST

Hi Mauro,

After merging the v4l-dvb tree, today's linux-next build (powerpc ppc64_defconfig)
failed like this:

arch/powerpc/kernel/smp.c:764:2: error: initialization from incompatible pointer type [-Werror]
{ cpu_smt_mask, powerpc_smt_flags, SD_INIT_NAME(SMT) },
arch/powerpc/kernel/smp.c:764:2: error: (near initialization for 'powerpc_topology[0].sd_flags') [-Werror]

Caused by commit 6a0b50087a89 ("Merge branch 'patchwork' into
to_next"). The change to include/linux/sched.h in this merge commit
does not seem to appear in either of the parents of the merge.

Its also a change that (when suggested) was shown to cause more
problems than it was worth and dropped. I can't imagine how it ended
up in the merge commit.

I have used the v4l-dvb tree from next-20140714 for today. Please fix
this up.
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

Attachment: signature.asc
Description: PGP signature