linux-kernel - Re: linux-next: manual merge of the xen-tip tree with the arm-current tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <alpine.DEB.2.02.1401071332140.8667@kaball.uk.xensource.com>
Date:	Tue, 7 Jan 2014 13:32:25 +0000
From:	Stefano Stabellini <stefano.stabellini@...citrix.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
CC:	Jeremy Fitzhardinge <jeremy@...p.org>,
	Konrad Rzeszutek Wilk <konrad.wilk@...cle.com>,
	Stefano Stabellini <stefano.stabellini@...citrix.com>,
	Xen Devel <Xen-devel@...ts.xensource.com>,
	Russell King <rmk@....linux.org.uk>,
	<linux-next@...r.kernel.org>, <linux-kernel@...r.kernel.org>,
	Rob Herring <rob.herring@...xeda.com>, Wei Liu <liuw@...w.name>
Subject: Re: linux-next: manual merge of the xen-tip tree with the arm-current
 tree

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@...b.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 */
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/