From: Greg KH <greg@kroah•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Arnd Bergmann <arnd@arndb•de>, Vinod Koul <vinod.koul@intel•com>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Maxime Ripard <maxime.ripard@free-electrons•com>,
Siva Yerramreddy <yshivakrishna@gmail•com>
Subject: Re: linux-next: manual merge of the char-misc tree with the slave-dma tree
Date: Tue, 29 Jul 2014 08:36:07 -0700 [thread overview]
Message-ID: <20140729153607.GA10174@kroah.com> (raw)
In-Reply-To: <20140729173824.51e94ce2@canb.auug.org.au>
On Tue, Jul 29, 2014 at 05:38:24PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the char-misc tree got a conflict in
> drivers/dma/Makefile between commit 555859308723 ("dmaengine: sun6i:
> Add driver for the Allwinner A31 DMA controller") from the slave-dma tree and
> commit 95b4ecbf759a ("dma: MIC X100 DMA Driver") from the char-misc
> tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Looks good, thanks.
greg k-h
next prev parent reply other threads:[~2014-07-29 15:36 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-29 7:38 linux-next: manual merge of the char-misc tree with the slave-dma tree Stephen Rothwell
2014-07-29 15:36 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-08-05 6:28 Stephen Rothwell
2014-08-05 15:29 ` Greg KH
2014-08-05 16:16 ` 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=20140729153607.GA10174@kroah.com \
--to=greg@kroah$(echo .)com \
--cc=arnd@arndb$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=maxime.ripard@free-electrons$(echo .)com \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=vinod.koul@intel$(echo .)com \
--cc=yshivakrishna@gmail$(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