From: Christoph Hellwig <hch@lst.de>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Dan Williams <dan.j.williams@intel.com>,
Jens Axboe <axboe@kernel.dk>, Christoph Hellwig <hch@lst.de>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the nvdimm tree with the block tree
Date: Tue, 15 Mar 2022 09:21:39 +0100 [thread overview]
Message-ID: <20220315082139.GA3447@lst.de> (raw)
In-Reply-To: <20220315191831.15816703@canb.auug.org.au>
On Tue, Mar 15, 2022 at 07:18:31PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the nvdimm tree got a conflict in:
>
> drivers/nvdimm/blk.c
>
> between commits:
>
> 322cbb50de71 ("block: remove genhd.h")
> 20072ec82864 ("nvdimm-blk: use bvec_kmap_local in nd_blk_rw_integrity")
>
> from the block tree and commit:
>
> f8669f1d6a86 ("nvdimm/blk: Delete the block-aperture window driver")
>
> from the nvdimm tree.
Yeah, the conflict resolution looks obviously correct :)
Thanks!
next prev parent reply other threads:[~2022-03-15 8:21 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-15 8:18 linux-next: manual merge of the nvdimm tree with the block tree Stephen Rothwell
2022-03-15 8:21 ` Christoph Hellwig [this message]
-- strict thread matches above, loose matches on Subject: below --
2017-04-24 5:50 Stephen Rothwell
2017-04-24 5:45 Stephen Rothwell
2016-07-11 7:59 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=20220315082139.GA3447@lst.de \
--to=hch@lst.de \
--cc=axboe@kernel.dk \
--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 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).