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

[Stephen Rothwell]

Hi all,

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

In file included from drivers/md/persistent-data/dm-space-map-disk.c:14:0:
include/asm-generic/bitops/le.h:52:19: error: conflicting types for 'test_bit_le'
arch/powerpc/include/asm/bitops.h:284:23: note: previous definition of 'test_bit_le' was here
include/asm-generic/bitops/le.h:57:20: error: redefinition of '__set_bit_le'
arch/powerpc/include/asm/bitops.h:291:20: note: previous definition of '__set_bit_le' was here
include/asm-generic/bitops/le.h:62:20: error: redefinition of '__clear_bit_le'
arch/powerpc/include/asm/bitops.h:296:20: note: previous definition of '__clear_bit_le' was here
include/asm-generic/bitops/le.h:67:19: error: redefinition of 'test_and_set_bit_le'
arch/powerpc/include/asm/bitops.h:301:19: note: previous definition of 'test_and_set_bit_le' was here
include/asm-generic/bitops/le.h:72:19: error: redefinition of 'test_and_clear_bit_le'
arch/powerpc/include/asm/bitops.h:306:19: note: previous definition of 'test_and_clear_bit_le' was here
include/asm-generic/bitops/le.h:77:19: error: redefinition of '__test_and_set_bit_le'
arch/powerpc/include/asm/bitops.h:311:19: note: previous definition of '__test_and_set_bit_le' was here
include/asm-generic/bitops/le.h:82:19: error: redefinition of '__test_and_clear_bit_le'
arch/powerpc/include/asm/bitops.h:316:19: note: previous definition of '__test_and_clear_bit_le' was here
In file included from drivers/md/persistent-data/dm-space-map-metadata.c:13:0:
include/asm-generic/bitops/le.h:52:19: error: conflicting types for 'test_bit_le'
arch/powerpc/include/asm/bitops.h:284:23: note: previous definition of 'test_bit_le' was here
include/asm-generic/bitops/le.h:57:20: error: redefinition of '__set_bit_le'
arch/powerpc/include/asm/bitops.h:291:20: note: previous definition of '__set_bit_le' was here
include/asm-generic/bitops/le.h:62:20: error: redefinition of '__clear_bit_le'
arch/powerpc/include/asm/bitops.h:296:20: note: previous definition of '__clear_bit_le' was here
include/asm-generic/bitops/le.h:67:19: error: redefinition of 'test_and_set_bit_le'
arch/powerpc/include/asm/bitops.h:301:19: note: previous definition of 'test_and_set_bit_le' was here
include/asm-generic/bitops/le.h:72:19: error: redefinition of 'test_and_clear_bit_le'
arch/powerpc/include/asm/bitops.h:306:19: note: previous definition of 'test_and_clear_bit_le' was here
include/asm-generic/bitops/le.h:77:19: error: redefinition of '__test_and_set_bit_le'
arch/powerpc/include/asm/bitops.h:311:19: note: previous definition of '__test_and_set_bit_le' was here
include/asm-generic/bitops/le.h:82:19: error: redefinition of '__test_and_clear_bit_le'
arch/powerpc/include/asm/bitops.h:316:19: note: previous definition of '__test_and_clear_bit_le' was here

Casued by commit 3222df7eca25 ("The persistent-data library offers a
re-usable framework for the storage").

I am not quite sure how you should fix this (maybe just include
linux/bitops.h?) so I have left this build error for today.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature