Hi Ralf, The linux-next merge of the mips tree gets conflicts between several commits from Linus' tree and (basically) the same commits from the mips tree. I have been getting these for some time. The mips tree for linux-next hasn't been updated since June 6 and doing a manula merge with Linus' tree (or rebasing it on top of Linus' tree) would fix most of these conflicts: $ git merge mips Auto-merging arch/mips/Kconfig Auto-merging arch/mips/cavium-octeon/dma-octeon.c CONFLICT (content): Merge conflict in arch/mips/cavium-octeon/dma-octeon.c Auto-merging arch/mips/cavium-octeon/executive/cvmx-helper-errata.c CONFLICT (add/add): Merge conflict in arch/mips/cavium-octeon/executive/cvmx-helper-errata.c Auto-merging arch/mips/cavium-octeon/octeon-irq.c Auto-merging arch/mips/include/asm/cpu-features.h Auto-merging arch/mips/include/asm/mach-cavium-octeon/cpu-feature-overrides.h Auto-merging arch/mips/mm/c-r4k.c Auto-merging arch/mips/mm/tlbex.c CONFLICT (content): Merge conflict in arch/mips/mm/tlbex.c Auto-merging arch/mips/sibyte/Kconfig Auto-merging arch/mips/sibyte/swarm/setup.c CONFLICT (content): Merge conflict in arch/mips/sibyte/swarm/setup.c Auto-merging arch/mips/txx9/generic/setup.c Auto-merging arch/mips/txx9/rbtx4939/setup.c Auto-merging drivers/char/hw_random/Kconfig CONFLICT (content): Merge conflict in drivers/char/hw_random/Kconfig Auto-merging drivers/char/hw_random/Makefile CONFLICT (content): Merge conflict in drivers/char/hw_random/Makefile Auto-merging drivers/dma/Kconfig Auto-merging drivers/dma/Makefile Auto-merging drivers/dma/txx9dmac.c CONFLICT (add/add): Merge conflict in drivers/dma/txx9dmac.c Automatic merge failed; fix conflicts and then commit the result. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx http://www.canb.auug.org.au/~sfr/
Attachment:
pgpiLWwEZAkkY.pgp
Description: PGP signature
