linux-kernel - Re: linux-next: manual merge of the arm-soc tree with the arm 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] [thread-next>] [day] [month] [year] [list]

Date:	Tue, 29 Nov 2011 10:06:17 +0200
From:	Tomi Valkeinen <tomi.valkeinen@...com>
To:	Arnd Bergmann <arnd@...db.de>
Cc:	Stephen Rothwell <sfr@...b.auug.org.au>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Tony Lindgren <tony@...mide.com>,
	Russell King <rmk@....linux.org.uk>
Subject: Re: linux-next: manual merge of the arm-soc tree with the arm tree

Hi,

On Mon, 2011-11-28 at 19:11 +0000, Arnd Bergmann wrote:
> On Sunday 27 November 2011, Stephen Rothwell wrote:
> > Today's linux-next merge of the arm-soc tree got a conflict in
> > arch/arm/plat-omap/include/plat/common.h between commit 4e65331c6bb4
> > ("ARM: 7159/1: OMAP: Introduce local common.h files") from the  tree and
> > commit 13662dc5b177 ("ARM: OMAP: HWMOD: Unify DSS resets for OMAPs") from
> > the arm-soc tree.
> > 
> > I did the obvious fixup (see below) and can carry the fix as necessary.
> 
> Your fix looks technically correct, thanks!
> 
> Tony, I believe what you actually want here is to move omap_dss_reset
> into mach-omap2/common.h, right?

omap_dss_reset will never be used by omap1 boards, so I think
mach-omap2/common.h would be a good place for it.

 Tomi


Download attachment "signature.asc" of type "application/pgp-signature" (837 bytes)