From mboxrd@z Thu Jan  1 00:00:00 1970
From: vinod.koul@intel.com (Vinod Koul)
Date: Thu, 3 Oct 2013 20:41:17 +0530
Subject: [PATCH v2 3/5] dma: Allow TI_EDMA selectable for ARCH_KEYSTONE
In-Reply-To: <524D9407.7090306@ti.com>
References: <1380580887-24249-1-git-send-email-santosh.shilimkar@ti.com>
 <1380580887-24249-4-git-send-email-santosh.shilimkar@ti.com>
 <20131001015454.GA16684@intel.com> <524ACFAF.7020802@ti.com>
 <20131003150359.GC16684@intel.com> <524D9407.7090306@ti.com>
Message-ID: <20131003151117.GE16684@intel.com>
To: linux-arm-kernel@lists.infradead.org
List-Id: linux-arm-kernel.lists.infradead.org

On Thu, Oct 03, 2013 at 11:57:59AM -0400, Santosh Shilimkar wrote:
> >> I looked at your next patch which is fixing the TI_EDMA dependency.
> >> If you prefer to merge $subject patch via your tree, thats fine as well.
> >> Juts give me a stable branch targeted for 3.13 and I shall merge your branch
> >> and apply other patches on top of it.
> > Pls merge my fixes branch. I will send that to Linus in day or two...
> >
> Will merge your next to avoid the merge conflict issue.
No pls. I usually rebase my -next so I wont advise that. Fixes wont be so pls
use that and this will be sent to Linus.

~Vinod
>  
> >> Since it was very trivial patch, I thought its easy to carry via arm-soc
> >> with your ack.
> > Sure, looks good to me
> > 
> > Acked-by: Vinod Koul <vinod.koul@intel.com>
> 
> Thanks a lot.
> 
> Regards,
> Santosh
> 

--