From: Vinod Koul <vinod.koul@intel.com>
To: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
"Rafael J. Wysocki" <rjw@rjwysocki.net>,
Lee Jones <lee.jones@linaro.org>,
Alexandre Belloni <alexandre.belloni@free-electrons.com>,
Linux-Next <linux-next@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Subject: Re: linux-next: manual merge of the slave-dma tree with the pm, mfd and rtc trees
Date: Thu, 3 Sep 2015 13:50:46 +0530 [thread overview]
Message-ID: <20150903082046.GX13546@localhost> (raw)
In-Reply-To: <CAMuHMdWoJFrG+bKJrY+Hm5+5fS9aiRiAdEegoT0wYvk2m4fjHg@mail.gmail.com>
On Tue, Sep 01, 2015 at 09:17:25AM +0200, Geert Uytterhoeven wrote:
> On Thu, Aug 27, 2015 at 5:24 AM, Vinod Koul <vinod.koul@intel.com> wrote:
> > On Thu, Aug 27, 2015 at 11:26:45AM +1000, Stephen Rothwell wrote:
> >> Hi Vinod,
> >>
> >> Today's linux-next merge of the slave-dma tree got conflicts in:
> >>
> >> drivers/dma/Kconfig
> >> drivers/dma/Makefile
> >>
> >> between commit:
> >>
> >> 667dfed98615 ("dmaengine: add a driver for Intel integrated DMA 64-bit")
> >>
> >> from the pm, mfd and rtc trees and commits:
> >>
> >> 3c21619077be ("dmaengine: sort the Kconfig")
> >> 7e97229b3920 ("dmaengine: sort the makefile")
> >>
> >> from the slave-dma tree.
> >>
> >> I fixed it up (see below) and can carry the fix as necessary (no action
> >> is required).
> >
> > Thanks Stephen,
> >
> > I looked at this and merge is sorted, so looks good to me
>
> Sorted by Kconfig symbol or by name?
I did by symbols. That also reminds me that we are not consistent in our
symbols, right now seems free for all. Ideally we should all be DMA_xxxx
--
~Vinod
prev parent reply other threads:[~2015-09-03 8:18 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-27 1:26 linux-next: manual merge of the slave-dma tree with the pm, mfd and rtc trees Stephen Rothwell
2015-08-27 3:24 ` Vinod Koul
2015-09-01 7:17 ` Geert Uytterhoeven
2015-09-03 8:20 ` Vinod Koul [this message]
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=20150903082046.GX13546@localhost \
--to=vinod.koul@intel.com \
--cc=alexandre.belloni@free-electrons.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=geert@linux-m68k.org \
--cc=lee.jones@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rjw@rjwysocki.net \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).