[lkml]   [2017]   [Sep]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
SubjectRe: 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 tree and commit:
> ea1b75cf9138 ("signal/mips: Document a conflict with SI_USER with SIGFPE")
> from the userns tree.
> I fixed it up (the former removed the code updated by the latter) and
> can carry the fix as necessary. This is now fixed as far as linux-next
> is concerned, but any non trivial conflicts should be mentioned to your
> upstream maintainer when your tree is submitted for merging. You may
> also want to consider cooperating with the maintainer of the conflicting
> tree to minimise any particularly complex conflicts.

Just a reminder that the above conflict still exists.
Stephen Rothwell

 \ /
  Last update: 2017-09-05 02:23    [W:0.052 / U:19.168 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site