lkml.org 
[lkml]   [2018]   [Mar]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRe: linux-next: manual merge of the arm64 tree with the asm-generic tree
On Wed, Mar 21, 2018 at 6:50 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 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.

> +#define __FPE_INVDEC 13 /* invalid decimal digit */
> - #define NSIGFPE 13
> + #define FPE_FLTUNK 14 /* undiagnosed floating-point exception */
> + #define NSIGFPE 14

The merge looks correct to me. I'm still rebasing my asm-generic tree
to integrate incoming Acks, so I think we're stuck with this one for a
bit.

Arnd

\
 
 \ /
  Last update: 2018-03-21 10:38    [W:0.082 / U:0.052 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site