From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Ralf Baechle <ralf@linux-mips.org>, James Hogan <jhogan@kernel.org>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Huacai Chen <chenhc@lemote.com>,
Paul Burton <paul.burton@mips.com>,
Huang Pei <huangpei@loongson.cn>
Subject: linux-next: manual merge of the mips tree with the mips-fixes tree
Date: Fri, 8 Feb 2019 09:22:10 +1100 [thread overview]
Message-ID: <20190208092210.653a9bcf@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 783 bytes --]
Hi all,
Today's linux-next merge of the mips tree got a conflict in:
arch/mips/include/asm/pgtable.h
between commit:
e02e07e3127d ("MIPS: Loongson: Introduce and use loongson_llsc_mb()")
from the mips-fixes tree and commit:
c7e2d71dda7a ("MIPS: Fix set_pte() for Netlogic XLR using cmpxchg64()")
from the mips tree.
I fixed it up (I just used the mips tree version) 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:[~2019-02-07 22:22 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-07 22:22 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2019-11-04 23:05 linux-next: manual merge of the mips tree with the mips-fixes tree Stephen Rothwell
2019-02-05 22:17 Stephen Rothwell
2019-02-05 23:35 ` Paul Burton
2019-02-05 23:44 ` Stephen Rothwell
2018-06-28 23:46 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=20190208092210.653a9bcf@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=chenhc@lemote.com \
--cc=huangpei@loongson.cn \
--cc=jhogan@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=paul.burton@mips.com \
--cc=ralf@linux-mips.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).