RE: linux-next: manual merge of the omap tree with the arm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



> -----Original Message-----
> From: Stephen Rothwell [mailto:sfr@xxxxxxxxxxxxxxxx] 
> Sent: Thursday, May 28, 2009 12:05 PM
> To: Shilimkar, Santosh
> Cc: Tony Lindgren; linux-omap@xxxxxxxxxxxxxxx; 
> linux-next@xxxxxxxxxxxxxxx; linux-kernel@xxxxxxxxxxxxxxx; 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@xxxxxx> 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-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Arm (vger)]     [ARM Kernel]     [ARM MSM]     [Linux Tegra]     [Linux WPAN Networking]     [Linux Wireless Networking]     [Maemo Users]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite Trails]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux