Hi all,

On Wed, 8 Jan 2020 17:08:03 +1100 Stephen Rothwell sfr@canb.auug.org.au wrote:

Today's linux-next merge of the generic-ioremap tree got a conflict in:

drivers/gpu/drm/i915/i915_gem_gtt.c

between commit:

2c86e55d2ab5 ("drm/i915/gtt: split up i915_gem_gtt")

from the drm-intel tree and commit:

4bdc0d676a64 ("remove ioremap_nocache and devm_ioremap_nocache")

from the generic-ioremap tree.

I fixed it up (I used the file from the former and added the following merge fix patch) 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.

From: Stephen Rothwell sfr@canb.auug.org.au Date: Wed, 8 Jan 2020 17:04:59 +1100 Subject: [PATCH] fix up for "drm/i915/gtt: split up i915_gem_gtt"

Signed-off-by: Stephen Rothwell sfr@canb.auug.org.au

drivers/gpu/drm/i915/gt/intel_ggtt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/gt/intel_ggtt.c b/drivers/gpu/drm/i915/gt/intel_ggtt.c index 99189cdba8a9..1a2b5dcde960 100644 --- a/drivers/gpu/drm/i915/gt/intel_ggtt.c +++ b/drivers/gpu/drm/i915/gt/intel_ggtt.c @@ -801,7 +801,7 @@ static int ggtt_probe_common(struct i915_ggtt *ggtt, u64 size) * readback check when writing GTT PTE entries. */ if (IS_GEN9_LP(i915) || INTEL_GEN(i915) >= 10)

• ggtt->gsm = ioremap_nocache(phys_addr, size);
  

• ggtt->gsm = ioremap(phys_addr, size);
  

  else ggtt->gsm = ioremap_wc(phys_addr, size); if (!ggtt->gsm) {

-- 2.24.0

This is now a conflict between the drm tree and Linus' tree.