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

Hi all, Today's linux-next merge of the mips tree got a conflict in: arch/mips/include/asm/pgtable.h between commit: e02e07e3127d ("MIPS: Loongson: Introduce and use loongson_llsc_mb()") from the mips-fixes tree and commit: c7e2d71dda7a ("MIPS: Fix set_pte() for Netlogic XLR using cmpxc

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

Hi Paul, On Tue, 5 Feb 2019 23:35:31 + Paul Burton wrote: > > cmpxchg() doesn't need the added loongson_llsc_mb() barrier that > set_pte() has in mips-fixes because for the affected Loongson 3 > configurations the smp_mb__before_llsc() that cmpxchg() already contains > is equivalent (both wil

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

Hi Stephen, On Wed, Feb 06, 2019 at 09:17:36AM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the mips tree got conflicts in: > > arch/mips/include/asm/barrier.h > arch/mips/include/asm/pgtable.h > > between commit: > > e02e07e3127d ("MIPS: Loongson: Introduce a

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

Hi all, Today's linux-next merge of the mips tree got conflicts in: arch/mips/include/asm/barrier.h arch/mips/include/asm/pgtable.h between commit: e02e07e3127d ("MIPS: Loongson: Introduce and use loongson_llsc_mb()") from the mips-fixes tree and commits: 535113896e80 ("MIPS: Add GINV

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

Hi all, Today's linux-next merge of the mips tree got a conflict in: arch/mips/kernel/process.c between commit: b63e132b6433 ("MIPS: Use async IPIs for arch_trigger_cpumask_backtrace()") from the mips-fixes tree and commit: 8c8d953c2800 ("MIPS: Schedule on CPUs we need to lose FPU for a