Re: linux-next: manual merge of the akpm-current tree with the hmm tree

[Jason Gunthorpe]

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