From: Minchan Kim <minchan@kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Andrew Morton <akpm@linux-foundation.org>,
Dan Williams <dan.j.williams@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 akpm-current tree with the nvdimm tree
Date: Thu, 16 Nov 2017 13:55:26 +0900 [thread overview]
Message-ID: <20171116045526.GA13115@bbox> (raw)
In-Reply-To: <20171116141627.65df4240@canb.auug.org.au>
Hi Stephen,
On Thu, Nov 16, 2017 at 02:16:27PM +1100, Stephen Rothwell wrote:
> Hi Andrew,
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
> drivers/block/brd.c
>
> between commit:
>
> 7a862fbbdec6 ("brd: remove dax support")
>
> from the nvdimm tree and commit:
>
> f8ace3501d00 ("bdi: introduce BDI_CAP_SYNCHRONOUS_IO")
>
> from the akpm-current tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
It's good for me.
Thanks.
next prev parent reply other threads:[~2017-11-16 4:55 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-16 3:16 linux-next: manual merge of the akpm-current tree with the nvdimm tree Stephen Rothwell
2017-11-16 4:55 ` Minchan Kim [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-12-07 6:39 Stephen Rothwell
2021-12-07 6:55 ` Christoph Hellwig
2021-12-07 10:23 ` Joao Martins
2018-06-04 10:24 Stephen Rothwell
2017-04-24 6:47 Stephen Rothwell
2016-01-08 5:51 Stephen Rothwell
2015-12-31 10:51 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=20171116045526.GA13115@bbox \
--to=minchan@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=dan.j.williams@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.