linux-next: build failure after merge of the final tree (powerpc tree related)

Hi all,

After merging the final tree, today's linux-next build (powerpc allyesconfig)
failed like this:

In file included from drivers/atm/fore200e.c:70:0:
drivers/atm/fore200e.h:263:3: error: redefinition of typedef 'opcode_t' with different type
arch/powerpc/include/asm/probes.h:25:13: note: previous declaration of 'opcode_t' was here

Caused by commit 7118e7e648e0 ("powerpc: Consolidate {k,u}probe
definitions") from the powerpc tree.

I have reverted that commit (and the two following:
41ab5266c362	"powerpc: Add trap_nr to thread_struct"
8b7b80b9ebb4	"powerpc: Uprobes port to powerpc")
for today.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au