Messages in this thread | | | Date | Mon, 20 Jul 2015 10:01:44 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the cris tree with Linus' tree |
| |
Hi Jesper,
Today's linux-next merge of the cris tree got a conflict in:
arch/cris/include/asm/Kbuild
between commits:
c546d5db75b4 ("remove scatterlist.h generation from arch Kbuild files") f2abeef9fd6f ("mm: clean up per architecture MM hook header files")
from Linus' tree and commit:
d0529229a92c ("CRIS: UAPI: use generic headers via Kbuild")
from the cris 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/cris/include/asm/Kbuild index ad2244f35bca,2fc4331a69ca..000000000000 --- a/arch/cris/include/asm/Kbuild +++ b/arch/cris/include/asm/Kbuild @@@ -18,12 -24,23 +24,23 @@@ generic-y += linkage. generic-y += local.h generic-y += local64.h generic-y += mcs_spinlock.h + generic-y += mman.h +generic-y += mm-arch-hooks.h generic-y += module.h + generic-y += msgbuf.h generic-y += percpu.h + generic-y += poll.h generic-y += preempt.h + generic-y += resource.h -generic-y += scatterlist.h generic-y += sections.h + generic-y += sembuf.h + generic-y += shmbuf.h + generic-y += siginfo.h + generic-y += socket.h + generic-y += sockios.h + generic-y += statfs.h generic-y += topology.h generic-y += trace_clock.h + generic-y += types.h generic-y += vga.h generic-y += xor.h
| |