[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <1324656853.1633.17.camel@vkoul-udesk3>
Date: Fri, 23 Dec 2011 21:44:13 +0530
From: Vinod Koul <vinod.koul@...el.com>
To: Eric Bénard <eric@...rea.com>
Cc: Dan Williams <dan.j.williams@...el.com>,
Sascha Hauer <kernel@...gutronix.de>,
linux-arm-kernel@...ts.infradead.org,
open list <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH v2 08/19] dma: MX3_IPU fix depends
On Fri, 2011-12-23 at 17:04 +0100, Eric Bénard wrote:
> if I followed everything (see Stephen Rothwell mail titled
> "linux-next: manual
> merge of the slave-dma tree with the arm-soc tree"), this patch was
> not
> applieed because the problem was already fixed in commit 8e2d41f8c856
> ("dma
> i.MX: remove individual SOC dependency") from the slave-dma tree
>
Okay thanks,
I will check the merge conflict
--
~Vinod
--
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/
Powered by blists - more mailing lists