From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Matthew Wilcox <willy@infradead.org>
Cc: 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: build failure after merge of the xarray tree
Date: Wed, 27 Jun 2018 13:09:50 +1000 [thread overview]
Message-ID: <20180627130950.43922340@canb.auug.org.au> (raw)
In-Reply-To: <20180618170920.GC28748@bombadil.infradead.org>
[-- Attachment #1: Type: text/plain, Size: 2508 bytes --]
Hi all,
On Mon, 18 Jun 2018 10:09:20 -0700 Matthew Wilcox <willy@infradead.org> wrote:
>
> On Mon, Jun 18, 2018 at 09:50:33AM -0700, Dan Williams wrote:
> > On Sun, Jun 17, 2018 at 8:27 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > > Hi all,
> > >
> > > After merging the xarray tree, today's linux-next build (powerpc
> > > ppc64_defconfig) failed like this:
> [...]
> > > from the nvdimm tree.
> > >
> > > Willy thanks for the heads up about this.
> > >
> > > I have applied the following merge fix patch (taken from the diff between
> > > the -next tree at this point and the xarray-20180615 branch from the
> > > xarray tree) for today.
> >
> > I was hoping that dax_lock_page() and the memory_failure() handling
> > could go in before the xarray rework. This helps -stable and distros
> > that need to backport this error handling support. Willy, would you be
> > amenable to rebasing on top of the next rev of the
> > dax+memory_failure() work?
> >
> > Apologies for the thrash.
>
> I am absolutely amenable to rebasing. The only problem is that I'm
> in Tokyo for the next two weeks. I can put some work in on this, but
> coordination may be a little off. If somebody else wants to do the work,
> the only (serious) difference between the xarray-20180615 and xarray
> branches in my repo is that the former is based on the dax_lock_page()
> changes having gone in.
>
> The differences sum up to:
>
> +@@ -414,8 +413,7 @@ struct page *dax_lock_page(unsigned long pfn)
> +
> + entry = __radix_tree_lookup(&mapping->i_pages, index, NULL,
> + &slot);
> +- if (!entry ||
> +- WARN_ON_ONCE(!radix_tree_exceptional_entry(entry))) {
> ++ if (!entry || WARN_ON_ONCE(!xa_is_value(entry))) {
> + xa_unlock_irq(&mapping->i_pages);
> + break;
> + } else if (!slot_locked(mapping, slot)) {
>
> (in "xarray: Replace exceptional entries")
>
> then dax_entry_waitqueue() changing its argument in "dax: Hash on XArray instead of mapping".
>
> and finally the patch converting dax_lock_page() and dax_unlock_page().
>
> I really wanted to keep the thrash here to a minimum, but this is the
> best I could come up with in terms of minimising conflicts :-(
This has all gone away today as the conflicting commits have been
removed from the nvdimm tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2018-06-27 3:09 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-18 3:27 linux-next: build failure after merge of the xarray tree Stephen Rothwell
2018-06-18 16:50 ` Dan Williams
2018-06-18 17:09 ` Matthew Wilcox
2018-06-27 3:09 ` Stephen Rothwell [this message]
2019-02-12 5:20 Stephen Rothwell
2019-02-12 16:15 ` Matthew Wilcox
2019-02-12 16:23 ` Jason Gunthorpe
2019-02-13 21:26 ` Matthew Wilcox
2019-02-13 22:09 ` Jason Gunthorpe
2019-02-21 12:47 ` Stephen Rothwell
2019-02-21 17:40 ` Jason Gunthorpe
2019-02-21 6:13 Stephen Rothwell
2019-02-21 12:34 ` Leon Romanovsky
2019-02-21 12:48 ` Stephen Rothwell
2019-02-21 13:16 ` Leon Romanovsky
2019-02-21 13:23 ` Stephen Rothwell
2019-03-11 2:44 ` Matthew Wilcox
2019-03-11 12:13 ` Jason Gunthorpe
2019-03-11 12:31 ` Matthew Wilcox
2019-03-11 14:12 ` Jason Gunthorpe
2019-03-11 12:46 ` Leon Romanovsky
2020-10-08 6:50 Stephen Rothwell
2020-10-08 6:55 Stephen Rothwell
2020-10-08 14:09 ` Matthew Wilcox
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=20180627130950.43922340@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=dan.j.williams@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=willy@infradead.org \
/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).