From: Vinod Koul <vkoul@kernel.org>
To: Arnd Bergmann <arnd@arndb.de>
Cc: Peter Ujfalusi <peter.ujfalusi@ti.com>,
Dan Williams <dan.j.williams@intel.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
dmaengine@vger.kernel.org
Subject: Re: [PATCH 1/2] [RESEND] dmaengine: omap-dma: make omap_dma_filter_fn private
Date: Mon, 22 Jul 2019 19:40:45 +0530 [thread overview]
Message-ID: <20190722141045.GS12733@vkoul-mobl.Dlink> (raw)
In-Reply-To: <CAK8P3a39YBEueSGo-DpVOH3nE88T7DyarcoT29XZ13onCRP1Aw@mail.gmail.com>
On 22-07-19, 10:31, Arnd Bergmann wrote:
> On Mon, Jul 22, 2019 at 10:17 AM Arnd Bergmann <arnd@arndb.de> wrote:
> > +++ /dev/null
> > @@ -1,21 +0,0 @@
> > -/*
> > - * OMAP DMA Engine support
> > - *
>
>
> I noticed this causes a trivial merge conflict (the file change but still
> needs to get removed), let me know if you need me to resend the patch.
thats okay, it was trivial to fix, updated now
--
~Vinod
next prev parent reply other threads:[~2019-07-22 14:12 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-22 8:16 [PATCH 1/2] [RESEND] dmaengine: omap-dma: make omap_dma_filter_fn private Arnd Bergmann
2019-07-22 8:16 ` [PATCH 2/2] [RESEND] dmaengine: edma: make edma_filter_fn private Arnd Bergmann
2019-07-22 8:31 ` [PATCH 1/2] [RESEND] dmaengine: omap-dma: make omap_dma_filter_fn private Arnd Bergmann
2019-07-22 14:10 ` Vinod Koul [this message]
2019-07-22 14:12 ` Vinod Koul
2019-07-22 14:22 ` Arnd Bergmann
2019-07-22 14:35 ` Vinod Koul
2019-07-22 14:44 ` Arnd Bergmann
2019-07-22 15:23 ` 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=20190722141045.GS12733@vkoul-mobl.Dlink \
--to=vkoul@kernel.org \
--cc=arnd@arndb.de \
--cc=dan.j.williams@intel.com \
--cc=dmaengine@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=peter.ujfalusi@ti.com \
/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).