On Thu, Jun 25, 2015 at 05:09:24PM +0200, David Jander wrote: > On Thu, 25 Jun 2015 07:47:53 -0700 > Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> wrote: > > > On Thu, Jun 25, 2015 at 02:45:59PM +0200, David Jander wrote: > > > This reverts commit 068500e08dc87ea9a453cc4a500cf3ab28d0f936. > > > > > > According to some tests, SDMA support is broken at least for i.MX6 without > > > HW flow control. Different forms of data-corruption appear either with > > > the ROM firmware for the SDMA controller as well as when loading Freescale > > > provided SDMA firmware versions 1.1 or 3.1. > > > > > > Conflicts: > > > drivers/tty/serial/imx.c > > > > Why are these two lines here? > > Maybe because I did not know I had to remove them..... There was a merge > conflict which I solved by hand and it is the first time I do a revert- or > merge patch. Sorry for that. > Should I repost without those two lines? Given that I can't take this patch as-is, please do. thanks, greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-serial" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
