linux-kernel - Re: linux-next: manual merge of the spi tree with the slave-dma tree

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] [day] [month] [year] [list]

Message-ID: <20150319093513.GW32683@intel.com>
Date:	Thu, 19 Mar 2015 15:05:13 +0530
From:	Vinod Koul <vinod.koul@...el.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Mark Brown <broonie@...nel.org>, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org,
	Andy Shevchenko <andriy.shevchenko@...ux.intel.com>,
	Jarkko Nikula <jarkko.nikula@...ux.intel.com>
Subject: Re: linux-next: manual merge of the spi tree with the slave-dma tree

On Thu, Mar 19, 2015 at 02:48:34PM +1100, Stephen Rothwell wrote:
> Hi Mark,
> 
> Today's linux-next merge of the spi tree got conflicts in
> drivers/dma/intel_mid_dma_regs.h and drivers/dma/intel_mid_dma.c
> between commit 3b62286d0ef7 ("dmaengine: Remove FSF mailing addresses")
> from the slave-dma tree and commit 36111da7838e ("dmaengine:
> intel-mid-dma: remove the driver") from the spi tree.
> 
> I fixed it up (I just removed the files) and can carry the fix as
> necessary (no action is required).
Thanks Stephan,

The file removal is the right fix here

-- 
~Vinod


Download attachment "signature.asc" of type "application/pgp-signature" (837 bytes)