Messages in this thread | | | Date | Tue, 24 Jun 2014 20:56:23 +0200 | Subject | Re: [PATCH 5/5] spi: sh-msiof: Add DMA support | From | Geert Uytterhoeven <> |
| |
Hi Mark,
On Sun, Jun 22, 2014 at 10:06 AM, Geert Uytterhoeven <geert@linux-m68k.org> wrote: > On Sat, Jun 21, 2014 at 12:19 PM, Mark Brown <broonie@kernel.org> wrote: >> On Fri, Jun 20, 2014 at 12:16:20PM +0200, Geert Uytterhoeven wrote: >>> Add DMA support to the MSIOF driver using platform data. >> >> This doesn't apply against current code, can you please check and >> resend? > > My patches were based on your for-next branch, which has > commit 1e8231b79ccbb3e6e7b3f6af9f998dca16b00efe > Author: Jingoo Han <jg1.han@samsung.com> > Date: Tue Apr 29 17:21:25 2014 +0900 > > spi: sh-msiof: remove unnecessary OOM messages
Sorry, wrong copy and paste, I meant:
commit b8fa0abd47f3f2fa47c1b2b06182c422d0c2350d Author: Alexander Shiyan <shc_work@mail.ru> Date: Wed Jun 4 18:17:09 2014 +0400
spi: sh-msiof: Remove unnecessary platform_set_drvdata()
Drop call to platform_set_drvdata() as driver data is not used anywhere in the driver.
Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Mark Brown <broonie@linaro.org>
> (from topic/cleanup), but topic/sh-msiof hasn't.
Do you want me to resend? Against which branch?
Basically I had to revert the above commit, as I do use the driver data. So if I would rebase and resend against topic/sh-msiof, you'll get a merge conflict when merging this into for-next.
Thanks!
Gr{oetje,eeting}s,
Geert
-- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
| |