From mboxrd@z Thu Jan 1 00:00:00 1970 From: santosh.shilimkar@ti.com (Santosh Shilimkar) Date: Thu, 3 Oct 2013 12:06:02 -0400 Subject: [PATCH v2 3/5] dma: Allow TI_EDMA selectable for ARCH_KEYSTONE In-Reply-To: <20131003151117.GE16684@intel.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> <20131003151117.GE16684@intel.com> Message-ID: <524D95EA.6090804@ti.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Thursday 03 October 2013 11:11 AM, Vinod Koul wrote: > 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. > opps.. typo ... I mean fixes branch. Regards, Santosh