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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Thu, 27 Aug 2015 08:54:05 +0530
From:	Vinod Koul <vinod.koul@...el.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	"Rafael J. Wysocki" <rjw@...ysocki.net>,
	Lee Jones <lee.jones@...aro.org>,
	Alexandre Belloni <alexandre.belloni@...e-electrons.com>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Andy Shevchenko <andriy.shevchenko@...ux.intel.com>
Subject: Re: linux-next: manual merge of the slave-dma tree with the pm, mfd
 and rtc trees

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@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/