Re: linux-next: build failure after merge of the slave-dma tree

From: Maxime Ripard <maxime.ripard@free-electrons.com>
To: Vinod Koul <vinod.koul@intel.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
	linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Cyrille Pitchen <cyrille.pitchen@atmel.com>
Subject: Re: linux-next: build failure after merge of the slave-dma tree
Date: Mon, 24 Aug 2015 08:53:59 +0200	[thread overview]
Message-ID: <20150824065358.GC2413@lukather> (raw)
In-Reply-To: <20150806030027.GS11789@localhost>

[-- Attachment #1: Type: text/plain, Size: 1095 bytes --]

Hi Vinod,

On Thu, Aug 06, 2015 at 08:30:27AM +0530, Vinod Koul wrote:
> On Thu, Aug 06, 2015 at 12:22:03PM +1000, Stephen Rothwell wrote:
> > Hi Vinod,
> > 
> > After merging the slave-dma tree, today's linux-next build (arm
> > multi_v7_defconfig) failed like this:
> > 
> > drivers/dma/at_hdmac.c: In function 'atc_prep_dma_memset':
> > drivers/dma/at_hdmac.c:960:6: error: 'struct at_desc' has no member named 'tx_width'
> >   desc->tx_width = 2;
> >       ^
> > 
> > Caused by commit
> > 
> >   25fed8c2fff1 ("dmaengine: hdmac: Add memset capabilities")
> > 
> > interacting with commit
> > 
> >   93dce3a6434f ("dmaengine: at_hdmac: fix residue computation")
> Thanks Stephen,
> 
> I am dropping this commit now, it need to be fixed to take into account
> Cyrille work on remove tx_width and this patch should be updated to reflect
> that

I'll send an updated version today, is there some time left for this
to be part of 4.3?

Thanks,
Maxime

-- 
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]