From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will.deacon@arm.com>, Arnd Bergmann <arnd@arndb.de>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Dave Martin <Dave.Martin@arm.com>,
"Eric W. Biederman" <ebiederm@xmission.com>
Subject: linux-next: manual merge of the arm64 tree with the asm-generic tree
Date: Wed, 21 Mar 2018 09:50:47 +1100 [thread overview]
Message-ID: <20180321095047.3aee181e@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1980 bytes --]
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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2018-03-20 22:50 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-20 22:50 Stephen Rothwell [this message]
2018-03-21 9:38 ` linux-next: manual merge of the arm64 tree with the asm-generic tree Arnd Bergmann
2018-03-21 12:06 Dave Martin
2020-10-11 22:51 Stephen Rothwell
2020-10-12 8:02 ` Arnd Bergmann
2020-10-12 16:55 ` Naresh Kamboju
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180321095047.3aee181e@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=Dave.Martin@arm.com \
--cc=arnd@arndb.de \
--cc=catalin.marinas@arm.com \
--cc=ebiederm@xmission.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=will.deacon@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).