Subject: linux-next: manual merge of the arm64 tree with the asm-generic tree

From: Stephen Rothwell <[email-masked]>
Date: Wed, 21 Mar 2018 09:50:47 +1100

Hi all,

Today's linux-next merge of the arm64 tree got a conflict in:

  include/uapi/asm-generic/siginfo.h

between commit:

  0d7d2a23a347 ("asm-generic: siginfo: define ia64 si_codes unconditionally")

from the asm-generic tree and commit:

  266da65e9156 ("signal: Add FPE_FLTUNK si_code for undiagnosable fp exceptions")

from the arm64 tree.

I fixed it up (see below) 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.

-- 
Cheers,
Stephen Rothwell

diff --cc include/uapi/asm-generic/siginfo.h
index 5528cdb0b54a,4b3520bf67ba..000000000000
--- a/include/uapi/asm-generic/siginfo.h
+++ b/include/uapi/asm-generic/siginfo.h
@@@ -202,12 -219,18 +202,13 @@@ typedef struct siginfo 
  #define FPE_FLTRES	6	/* floating point inexact result */
  #define FPE_FLTINV	7	/* floating point invalid operation */
  #define FPE_FLTSUB	8	/* subscript out of range */
 -#ifdef __frv__
 -# define FPE_MDAOVF	9	/* media overflow */
 -#endif
 -#ifdef __ia64__
 -# define __FPE_DECOVF	9	/* decimal overflow */
 -# define __FPE_DECDIV	10	/* decimal division by zero */
 -# define __FPE_DECERR	11	/* packed decimal error */
 -# define __FPE_INVASC	12	/* invalid ASCII digit */
 -# define __FPE_INVDEC	13	/* invalid decimal digit */
 -#endif
 +#define __FPE_DECOVF	9	/* decimal overflow */
 +#define __FPE_DECDIV	10	/* decimal division by zero */
 +#define __FPE_DECERR	11	/* packed decimal error */
 +#define __FPE_INVASC	12	/* invalid ASCII digit */
 +#define __FPE_INVDEC	13	/* invalid decimal digit */
- #define NSIGFPE		13
+ #define FPE_FLTUNK	14	/* undiagnosed floating-point exception */
+ #define NSIGFPE		14
  
  /*
   * SIGSEGV si_codes