From: Jason Gunthorpe <jgg@mellanox•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Andrew Morton <akpm@linux-foundation•org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Christoph Hellwig <hch@lst•de>,
Pavel Tatashin <pasha.tatashin@soleen•com>
Subject: Re: linux-next: manual merge of the akpm-current tree with the hmm tree
Date: Thu, 4 Jul 2019 12:42:32 +0000 [thread overview]
Message-ID: <20190704124228.GI3401@mellanox.com> (raw)
In-Reply-To: <20190704200139.696330e8@canb.auug.org.au>
On Thu, Jul 04, 2019 at 08:01:39PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
> drivers/dax/dax-private.h
>
> between commit:
>
> ea31d5859f58 ("device-dax: use the dev_pagemap internal refcount")
>
> from the hmm tree and commit:
>
> 420a0854e8f2 ("device-dax: "Hotremove" persistent memory that is used like normal RAM")
>
> from the akpm-current tree.
>
> I fixed it up (see below) 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.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc drivers/dax/dax-private.h
> index c915889d1769,9ee659ed5566..000000000000
> --- a/drivers/dax/dax-private.h
> +++ b/drivers/dax/dax-private.h
> @@@ -43,6 -43,9 +43,7 @@@ struct dax_region
> * @target_node: effective numa node if dev_dax memory range is onlined
> * @dev - device core
> * @pgmap - pgmap for memmap setup / lifetime (driver owned)
> - * @ref: pgmap reference count (driver owned)
> - * @cmp: @ref final put completion (driver owned)
> + * @dax_mem_res: physical address range of hotadded DAX memory
> */
> struct dev_dax {
> struct dax_region *region;
> @@@ -50,6 -53,9 +51,7 @@@
> int target_node;
> struct device dev;
> struct dev_pagemap pgmap;
> - struct percpu_ref ref;
> - struct completion cmp;
> + struct resource *dax_kmem_res;
> };
>
> static inline struct dev_dax *to_dev_dax(struct device *dev)
Looks OK to me, thanks
Jason
next prev parent reply other threads:[~2019-07-04 12:42 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-04 10:01 linux-next: manual merge of the akpm-current tree with the hmm tree Stephen Rothwell
2019-07-04 12:42 ` Jason Gunthorpe [this message]
-- strict thread matches above, loose matches on Subject: below --
2019-07-04 10:09 Stephen Rothwell
2019-07-04 12:44 ` Jason Gunthorpe
2019-07-04 10:36 Stephen Rothwell
2019-07-04 10:44 Stephen Rothwell
2019-07-04 10:55 Stephen Rothwell
2019-07-04 12:55 ` Jason Gunthorpe
2019-07-04 13:01 ` Stephen Rothwell
2019-07-04 13:28 ` Jason Gunthorpe
2019-07-04 21:08 ` Stephen Rothwell
2019-07-04 23:29 ` Dan Williams
2019-07-05 12:08 ` Jason Gunthorpe
2019-07-07 5:04 ` Andrew Morton
2019-07-16 4:25 ` Dan Williams
2019-08-22 8:14 Stephen Rothwell
2020-05-08 10:22 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=20190704124228.GI3401@mellanox.com \
--to=jgg@mellanox$(echo .)com \
--cc=akpm@linux-foundation$(echo .)org \
--cc=hch@lst$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=pasha.tatashin@soleen$(echo .)com \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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