Messages in this thread | | | Date | Mon, 2 Jun 2014 18:42:38 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the akpm-current tree with the arm tree |
| |
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in arch/arm/include/asm/Kbuild between commit 8a87411b649c ("ARM: 8047/1: rwsem: use asm-generic rwsem implementation") from the arm tree and commit bca74b3faf68 ("lib/scatterlist: make ARCH_HAS_SG_CHAIN an actual Kconfig") from the akpm-current tree.
I fixed it up (see below) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/include/asm/Kbuild index f5a357601983,2d95820276fd..000000000000 --- a/arch/arm/include/asm/Kbuild +++ b/arch/arm/include/asm/Kbuild @@@ -21,7 -21,7 +21,8 @@@ generic-y += parport. generic-y += poll.h generic-y += preempt.h generic-y += resource.h +generic-y += rwsem.h + generic-y += scatterlist.h generic-y += sections.h generic-y += segment.h generic-y += sembuf.h [unhandled content-type:application/pgp-signature] | |