From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751969AbbH0DVz (ORCPT ); Wed, 26 Aug 2015 23:21:55 -0400 Received: from mga03.intel.com ([134.134.136.65]:53462 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751016AbbH0DVx (ORCPT ); Wed, 26 Aug 2015 23:21:53 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.17,420,1437462000"; d="scan'208";a="549301085" Date: Thu, 27 Aug 2015 08:54:05 +0530 From: Vinod Koul To: Stephen Rothwell Cc: "Rafael J. Wysocki" , Lee Jones , Alexandre Belloni , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Andy Shevchenko Subject: Re: linux-next: manual merge of the slave-dma tree with the pm, mfd and rtc trees Message-ID: <20150827032405.GS13546@localhost> References: <20150827112645.6c30e106@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20150827112645.6c30e106@canb.auug.org.au> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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