From: Dave Martin <Dave.Martin@arm.com>
To: Arnd Bergmann <arnd@arndb.de>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Catalin Marinas <Catalin.Marinas@arm.com>,
Will Deacon <Will.Deacon@arm.com>,
Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
"Eric W. Biederman" <ebiederm@xmission.com>
Subject: Re: linux-next: manual merge of the arm64 tree with the asm-generic tree
Date: Wed, 21 Mar 2018 12:06:27 +0000 [thread overview]
Message-ID: <20180321120612.GA16308@e103592.cambridge.arm.com> (raw)
On Wed, Mar 21, 2018 at 09:38:28AM +0000, Arnd Bergmann wrote:
> 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.
Ack.
There are some overlapping patches here due to Eric's signal rework,
related arch fixes and apparently some other unrelated updates.
IIUC, some patches overlap between arm64's and Eric's -next trees for
dependency reasons, but I believe the affected arm64 patches are due to
merge via Eric's tree for v4.17.
Cheers
---Dave
next reply other threads:[~2018-03-21 12:06 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-21 12:06 Dave Martin [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-10-11 22:51 linux-next: manual merge of the arm64 tree with the asm-generic tree Stephen Rothwell
2020-10-12 8:02 ` Arnd Bergmann
2020-10-12 16:55 ` Naresh Kamboju
2018-03-20 22:50 Stephen Rothwell
2018-03-21 9:38 ` Arnd Bergmann
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=20180321120612.GA16308@e103592.cambridge.arm.com \
--to=dave.martin@arm.com \
--cc=Catalin.Marinas@arm.com \
--cc=Will.Deacon@arm.com \
--cc=arnd@arndb.de \
--cc=ebiederm@xmission.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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).