Re: linux-next: manual merge of the sparc-next tree with the arm64 tree

Hi all, On Wed, 21 Mar 2018 10:34:08 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the sparc-next tree got a conflict in: > > arch/x86/kernel/signal_compat.c > > between commit: > > 266da65e9156 ("signal: Add FPE_FLTUNK si_code for undiagnosable fp > exceptions") > > fro

linux-next: manual merge of the sparc-next tree with the arm64 tree

Hi David, Today's linux-next merge of the sparc-next tree got a conflict in: arch/x86/kernel/signal_compat.c between commit: 266da65e9156 ("signal: Add FPE_FLTUNK si_code for undiagnosable fp exceptions") from the arm64 tree and commit: d84bb709aa4a ("signals, sparc: Add signal codes f