From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Mark Brown <broonie@kernel•org>, Vinod Koul <vinod.koul@intel•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Andy Shevchenko <andriy.shevchenko@linux•intel.com>,
Jarkko Nikula <jarkko.nikula@linux•intel.com>
Subject: linux-next: manual merge of the spi tree with the slave-dma tree
Date: Thu, 19 Mar 2015 14:48:34 +1100 [thread overview]
Message-ID: <20150319144834.56c676f6@canb.auug.org.au> (raw)
[-- 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 --]
next reply other threads:[~2015-03-19 3:48 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-19 3:48 Stephen Rothwell [this message]
2015-03-19 9:35 ` linux-next: manual merge of the spi tree with the slave-dma tree Vinod Koul
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150319144834.56c676f6@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=andriy.shevchenko@linux$(echo .)intel.com \
--cc=broonie@kernel$(echo .)org \
--cc=jarkko.nikula@linux$(echo .)intel.com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=vinod.koul@intel$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox