From: Dan Williams <dan.j.williams@intel.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Al Viro <viro@zeniv.linux.org.uk>,
Josh Poimboeuf <jpoimboe@redhat.com>,
Vishal Verma <vishal.l.verma@intel.com>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: manual merge of the nvdimm tree with the vfs tree
Date: Thu, 24 Sep 2020 07:10:58 -0700 [thread overview]
Message-ID: <CAPcyv4ifCnbY_b_0J3O4U-N5ZcDUkEycqztDi75W-fyApLq6zw@mail.gmail.com> (raw)
In-Reply-To: <20200924164529.61ea980f@canb.auug.org.au>
On Wed, Sep 23, 2020 at 11:45 PM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> Today's linux-next merge of the nvdimm tree got a conflict in:
>
> lib/iov_iter.c
>
> between commit:
>
> e33ea6e5ba6a ("x86/uaccess: Use pointer masking to limit uaccess speculation")
>
> from the vfs tree and commit:
>
> 0a78de3d4b7b ("x86, powerpc: Rename memcpy_mcsafe() to copy_mc_to_{user, kernel}()")
>
> from the nvdimm tree.
>
> I fixed it up (I just used the latter, but I suspect that more work is
> needed) 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.
I messed up, this shouldn't be present in -next, yet. Will remove.
next prev parent reply other threads:[~2020-09-24 14:11 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-24 6:45 linux-next: manual merge of the nvdimm tree with the vfs tree Stephen Rothwell
2020-09-24 14:10 ` Dan Williams [this message]
2020-09-24 14:31 ` Dan Williams
-- strict thread matches above, loose matches on Subject: below --
2020-09-24 6:38 Stephen Rothwell
2017-07-03 6:41 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=CAPcyv4ifCnbY_b_0J3O4U-N5ZcDUkEycqztDi75W-fyApLq6zw@mail.gmail.com \
--to=dan.j.williams@intel.com \
--cc=jpoimboe@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=viro@zeniv.linux.org.uk \
--cc=vishal.l.verma@intel.com \
/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).