From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Dan Williams <dan.j.williams@intel.com>,
Michael Ellerman <mpe@ellerman.id.au>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
PowerPC <linuxppc-dev@lists.ozlabs.org>
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 nvdimm tree with the powerpc tree
Date: Mon, 29 Jan 2018 17:04:45 +1100 [thread overview]
Message-ID: <20180129170445.0e3cc514@canb.auug.org.au> (raw)
Hi Dan,
Today's linux-next merge of the nvdimm tree got a conflict in:
arch/powerpc/sysdev/axonram.c
between commit:
1d65b1c886be ("powerpc/cell: Remove axonram driver")
from the powerpc tree and commit:
785a3fab4adb ("mm, dax: introduce pfn_t_special()")
from the nvdimm tree.
I fixed it up (I just removed the file) 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:[~2018-01-29 6:04 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-29 6:04 Stephen Rothwell [this message]
2018-01-29 22:49 ` linux-next: manual merge of the nvdimm tree with the powerpc tree Dan Williams
-- strict thread matches above, loose matches on Subject: below --
2022-03-15 8:15 Stephen Rothwell
2022-03-15 11:04 ` Michael Ellerman
2022-03-15 14:55 ` Dan Williams
2022-03-15 13:48 ` kajoljain
2022-03-15 17:25 ` Vaibhav Jain
2018-01-29 6:01 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=20180129170445.0e3cc514@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=benh@kernel.crashing.org \
--cc=dan.j.williams@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mpe@ellerman.id.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).