linux-kernel - Re: linux-next: manual merge of the omap 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]

Message-Id: <20090528163453.641e5ea3.sfr@canb.auug.org.au>
Date:	Thu, 28 May 2009 16:34:53 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	"Shilimkar, Santosh" <santosh.shilimkar@...com>
Cc:	Tony Lindgren <tony@...mide.com>,
	"linux-omap@...r.kernel.org" <linux-omap@...r.kernel.org>,
	"linux-next@...r.kernel.org" <linux-next@...r.kernel.org>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
	Russell King <rmk@....linux.org.uk>
Subject: Re: linux-next: manual merge of the omap tree with the arm tree

Hi,

On Thu, 28 May 2009 11:55:09 +0530 "Shilimkar, Santosh" <santosh.shilimkar@...com> wrote:
>
> >  +machine-$(CONFIG_ARCH_OMAP2)		:= omap2
> >  +machine-$(CONFIG_ARCH_OMAP3)		:= omap2
> > ++machine-$(CONFIG_ARCH_OMAP4)		:= omap2
> 
> ++ Is this really ok ?

Yeah, this is a diff of a git merge.  The ++ just means it was added on
neither side of the merge - I modified the change from the omap tree
slightly to fit in better with the cleanups from the arm tree.

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped