Hi Sachin, On Tue, 25 Sep 2012 09:50:00 +0530 Sachin Kamat <sachin.kamat@xxxxxxxxxx> wrote: > > Auto resolution of merge conflict between commits 61c6e753 (DMA: PL330: > Check the pointer returned by kzalloc) from Linus tree and 7c71b8eb > (DMA: PL330: Remove redundant runtime_suspend/resume functions) from slave-dma > tree probably led to this build error. > > drivers/dma/pl330.c: In function ‘pl330_probe’: > drivers/dma/pl330.c:2921:3: error: label ‘probe_err5’ used but not defined > > Cc: Inderpal Singh <inderpal.singh@xxxxxxxxxx> > Cc: Vinod Koul <vinod.koul@xxxxxxxxxxxxxxx> > Cc: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> > Signed-off-by: Sachin Kamat <sachin.kamat@xxxxxxxxxx> I have added this as a merge fix from today. Vinod: Please remember to let Linus know when you ask him to merge the slave-dma tree during the merge window (or do a commented back merge of the appropriate part of Linus' tree and fix it before then). -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
pgpQMeQBAKVGf.pgp
Description: PGP signature
