From: Vinod Koul <vinod.koul@intel.com>
To: Arnd Bergmann <arnd@arndb.de>
Cc: Dan Williams <dan.j.williams@intel.com>,
Fabio Estevam <fabio.estevam@nxp.com>,
Peter Senna Tschudin <peter.senna@collabora.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Nandor Han <nandor.han@ge.com>, Dave Jiang <dave.jiang@intel.com>,
Michael Olbrich <m.olbrich@pengutronix.de>,
dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] dmaengine: imx-sdma: fix merge conflict
Date: Tue, 4 Oct 2016 13:32:38 +0530 [thread overview]
Message-ID: <20161004080238.GE2467@localhost> (raw)
In-Reply-To: <4437512.2pceIHeqFq@wuerfel>
On Tue, Oct 04, 2016 at 09:43:16AM +0200, Arnd Bergmann wrote:
> On Friday, September 23, 2016 9:15:57 AM CEST Vinod Koul wrote:
> > On Thu, Sep 22, 2016 at 01:42:35PM +0200, Arnd Bergmann wrote:
> > > On Thursday, September 15, 2016 5:50:49 PM CEST Arnd Bergmann wrote:
> > > > The sdma_handle_channel_loop() function was modified in one patch
> > > > and removed in another, and the merge between those patches left
> > > > an unused function in place:
> > > >
> > > > drivers/dma/imx-sdma.c:673:13: error: 'sdma_handle_channel_loop' defined but not used [-Werror=unused-function]
> > > >
> > > > This removes it again.
> > > >
> > > > Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> > > > Fixes: 48dc77e2d4fc ("dmaengine: imx-sdma: convert callback to helper function")
> > > > Fixes: 15f30f513111 ("dmaengine: imx-sdma - reduce transfer latency for DMA cyclic clients")
> > > > ---
> > >
> > > Hi Vinod,
> > >
> > > I still see the warning in linux-next, can you apply the patch?
> >
> > Applied, now. Sorry had missed earlier
>
> The problem was fixed after you applied the patch, but it seems the
> same one is now back in linux-next.
Opps I am sorry for that.
To prepare for pull request I rebased my next, and I fixed it while merging
with tty. I was planning to send this to Linus as reference.
But then i had to redo this as I merged some other code not going
for 4.9 and messed up in second try.
Thanks for pointing it out. It is fixed now and pushed
--
~Vinod
prev parent reply other threads:[~2016-10-04 7:54 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-15 15:50 [PATCH] dmaengine: imx-sdma: fix merge conflict Arnd Bergmann
2016-09-22 11:42 ` Arnd Bergmann
2016-09-23 3:45 ` Vinod Koul
2016-10-04 7:43 ` Arnd Bergmann
2016-10-04 8:02 ` 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=20161004080238.GE2467@localhost \
--to=vinod.koul@intel.com \
--cc=arnd@arndb.de \
--cc=dan.j.williams@intel.com \
--cc=dave.jiang@intel.com \
--cc=dmaengine@vger.kernel.org \
--cc=fabio.estevam@nxp.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=m.olbrich@pengutronix.de \
--cc=nandor.han@ge.com \
--cc=peter.senna@collabora.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).