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] [day] [month] [year] [list]

Message-ID: <EAF47CD23C76F840A9E7FCE10091EFAB02B4BE3967@dbde02.ent.ti.com>
Date:	Thu, 28 May 2009 12:10:33 +0530
From:	"Shilimkar, Santosh" <santosh.shilimkar@...com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
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


> -----Original Message-----
> From: Stephen Rothwell [mailto:sfr@...b.auug.org.au] 
> Sent: Thursday, May 28, 2009 12:05 PM
> To: Shilimkar, Santosh
> Cc: Tony Lindgren; linux-omap@...r.kernel.org; 
> linux-next@...r.kernel.org; linux-kernel@...r.kernel.org; Russell King
> 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.
Ok. Thanks !!

Regards,
Santosh
 --
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/