Messages in this thread | | | Date | Thu, 16 Jan 2014 12:42:15 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the net-next tree with the uml tree |
| |
Hi all,
Today's linux-next merge of the net-next tree got a conflict in arch/um/include/asm/Kbuild between commit 989e59fa41c5 ("um: Include generic barrier.h") from the uml tree and commit e3fec2f74f7f ("lib: Add missing arch generic-y entries for asm-generic/hash.h") from the net-next 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/um/include/asm/Kbuild index fb3a6cc23015,75de4abe4f94..000000000000 --- a/arch/um/include/asm/Kbuild +++ b/arch/um/include/asm/Kbuild @@@ -4,4 -4,4 +4,5 @@@ generic-y += ftrace.h pci.h io.h param. generic-y += switch_to.h clkdev.h generic-y += trace_clock.h generic-y += preempt.h +generic-y += barrier.h + generic-y += hash.h [unhandled content-type:application/pgp-signature] | |