diff for duplicates of <1374694207.15592.62@snotra> diff --git a/a/1.txt b/N1/1.txt index 0a54c13..cbd131c 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,24 +1,24 @@ On 07/24/2013 01:21:08 AM, hongbo.zhang@freescale.com wrote: > From: Hongbo Zhang <hongbo.zhang@freescale.com> ->=20 -> This patch adds support to 8-channel DMA engine, thus the driver =20 +> +> This patch adds support to 8-channel DMA engine, thus the driver > works for both > the new 8-channel and the legacy 4-channel DMA engines. ->=20 +> > Signed-off-by: Hongbo Zhang <hongbo.zhang@freescale.com> > --- > drivers/dma/Kconfig | 9 +++++---- > drivers/dma/fsldma.c | 9 ++++++--- > drivers/dma/fsldma.h | 2 +- > 3 files changed, 12 insertions(+), 8 deletions(-) ->=20 +> > diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig > index 6825957..1b78272 100644 > --- a/drivers/dma/Kconfig > +++ b/drivers/dma/Kconfig > @@ -89,14 +89,15 @@ config AT_HDMAC > Support the Atmel AHB DMA controller. ->=20 +> > config FSL_DMA > - tristate "Freescale Elo and Elo Plus DMA support" > + tristate "Freescale Elo series DMA support" @@ -26,20 +26,20 @@ On 07/24/2013 01:21:08 AM, hongbo.zhang@freescale.com wrote: > select DMA_ENGINE > select ASYNC_TX_ENABLE_CHANNEL_SWITCH > ---help--- -> - Enable support for the Freescale Elo and Elo Plus DMA =20 +> - Enable support for the Freescale Elo and Elo Plus DMA > controllers. -> - The Elo is the DMA controller on some 82xx and 83xx parts, =20 +> - The Elo is the DMA controller on some 82xx and 83xx parts, > and the > - Elo Plus is the DMA controller on 85xx and 86xx parts. > + Enable support for the Freescale Elo series DMA controllers. -> + The Elo is the DMA controller on some mpc82xx and mpc83xx =20 +> + The Elo is the DMA controller on some mpc82xx and mpc83xx > parts, the -> + EloPlus is on mpc85xx and mpc86xx and Pxxx parts, and the =20 +> + EloPlus is on mpc85xx and mpc86xx and Pxxx parts, and the > Elo3 is on -> + some Txxx and Bxxx parts. Look up user manuals for details =20 +> + some Txxx and Bxxx parts. Look up user manuals for details > anyway. -The user manuals do not use the "elo" terminology. I also don't =20 +The user manuals do not use the "elo" terminology. I also don't understand the tone you're trying to convey with "anyway". --Scott= +-Scott diff --git a/a/content_digest b/N1/content_digest index faaf1b3..46df2aa 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,36 +3,36 @@ "From\0Scott Wood <scottwood@freescale.com>\0" "Subject\0Re: [PATCH v5 3/4] DMA: Freescale: update driver to support 8-channel DMA engine\0" "Date\0Wed, 24 Jul 2013 14:30:07 -0500\0" - "To\0<hongbo.zhang@freescale.com>\0" - "Cc\0devicetree@vger.kernel.org" - vinod.koul@intel.com - linux-kernel@vger.kernel.org - Hongbo Zhang <hongbo.zhang@freescale.com> + "To\0hongbo.zhang@freescale.com\0" + "Cc\0vinod.koul@intel.com" djbw@fb.com - " linuxppc-dev@lists.ozlabs.org\0" + leoli@freescale.com + linuxppc-dev@lists.ozlabs.org + devicetree@vger.kernel.org + " linux-kernel@vger.kernel.org\0" "\00:1\0" "b\0" "On 07/24/2013 01:21:08 AM, hongbo.zhang@freescale.com wrote:\n" "> From: Hongbo Zhang <hongbo.zhang@freescale.com>\n" - ">=20\n" - "> This patch adds support to 8-channel DMA engine, thus the driver =20\n" + "> \n" + "> This patch adds support to 8-channel DMA engine, thus the driver \n" "> works for both\n" "> the new 8-channel and the legacy 4-channel DMA engines.\n" - ">=20\n" + "> \n" "> Signed-off-by: Hongbo Zhang <hongbo.zhang@freescale.com>\n" "> ---\n" "> drivers/dma/Kconfig | 9 +++++----\n" "> drivers/dma/fsldma.c | 9 ++++++---\n" "> drivers/dma/fsldma.h | 2 +-\n" "> 3 files changed, 12 insertions(+), 8 deletions(-)\n" - ">=20\n" + "> \n" "> diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig\n" "> index 6825957..1b78272 100644\n" "> --- a/drivers/dma/Kconfig\n" "> +++ b/drivers/dma/Kconfig\n" "> @@ -89,14 +89,15 @@ config AT_HDMAC\n" "> \t Support the Atmel AHB DMA controller.\n" - ">=20\n" + "> \n" "> config FSL_DMA\n" "> -\ttristate \"Freescale Elo and Elo Plus DMA support\"\n" "> +\ttristate \"Freescale Elo series DMA support\"\n" @@ -40,22 +40,22 @@ "> \tselect DMA_ENGINE\n" "> \tselect ASYNC_TX_ENABLE_CHANNEL_SWITCH\n" "> \t---help---\n" - "> -\t Enable support for the Freescale Elo and Elo Plus DMA =20\n" + "> -\t Enable support for the Freescale Elo and Elo Plus DMA \n" "> controllers.\n" - "> -\t The Elo is the DMA controller on some 82xx and 83xx parts, =20\n" + "> -\t The Elo is the DMA controller on some 82xx and 83xx parts, \n" "> and the\n" "> -\t Elo Plus is the DMA controller on 85xx and 86xx parts.\n" "> +\t Enable support for the Freescale Elo series DMA controllers.\n" - "> +\t The Elo is the DMA controller on some mpc82xx and mpc83xx =20\n" + "> +\t The Elo is the DMA controller on some mpc82xx and mpc83xx \n" "> parts, the\n" - "> +\t EloPlus is on mpc85xx and mpc86xx and Pxxx parts, and the =20\n" + "> +\t EloPlus is on mpc85xx and mpc86xx and Pxxx parts, and the \n" "> Elo3 is on\n" - "> +\t some Txxx and Bxxx parts. Look up user manuals for details =20\n" + "> +\t some Txxx and Bxxx parts. Look up user manuals for details \n" "> anyway.\n" "\n" - "The user manuals do not use the \"elo\" terminology. I also don't =20\n" + "The user manuals do not use the \"elo\" terminology. I also don't \n" "understand the tone you're trying to convey with \"anyway\".\n" "\n" - -Scott= + -Scott -1dbc672c84dd8c0c3f8dfd9c07f90fab40f23edfd09aa26cbcdd5a77742ca2c1 +ba14033f8e29b42a94bf0b5867da23ac146465d7cb9ae56b4c7f74c3d7598529
diff --git a/a/1.txt b/N2/1.txt index 0a54c13..cbd131c 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -1,24 +1,24 @@ On 07/24/2013 01:21:08 AM, hongbo.zhang@freescale.com wrote: > From: Hongbo Zhang <hongbo.zhang@freescale.com> ->=20 -> This patch adds support to 8-channel DMA engine, thus the driver =20 +> +> This patch adds support to 8-channel DMA engine, thus the driver > works for both > the new 8-channel and the legacy 4-channel DMA engines. ->=20 +> > Signed-off-by: Hongbo Zhang <hongbo.zhang@freescale.com> > --- > drivers/dma/Kconfig | 9 +++++---- > drivers/dma/fsldma.c | 9 ++++++--- > drivers/dma/fsldma.h | 2 +- > 3 files changed, 12 insertions(+), 8 deletions(-) ->=20 +> > diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig > index 6825957..1b78272 100644 > --- a/drivers/dma/Kconfig > +++ b/drivers/dma/Kconfig > @@ -89,14 +89,15 @@ config AT_HDMAC > Support the Atmel AHB DMA controller. ->=20 +> > config FSL_DMA > - tristate "Freescale Elo and Elo Plus DMA support" > + tristate "Freescale Elo series DMA support" @@ -26,20 +26,20 @@ On 07/24/2013 01:21:08 AM, hongbo.zhang@freescale.com wrote: > select DMA_ENGINE > select ASYNC_TX_ENABLE_CHANNEL_SWITCH > ---help--- -> - Enable support for the Freescale Elo and Elo Plus DMA =20 +> - Enable support for the Freescale Elo and Elo Plus DMA > controllers. -> - The Elo is the DMA controller on some 82xx and 83xx parts, =20 +> - The Elo is the DMA controller on some 82xx and 83xx parts, > and the > - Elo Plus is the DMA controller on 85xx and 86xx parts. > + Enable support for the Freescale Elo series DMA controllers. -> + The Elo is the DMA controller on some mpc82xx and mpc83xx =20 +> + The Elo is the DMA controller on some mpc82xx and mpc83xx > parts, the -> + EloPlus is on mpc85xx and mpc86xx and Pxxx parts, and the =20 +> + EloPlus is on mpc85xx and mpc86xx and Pxxx parts, and the > Elo3 is on -> + some Txxx and Bxxx parts. Look up user manuals for details =20 +> + some Txxx and Bxxx parts. Look up user manuals for details > anyway. -The user manuals do not use the "elo" terminology. I also don't =20 +The user manuals do not use the "elo" terminology. I also don't understand the tone you're trying to convey with "anyway". --Scott= +-Scott diff --git a/a/content_digest b/N2/content_digest index faaf1b3..1587d02 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -4,35 +4,36 @@ "Subject\0Re: [PATCH v5 3/4] DMA: Freescale: update driver to support 8-channel DMA engine\0" "Date\0Wed, 24 Jul 2013 14:30:07 -0500\0" "To\0<hongbo.zhang@freescale.com>\0" - "Cc\0devicetree@vger.kernel.org" - vinod.koul@intel.com - linux-kernel@vger.kernel.org - Hongbo Zhang <hongbo.zhang@freescale.com> - djbw@fb.com - " linuxppc-dev@lists.ozlabs.org\0" + "Cc\0<vinod.koul@intel.com>" + <djbw@fb.com> + <leoli@freescale.com> + <linuxppc-dev@lists.ozlabs.org> + <devicetree@vger.kernel.org> + <linux-kernel@vger.kernel.org> + " Hongbo Zhang <hongbo.zhang@freescale.com>\0" "\00:1\0" "b\0" "On 07/24/2013 01:21:08 AM, hongbo.zhang@freescale.com wrote:\n" "> From: Hongbo Zhang <hongbo.zhang@freescale.com>\n" - ">=20\n" - "> This patch adds support to 8-channel DMA engine, thus the driver =20\n" + "> \n" + "> This patch adds support to 8-channel DMA engine, thus the driver \n" "> works for both\n" "> the new 8-channel and the legacy 4-channel DMA engines.\n" - ">=20\n" + "> \n" "> Signed-off-by: Hongbo Zhang <hongbo.zhang@freescale.com>\n" "> ---\n" "> drivers/dma/Kconfig | 9 +++++----\n" "> drivers/dma/fsldma.c | 9 ++++++---\n" "> drivers/dma/fsldma.h | 2 +-\n" "> 3 files changed, 12 insertions(+), 8 deletions(-)\n" - ">=20\n" + "> \n" "> diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig\n" "> index 6825957..1b78272 100644\n" "> --- a/drivers/dma/Kconfig\n" "> +++ b/drivers/dma/Kconfig\n" "> @@ -89,14 +89,15 @@ config AT_HDMAC\n" "> \t Support the Atmel AHB DMA controller.\n" - ">=20\n" + "> \n" "> config FSL_DMA\n" "> -\ttristate \"Freescale Elo and Elo Plus DMA support\"\n" "> +\ttristate \"Freescale Elo series DMA support\"\n" @@ -40,22 +41,22 @@ "> \tselect DMA_ENGINE\n" "> \tselect ASYNC_TX_ENABLE_CHANNEL_SWITCH\n" "> \t---help---\n" - "> -\t Enable support for the Freescale Elo and Elo Plus DMA =20\n" + "> -\t Enable support for the Freescale Elo and Elo Plus DMA \n" "> controllers.\n" - "> -\t The Elo is the DMA controller on some 82xx and 83xx parts, =20\n" + "> -\t The Elo is the DMA controller on some 82xx and 83xx parts, \n" "> and the\n" "> -\t Elo Plus is the DMA controller on 85xx and 86xx parts.\n" "> +\t Enable support for the Freescale Elo series DMA controllers.\n" - "> +\t The Elo is the DMA controller on some mpc82xx and mpc83xx =20\n" + "> +\t The Elo is the DMA controller on some mpc82xx and mpc83xx \n" "> parts, the\n" - "> +\t EloPlus is on mpc85xx and mpc86xx and Pxxx parts, and the =20\n" + "> +\t EloPlus is on mpc85xx and mpc86xx and Pxxx parts, and the \n" "> Elo3 is on\n" - "> +\t some Txxx and Bxxx parts. Look up user manuals for details =20\n" + "> +\t some Txxx and Bxxx parts. Look up user manuals for details \n" "> anyway.\n" "\n" - "The user manuals do not use the \"elo\" terminology. I also don't =20\n" + "The user manuals do not use the \"elo\" terminology. I also don't \n" "understand the tone you're trying to convey with \"anyway\".\n" "\n" - -Scott= + -Scott -1dbc672c84dd8c0c3f8dfd9c07f90fab40f23edfd09aa26cbcdd5a77742ca2c1 +7999439045af7d7a54fff1d550163b8c157d674d57ae6ad86df0f1a00449c823
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.