* linux-next: manual merge of the spi tree with the slave-dma tree
@ 2015-03-19 3:48 Stephen Rothwell
2015-03-19 9:35 ` Vinod Koul
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2015-03-19 3:48 UTC (permalink / raw)
To: Mark Brown, Vinod Koul
Cc: linux-next, linux-kernel, Andy Shevchenko, Jarkko Nikula
[-- Attachment #1: Type: text/plain, Size: 506 bytes --]
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).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the spi tree with the slave-dma tree
2015-03-19 3:48 linux-next: manual merge of the spi tree with the slave-dma tree Stephen Rothwell
@ 2015-03-19 9:35 ` Vinod Koul
0 siblings, 0 replies; 2+ messages in thread
From: Vinod Koul @ 2015-03-19 9:35 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Mark Brown, linux-next, linux-kernel, Andy Shevchenko,
Jarkko Nikula
[-- Attachment #1: Type: text/plain, Size: 595 bytes --]
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
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-03-19 9:35 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-03-19 3:48 linux-next: manual merge of the spi tree with the slave-dma tree Stephen Rothwell
2015-03-19 9:35 ` Vinod Koul
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).