Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1214302

Re: linux-next: manual merge of the slave-dma tree with the pm, mfd and rtc trees

Show all headers | View raw

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

-- 
~Vinod

--
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

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