Messages in this thread | | | Date | Tue, 8 Aug 2017 07:58:22 +0200 | From | Ralf Baechle <> | Subject | 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_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.
Eric,
after yesterday's emails on the topic I think commit ea1b75cf9138 ("signal/ mips: Document a conflict with SI_USER with SIGFPE") should be dropped.
Ralf
| |