linux-next: manual merge of the tip tree with the mips tree

2017-09-03 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the tip tree got a conflict in: drivers/irqchip/irq-mips-gic.c between commit: ac04be51a650 ("irqchip: mips-gic: Remove gic_map_to_vpe()") b6e583e41993 ("irqchip: mips-gic: Make pcpu_masks a per-cpu variable") 6ab4fb2810db ("irqchip: mips-gic: Use

linux-next: manual merge of the tip tree with the mips tree

2017-09-03 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the tip tree got a conflict in: drivers/irqchip/irq-mips-gic.c between commit: ac04be51a650 ("irqchip: mips-gic: Remove gic_map_to_vpe()") b6e583e41993 ("irqchip: mips-gic: Make pcpu_masks a per-cpu variable") 6ab4fb2810db ("irqchip: mips-gic: Use

linux-next: manual merge of the tip tree with the mips tree

2016-03-13 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the tip tree got a conflict in: arch/mips/Kconfig between commit: 7a50e4688dab ("MIPS: Fix build error when SMP is used without GIC") from the mips tree and commit: 7eb8c99db26c ("MIPS: Delete smp-gic.c") from the tip tree. I fixed it up (I used

linux-next: manual merge of the tip tree with the mips tree

2016-03-13 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the tip tree got a conflict in: arch/mips/Kconfig between commit: 7a50e4688dab ("MIPS: Fix build error when SMP is used without GIC") from the mips tree and commit: 7eb8c99db26c ("MIPS: Delete smp-gic.c") from the tip tree. I fixed it up (I used

Re: linux-next: manual merge of the tip tree with the mips tree

2015-04-17 Thread Jiri Olsa
On Mon, Apr 13, 2015 at 03:59:13PM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the tip tree got a conflict in > tools/perf/config/Makefile between commit 4fd6ce055817 ("perf tools: > Hook up MIPS unwind and dwarf-regs in the Makefile") from the mips tree hi, I

Re: linux-next: manual merge of the tip tree with the mips tree

2015-04-17 Thread Jiri Olsa
On Mon, Apr 13, 2015 at 03:59:13PM +1000, Stephen Rothwell wrote: Hi all, Today's linux-next merge of the tip tree got a conflict in tools/perf/config/Makefile between commit 4fd6ce055817 (perf tools: Hook up MIPS unwind and dwarf-regs in the Makefile) from the mips tree hi, I remember

linux-next: manual merge of the tip tree with the mips tree

2015-04-13 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the tip tree got a conflict in tools/perf/config/Makefile between commit 4fd6ce055817 ("perf tools: Hook up MIPS unwind and dwarf-regs in the Makefile") from the mips tree and commit 3bc3374cc50c ("perf build: Add perf regs objects building") from the tip tree.

linux-next: manual merge of the tip tree with the mips tree

2015-04-13 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the tip tree got a conflict in tools/perf/config/Makefile between commit 4fd6ce055817 (perf tools: Hook up MIPS unwind and dwarf-regs in the Makefile) from the mips tree and commit 3bc3374cc50c (perf build: Add perf regs objects building) from the tip tree. I

linux-next: manual merge of the tip tree with the mips tree

2014-10-08 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the tip tree got a conflict in arch/arm64/include/asm/Kbuild between commit 2f06dbe4e4fc ("arm64: use generic dma-contiguous.h") from the mips tree and commit c5c38ef3d703 ("irq_work: Introduce arch_irq_work_has_interrupt()") from the tip tree. I fixed it up

linux-next: manual merge of the tip tree with the mips tree

2014-10-08 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the tip tree got a conflict in arch/arm64/include/asm/Kbuild between commit 2f06dbe4e4fc (arm64: use generic dma-contiguous.h) from the mips tree and commit c5c38ef3d703 (irq_work: Introduce arch_irq_work_has_interrupt()) from the tip tree. I fixed it up (see

linux-next: manual merge of the tip tree with the mips tree

2014-01-14 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the tip tree got a conflict in arch/mips/netlogic/xlp/setup.c between commit 8e4857962d97 ("MIPS: Netlogic: Core wakeup improvements") from the mips tree and commit 7972e966b032 ("MIPS: Remove panic_timeout settings") from the tip tree. I fixed it up (see

linux-next: manual merge of the tip tree with the mips tree

2014-01-14 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the tip tree got a conflict in arch/mips/Kconfig between commit 597ce1723e0f ("MIPS: Support for 64-bit FP with O32 binaries") from the mips tree and commit 19952a92037e ("stackprotector: Unify the HAVE_CC_STACKPROTECTOR logic between architectures") from the

linux-next: manual merge of the tip tree with the mips tree

2014-01-14 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the tip tree got a conflict in arch/mips/Kconfig between commit 597ce1723e0f (MIPS: Support for 64-bit FP with O32 binaries) from the mips tree and commit 19952a92037e (stackprotector: Unify the HAVE_CC_STACKPROTECTOR logic between architectures) from the tip

linux-next: manual merge of the tip tree with the mips tree

2014-01-14 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the tip tree got a conflict in arch/mips/netlogic/xlp/setup.c between commit 8e4857962d97 (MIPS: Netlogic: Core wakeup improvements) from the mips tree and commit 7972e966b032 (MIPS: Remove panic_timeout settings) from the tip tree. I fixed it up (see below)