Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1216637
| From | Geert Uytterhoeven <geert@linux-m68k.org> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | Re: linux-next: manual merge of the slave-dma tree with the pm, mfd and rtc trees |
| Date | 2015-09-01 09:20 +0200 |
| Message-ID | <q3O1k-819-7@gated-at.bofh.it> (permalink) |
| References | <q1UaS-6ee-5@gated-at.bofh.it> <q1W30-Dv-3@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
linux-next: manual merge of the slave-dma tree with the pm, mfd and rtc trees Stephen Rothwell <sfr@canb.auug.org.au> - 2015-08-27 03:30 +0200
Re: linux-next: manual merge of the slave-dma tree with the pm, mfd and rtc trees Vinod Koul <vinod.koul@intel.com> - 2015-08-27 05:30 +0200
Re: linux-next: manual merge of the slave-dma tree with the pm, mfd and rtc trees Geert Uytterhoeven <geert@linux-m68k.org> - 2015-09-01 09:20 +0200
Re: linux-next: manual merge of the slave-dma tree with the pm, mfd and rtc trees Vinod Koul <vinod.koul@intel.com> - 2015-09-03 10:20 +0200
csiph-web