From: broonie@kernel.org
To: Dan Williams <dan.j.williams@intel.com>
Cc: Christoph Hellwig <hch@lst.de>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Lukas Czerner <lczerner@redhat.com>,
Theodore Ts'o <tytso@mit.edu>
Subject: linux-next: manual merge of the nvdimm tree with the ext4 tree
Date: Fri, 10 Dec 2021 17:47:40 +0000 [thread overview]
Message-ID: <20211210174740.2695216-1-broonie@kernel.org> (raw)
Hi all,
Today's linux-next merge of the nvdimm tree got a conflict in:
fs/ext4/super.c
between at least commits:
7edfd85b1ffd3 ("ext4: Completely separate options parsing and sb setup")
bdd3c50d83bf7 ("dax: remove bdev_dax_supported")
from the ext4 tree and commits:
89b93a7b15f75 ("ext4: cleanup the dax handling in ext4_fill_super")
7b0800d00dae8 ("dax: remove dax_capable")
from the nvdimm tree.
I'm not comfortable with resolving this in something as critical as ext4
at this point on a Friday evening with the code motion that's going on
so I've dropped the nvdimm tree for today, I'll look again on Monday.
next reply other threads:[~2021-12-10 17:47 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-10 17:47 broonie [this message]
2021-12-16 8:28 ` linux-next: manual merge of the nvdimm tree with the ext4 tree Christoph Hellwig
2021-12-17 8:24 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2017-11-03 6:59 Stephen Rothwell
2017-11-03 6:17 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=20211210174740.2695216-1-broonie@kernel.org \
--to=broonie@kernel.org \
--cc=dan.j.williams@intel.com \
--cc=hch@lst.de \
--cc=lczerner@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=tytso@mit.edu \
/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