* [PATCH] spi: fsl-espi: fix merge conflict for commit "avoid processing uninitalized data on error" @ 2016-10-27 18:24 Heiner Kallweit [not found] ` <f23a6a66-878e-28f4-20be-e0246ff8cc9a-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 0 siblings, 1 reply; 2+ messages in thread From: Heiner Kallweit @ 2016-10-27 18:24 UTC (permalink / raw) To: Mark Brown; +Cc: Arnd Bergmann, linux-spi-u79uwXL29TY76Z2rM5mHXA Commit 5c0ba57744b1 ("spi: fsl-espi: avoid processing uninitalized data on error") applied fine to stable but caused a merge conflict on next. This patch fixes that. Signed-off-by: Heiner Kallweit <hkallweit1-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> --- drivers/spi/spi-fsl-espi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/spi/spi-fsl-espi.c b/drivers/spi/spi-fsl-espi.c index a7e4c28..4e8a99d 100644 --- a/drivers/spi/spi-fsl-espi.c +++ b/drivers/spi/spi-fsl-espi.c @@ -456,7 +456,7 @@ static void fsl_espi_cpu_irq(struct mpc8xxx_spi *mspi, u32 events) mspi->len -= rx_nr_bytes; if (rx_nr_bytes && mspi->rx) { - mspi->get_rx(rx_data, mspi); + *(u32 *)mspi->rx = rx_data; mspi->rx += 4; } } -- 2.10.1 -- To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply related [flat|nested] 2+ messages in thread
[parent not found: <f23a6a66-878e-28f4-20be-e0246ff8cc9a-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>]
* Applied "spi: fsl-espi: fix merge conflict for commit "avoid processing uninitalized data on error"" to the spi tree [not found] ` <f23a6a66-878e-28f4-20be-e0246ff8cc9a-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> @ 2016-10-28 18:54 ` Mark Brown 0 siblings, 0 replies; 2+ messages in thread From: Mark Brown @ 2016-10-28 18:54 UTC (permalink / raw) To: Heiner Kallweit Cc: Mark Brown, Mark Brown, Arnd Bergmann, linux-spi-u79uwXL29TY76Z2rM5mHXA, linux-spi-u79uwXL29TY76Z2rM5mHXA The patch spi: fsl-espi: fix merge conflict for commit "avoid processing uninitalized data on error" has been applied to the spi tree at git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From e3cd6cf425bf40061418edf7b295f654301446fe Mon Sep 17 00:00:00 2001 From: Heiner Kallweit <hkallweit1-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> Date: Thu, 27 Oct 2016 20:24:19 +0200 Subject: [PATCH] spi: fsl-espi: fix merge conflict for commit "avoid processing uninitalized data on error" Commit 5c0ba57744b1 ("spi: fsl-espi: avoid processing uninitalized data on error") applied fine to stable but caused a merge conflict on next. This patch fixes that. Signed-off-by: Heiner Kallweit <hkallweit1-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> Signed-off-by: Mark Brown <broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> --- drivers/spi/spi-fsl-espi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/spi/spi-fsl-espi.c b/drivers/spi/spi-fsl-espi.c index a7e4c284d50a..4e8a99d0cb63 100644 --- a/drivers/spi/spi-fsl-espi.c +++ b/drivers/spi/spi-fsl-espi.c @@ -456,7 +456,7 @@ static void fsl_espi_cpu_irq(struct mpc8xxx_spi *mspi, u32 events) mspi->len -= rx_nr_bytes; if (rx_nr_bytes && mspi->rx) { - mspi->get_rx(rx_data, mspi); + *(u32 *)mspi->rx = rx_data; mspi->rx += 4; } } -- 2.10.1 -- To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-10-28 18:54 UTC | newest] Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2016-10-27 18:24 [PATCH] spi: fsl-espi: fix merge conflict for commit "avoid processing uninitalized data on error" Heiner Kallweit [not found] ` <f23a6a66-878e-28f4-20be-e0246ff8cc9a-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 2016-10-28 18:54 ` Applied "spi: fsl-espi: fix merge conflict for commit "avoid processing uninitalized data on error"" to the spi tree Mark Brown
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.