From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>
Cc: Christoph Hellwig <hch@lst.de>, Colin Cross <ccross@android.com>,
Thierry Reding <treding@nvidia.com>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Dmitry Osipenko <digetx@gmail.com>,
ARM <linux-arm-kernel@lists.infradead.org>
Subject: Re: linux-next: manual merge of the generic-ioremap tree with the tegra tree
Date: Tue, 28 Jan 2020 10:01:47 +1100 [thread overview]
Message-ID: <20200128100147.38b868f2@canb.auug.org.au> (raw)
In-Reply-To: <20200113162748.698470fc@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 2133 bytes --]
Hi all,
On Mon, 13 Jan 2020 16:27:48 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> 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");
> }
This is now a conflict between the arm-soc tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
prev parent reply other threads:[~2020-01-27 23:01 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-13 5:27 linux-next: manual merge of the generic-ioremap tree with the tegra tree Stephen Rothwell
2020-01-27 23:01 ` Stephen Rothwell [this message]
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=20200128100147.38b868f2@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=arnd@arndb.de \
--cc=ccross@android.com \
--cc=digetx@gmail.com \
--cc=hch@lst.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=olof@lixom.net \
--cc=treding@nvidia.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
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;
as well as URLs for NNTP newsgroup(s).