linux-next: manual merge of the generic-ioremap tree with the tegra tree

[Stephen Rothwell <sfr@canb.auug.org.au>]

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

Hi all,

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

  drivers/soc/tegra/fuse/tegra-apbmisc.c

between commit:

  02676345e9b3 ("soc/tegra: fuse: Unmap registers once they are not needed anymore")

from the tegra tree and commit:

  4bdc0d676a64 ("remove ioremap_nocache and devm_ioremap_nocache")

from the generic-ioremap 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/soc/tegra/fuse/tegra-apbmisc.c
index 4a737f15e401,a2fd6ccd48f9..000000000000
--- a/drivers/soc/tegra/fuse/tegra-apbmisc.c
+++ b/drivers/soc/tegra/fuse/tegra-apbmisc.c
@@@ -157,21 -159,13 +157,21 @@@ void __init tegra_init_apbmisc(void
  		}
  	}
  
- 	apbmisc_base = ioremap_nocache(apbmisc.start, resource_size(&apbmisc));
+ 	apbmisc_base = ioremap(apbmisc.start, resource_size(&apbmisc));
 -	if (!apbmisc_base)
 +	if (!apbmisc_base) {
  		pr_err("failed to map APBMISC registers\n");
 +	} else {
 +		chipid = readl_relaxed(apbmisc_base + 4);
 +		iounmap(apbmisc_base);
 +	}
  
- 	strapping_base = ioremap_nocache(straps.start, resource_size(&straps));
+ 	strapping_base = ioremap(straps.start, resource_size(&straps));
 -	if (!strapping_base)
 +	if (!strapping_base) {
  		pr_err("failed to map strapping options registers\n");
 +	} else {
 +		strapping = readl_relaxed(strapping_base);
 +		iounmap(strapping_base);
 +	}
  
  	long_ram_code = of_property_read_bool(np, "nvidia,long-ram-code");
  }

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