On Thu, 2010-04-15 at 15:52 +0200, ext Hiremath, Vaibhav wrote: > > -----Original Message----- > > From: Tomi Valkeinen [mailto:tomi.valkeinen@xxxxxxxxx] > > Sent: Thursday, April 15, 2010 7:18 PM > > To: Hiremath, Vaibhav > > Cc: linux-omap@xxxxxxxxxxxxxxx; tony@xxxxxxxxxxx > > Subject: Re: [PATCH-V2 2/2] OMAP: OMAP3EVM: Add LCD Backlight brightness > > hookup function > > > > Hi, > > > > On Mon, 2010-04-12 at 13:50 +0200, ext hvaibhav@xxxxxx wrote: > > > From: Vaibhav Hiremath <hvaibhav@xxxxxx> > > > > > > > > > Signed-off-by: Vaibhav Hiremath <hvaibhav@xxxxxx> > > > > What tree is this patch based on? It doesn't apply: > > > > Applying: OMAP: OMAP3EVM: Add LCD Backlight brightness hookup function > > fatal: sha1 information is lacking or useless (arch/arm/mach-omap2/board- > > omap3evm.c). > > Repository lacks necessary blobs to fall back on 3-way merge. > > Cannot fall back to three-way merge. > > > [Hiremath, Vaibhav] I am really not sure why this error is coming up, actually I using same patch and rebasing it with latest linux-omap/master without any issue. > I think this happens when you have some extra patches on your tree, and these two patches are on top of them. Then you email me only these two patches, and when I try to apply them, git will complain as the underlying patches are missing from my tree. So you should always rebase the patches you will send on top of a clean public tree, preferably my dss2 tree or main linux tree. Tomi -- 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
