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

Hi all, On Tue, 8 Aug 2017 15:10:04 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the userns tree got a conflict in: > > arch/mips/kernel/traps.c > > between commit: > > 260a789828aa ("MIPS: signal: Remove unreachable code from > force_fcr31_sig().") > > from the mips tr

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

Ralf Baechle writes: > On Tue, Aug 08, 2017 at 03:10:04PM +1000, Stephen Rothwell wrote: > > (Maciej added to cc.) > >> Hi Eric, >> >> Today's linux-next merge of the userns tree got a conflict in: >> >> arch/mips/kernel/traps.c >> >> between commit: >> >> 260a789828aa ("MIPS: signal: Rem

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

On Tue, Aug 08, 2017 at 03:10:04PM +1000, Stephen Rothwell wrote: (Maciej added to cc.) > Hi Eric, > > Today's linux-next merge of the userns tree got a conflict in: > > arch/mips/kernel/traps.c > > between commit: > > 260a789828aa ("MIPS: signal: Remove unreachable code from > force_fcr

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

Hi Eric, Today's linux-next merge of the userns tree got a conflict in: arch/mips/kernel/traps.c between commit: 260a789828aa ("MIPS: signal: Remove unreachable code from force_fcr31_sig().") from the mips tree and commit: ea1b75cf9138 ("signal/mips: Document a conflict with SI_USER wit

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

Hi Eric, Today's linux-next merge of the userns tree got conflicts in arch/mips/include/asm/vpe.h and arch/mips/kernel/vpe.c between commits 1a2a6d7e8816 ("MIPS: APRP: Split VPE loader into separate files") and 5792bf643865 ("MIPS: APRP: Code formatting clean-ups") from the mips tree and commit f5