From: Stephen Rothwell <sfr@canb•auug.org.au>
To: "Eric W. Biederman" <ebiederm@xmission•com>,
Ralf Baechle <ralf@linux-mips•org>,
James Hogan <james.hogan@imgtec•com>
Cc: Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>
Subject: linux-next: manual merge of the userns tree with the mips tree
Date: Tue, 8 Aug 2017 15:10:04 +1000 [thread overview]
Message-ID: <20170808151004.071d5a6d@canb.auug.org.au> (raw)
Hi Eric,
Today's linux-next merge of the userns tree got a conflict in:
arch/mips/kernel/traps.c
between commit:
260a789828aa ("MIPS: signal: Remove unreachable code from force_fcr31_sig().")
from the mips tree and commit:
ea1b75cf9138 ("signal/mips: Document a conflict with SI_USER with SIGFPE")
from the userns tree.
I fixed it up (the former removed the code updated by the latter) 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
next reply other threads:[~2017-08-08 5:10 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-08 5:10 Stephen Rothwell [this message]
2017-08-08 5:58 ` linux-next: manual merge of the userns tree with the mips tree Ralf Baechle
2017-08-08 17:33 ` Eric W. Biederman
2017-08-08 19:07 ` [PATCH] mips/signal: In force_fcr31_sig return in the impossible case Eric W. Biederman
2017-09-05 0:22 ` linux-next: manual merge of the userns tree with the mips tree Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2014-01-23 4:13 Stephen Rothwell
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=20170808151004.071d5a6d@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=ebiederm@xmission$(echo .)com \
--cc=james.hogan@imgtec$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=ralf@linux-mips$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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