From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Vineet Gupta <Vineet.Gupta1@synopsys.com>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>,
Mark Rutland <mark.rutland@arm.com>,
Ingo Molnar <mingo@kernel.org>
Subject: linux-next: manual merge of the arc-current tree with Linus' tree
Date: Wed, 15 Aug 2018 08:11:41 +1000 [thread overview]
Message-ID: <20180815081141.3f1b1059@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 789 bytes --]
Hi Vineet,
Today's linux-next merge of the arc-current tree got a conflict in:
arch/arc/include/asm/atomic.h
between commit:
ab0b910490fe ("atomics/arc: Define atomic64_fetch_add_unless()")
from Linus' tree and commit:
39456148db74 ("ARC: atomic64: fix atomic64_add_unless function")
from the arc-current tree.
I fixed it up (I just used the version from Linus' tree for now) 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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2018-08-14 22:11 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-14 22:11 Stephen Rothwell [this message]
2018-08-14 23:00 ` linux-next: manual merge of the arc-current tree with Linus' tree Vineet Gupta
2019-01-17 21:22 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=20180815081141.3f1b1059@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=Eugeniy.Paltsev@synopsys.com \
--cc=Vineet.Gupta1@synopsys.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mingo@kernel.org \
/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).