lkml.org 
[lkml]   [2015]   [Sep]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
SubjectRe: linux-next: manual merge of the slave-dma tree with the pm, mfd and rtc trees
From
On Thu, Aug 27, 2015 at 5:24 AM, Vinod Koul <vinod.koul@intel.com> wrote:
> On Thu, Aug 27, 2015 at 11:26:45AM +1000, Stephen Rothwell wrote:
>> Hi Vinod,
>>
>> Today's linux-next merge of the slave-dma tree got conflicts in:
>>
>> drivers/dma/Kconfig
>> drivers/dma/Makefile
>>
>> between commit:
>>
>> 667dfed98615 ("dmaengine: add a driver for Intel integrated DMA 64-bit")
>>
>> from the pm, mfd and rtc trees and commits:
>>
>> 3c21619077be ("dmaengine: sort the Kconfig")
>> 7e97229b3920 ("dmaengine: sort the makefile")
>>
>> from the slave-dma tree.
>>
>> I fixed it up (see below) and can carry the fix as necessary (no action
>> is required).
>
> Thanks Stephen,
>
> I looked at this and merge is sorted, so looks good to me

Sorted by Kconfig symbol or by name?

IDMA64 sorts before IMG_MDC_DMA,
but "Intel integrated DMA 64-bit support" doesn't.

Most other Intel DMA drivers have an INTEL_ prefix.

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds


\
 
 \ /
  Last update: 2015-09-01 09:41    [W:0.051 / U:2.668 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site