Linux-Next Archive on lore.kernel.org
 help / color / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Juergen Gross <jgross@suse.com>,
	Roger Pau Monne <roger.pau@citrix.com>,
	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: linux-next: manual merge of the akpm-current tree with Linus' tree
Date: Tue, 8 Sep 2020 19:24:10 +1000
Message-ID: <20200908192410.0ffe8c33@canb.auug.org.au> (raw)


[-- Attachment #1: Type: text/plain, Size: 2441 bytes --]

Hi all,

Today's linux-next merge of the akpm-current tree got a conflict in:

  drivers/dax/device.c

between commit:

  4533d3aed857 ("memremap: rename MEMORY_DEVICE_DEVDAX to MEMORY_DEVICE_GENERIC")

from Linus' tree and commit:

  ceb1b473719c ("device-dax: make pgmap optional for instance creation")

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/device.c
index 1e89513f3c59,cc1f4ce185bf..000000000000
--- a/drivers/dax/device.c
+++ b/drivers/dax/device.c
@@@ -420,17 -396,37 +396,37 @@@ int dev_dax_probe(struct dev_dax *dev_d
  	struct inode *inode;
  	struct cdev *cdev;
  	void *addr;
- 	int rc;
+ 	int rc, i;
  
- 	/* 1:1 map region resource range to device-dax instance range */
- 	if (!devm_request_mem_region(dev, res->start, resource_size(res),
- 				dev_name(dev))) {
- 		dev_warn(dev, "could not reserve region %pR\n", res);
- 		return -EBUSY;
+ 	pgmap = dev_dax->pgmap;
+ 	if (dev_WARN_ONCE(dev, pgmap && dev_dax->nr_range > 1,
+ 			"static pgmap / multi-range device conflict\n"))
+ 		return -EINVAL;
+ 
+ 	if (!pgmap) {
+ 		pgmap = devm_kzalloc(dev, sizeof(*pgmap) + sizeof(struct range)
+ 				* (dev_dax->nr_range - 1), GFP_KERNEL);
+ 		if (!pgmap)
+ 			return -ENOMEM;
+ 		pgmap->nr_range = dev_dax->nr_range;
+ 	}
+ 
+ 	for (i = 0; i < dev_dax->nr_range; i++) {
+ 		struct range *range = &dev_dax->ranges[i].range;
+ 
+ 		if (!devm_request_mem_region(dev, range->start,
+ 					range_len(range), dev_name(dev))) {
+ 			dev_warn(dev, "mapping%d: %#llx-%#llx could not reserve range\n",
+ 					i, range->start, range->end);
+ 			return -EBUSY;
+ 		}
+ 		/* don't update the range for static pgmap */
+ 		if (!dev_dax->pgmap)
+ 			pgmap->ranges[i] = *range;
  	}
  
- 	dev_dax->pgmap.type = MEMORY_DEVICE_GENERIC;
- 	addr = devm_memremap_pages(dev, &dev_dax->pgmap);
 -	pgmap->type = MEMORY_DEVICE_DEVDAX;
++	pgmap->type = MEMORY_DEVICE_GENERIC;
+ 	addr = devm_memremap_pages(dev, pgmap);
  	if (IS_ERR(addr))
  		return PTR_ERR(addr);
  

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

             reply index

Thread overview: 42+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-08  9:24 Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2021-04-06 11:29 Stephen Rothwell
2021-02-08 12:10 Stephen Rothwell
2020-09-08  9:17 Stephen Rothwell
2020-06-03  8:07 Stephen Rothwell
2020-06-03  7:53 Stephen Rothwell
2019-02-18  6:51 Stephen Rothwell
2019-02-20  1:00 ` Stephen Rothwell
2019-01-11  2:51 Stephen Rothwell
2019-01-11 15:08 ` Jerome Glisse
2019-01-07  2:16 Stephen Rothwell
2018-08-15  8:05 Stephen Rothwell
2018-07-23  8:00 Stephen Rothwell
2018-06-14  1:43 Stephen Rothwell
2018-06-14  1:36 Stephen Rothwell
2018-03-16  5:56 Stephen Rothwell
2017-11-02  8:10 Stephen Rothwell
2017-11-02  7:37 Stephen Rothwell
2017-05-08  3:48 Stephen Rothwell
2017-04-24  7:25 Stephen Rothwell
2017-04-24  9:11 ` Mel Gorman
2016-12-05  5:38 Stephen Rothwell
2016-12-05  5:56 ` Michal Hocko
2016-12-05  6:08   ` Stephen Rothwell
2016-01-18  3:22 Stephen Rothwell
2015-12-18  5:09 Stephen Rothwell
2015-10-06  5:46 Stephen Rothwell
2015-07-20  3:54 Stephen Rothwell
2015-05-19  6:40 Stephen Rothwell
2014-08-08  5:46 Stephen Rothwell
2014-08-07  6:51 Stephen Rothwell
2014-05-29  9:08 Stephen Rothwell
2014-04-29  4:47 Stephen Rothwell
2014-04-24  5:38 Stephen Rothwell
2014-04-07  4:18 Stephen Rothwell
2014-01-29  3:46 Stephen Rothwell
2013-12-23  3:58 Stephen Rothwell
2013-12-03  1:52 Stephen Rothwell
2013-12-03  7:16 ` Richard Weinberger
2013-12-03  7:31   ` Andrew Morton
2013-12-03  7:36     ` Richard Weinberger
2013-02-02 12:55 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=20200908192410.0ffe8c33@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=akpm@linux-foundation.org \
    --cc=dan.j.williams@intel.com \
    --cc=jgross@suse.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=roger.pau@citrix.com \
    /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

Linux-Next Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-next/0 linux-next/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-next linux-next/ https://lore.kernel.org/linux-next \
		linux-next@vger.kernel.org
	public-inbox-index linux-next

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-next


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git