From: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Jeremy Fitzhardinge <jeremy@goop.org>,
Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>,
Stefano Stabellini <stefano.stabellini@eu.citrix.com>,
Xen Devel <Xen-devel@lists.xensource.com>,
Russell King <rmk@arm.linux.org.uk>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Rob Herring <rob.herring@calxeda.com>, Wei Liu <liuw@liuw.name>
Subject: Re: linux-next: manual merge of the xen-tip tree with the arm-current tree
Date: Tue, 7 Jan 2014 13:32:25 +0000 [thread overview]
Message-ID: <alpine.DEB.2.02.1401071332140.8667@kaball.uk.xensource.com> (raw)
In-Reply-To: <20140107154222.b2c0c8081441671f32d78bc1@canb.auug.org.au>
On Tue, 7 Jan 2014, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the xen-tip tree got a conflict in
> arch/arm/include/asm/xen/page.h between commit 0a5ccc86507f ("ARM:
> 7933/1: rename ioremap_cached to ioremap_cache") from the tree and
> commit 02bcf053e9c5 ("asm/xen/page.h: remove redundant semicolon") from
> the xen-tip tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
That's fine, thanks!
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> diff --cc arch/arm/include/asm/xen/page.h
> index 3759cacdd7f8,709c4b4d2f1d..000000000000
> --- a/arch/arm/include/asm/xen/page.h
> +++ b/arch/arm/include/asm/xen/page.h
> @@@ -117,6 -117,7 +117,7 @@@ static inline bool set_phys_to_machine(
> return __set_phys_to_machine(pfn, mfn);
> }
>
> - #define xen_remap(cookie, size) ioremap_cache((cookie), (size));
> -#define xen_remap(cookie, size) ioremap_cached((cookie), (size))
> ++#define xen_remap(cookie, size) ioremap_cache((cookie), (size))
> + #define xen_unmap(cookie) iounmap((cookie))
>
> #endif /* _ASM_ARM_XEN_PAGE_H */
>
prev parent reply other threads:[~2014-01-07 13:33 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-07 4:42 linux-next: manual merge of the xen-tip tree with the arm-current tree Stephen Rothwell
2014-01-07 13:32 ` Stefano Stabellini [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=alpine.DEB.2.02.1401071332140.8667@kaball.uk.xensource.com \
--to=stefano.stabellini@eu.citrix.com \
--cc=Xen-devel@lists.xensource.com \
--cc=jeremy@goop.org \
--cc=konrad.wilk@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=liuw@liuw.name \
--cc=rmk@arm.linux.org.uk \
--cc=rob.herring@calxeda.com \
--cc=sfr@canb.auug.org.au \
/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).