diff for duplicates of <20170607032124.GA31070@dragon> diff --git a/a/1.txt b/N1/1.txt index fbe1d34..975429b 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -7,18 +7,18 @@ On Tue, Jun 06, 2017 at 01:51:53PM +0300, Leonard Crestez wrote: > > > > > > Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com> > > > --- -> > > ?arch/arm/mach-imx/mxc.h?????| 6 ++++++ -> > > ?arch/arm/mach-imx/pm-imx6.c | 6 ++++-- -> > > ?2 files changed, 10 insertions(+), 2 deletions(-) +> > > arch/arm/mach-imx/mxc.h | 6 ++++++ +> > > arch/arm/mach-imx/pm-imx6.c | 6 ++++-- +> > > 2 files changed, 10 insertions(+), 2 deletions(-) > > > > > > diff --git a/arch/arm/mach-imx/mxc.h b/arch/arm/mach-imx/mxc.h > > > index 34f2ff6..e00d626 100644 > > > --- a/arch/arm/mach-imx/mxc.h > > > +++ b/arch/arm/mach-imx/mxc.h > > > @@ -39,6 +39,7 @@ -> > > ?#define MXC_CPU_IMX6SX 0x62 -> > > ?#define MXC_CPU_IMX6Q 0x63 -> > > ?#define MXC_CPU_IMX6UL 0x64 +> > > #define MXC_CPU_IMX6SX 0x62 +> > > #define MXC_CPU_IMX6Q 0x63 +> > > #define MXC_CPU_IMX6UL 0x64 > > > +#define MXC_CPU_IMX6ULL 0x65 > > Since you are adding a new CPU type, you should probably patch > > imx_soc_device_init() for it as well. diff --git a/a/content_digest b/N1/content_digest index c4503b6..5ca6274 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,10 +1,16 @@ "ref\0c63fd9031493cefed47d59c9918c0ecb76ffaf85.1496160320.git.leonard.crestez@nxp.com\0" "ref\020170605053722.GI4094@dragon\0" "ref\01496746313.28352.19.camel@nxp.com\0" - "From\0shawnguo@kernel.org (Shawn Guo)\0" - "Subject\0[PATCH] ARM: imx6ull: Make suspend/resume work like on 6ul\0" + "From\0Shawn Guo <shawnguo@kernel.org>\0" + "Subject\0Re: [PATCH] ARM: imx6ull: Make suspend/resume work like on 6ul\0" "Date\0Wed, 7 Jun 2017 11:21:26 +0800\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Anson Huang <Anson.Huang@nxp.com>\0" + "Cc\0Leonard Crestez <leonard.crestez@nxp.com>" + Peter Chen <peter.chen@nxp.com> + linux-kernel@vger.kernel.org + Fabio Estevam <fabio.estevam@nxp.com> + linux-arm-kernel@lists.infradead.org + " Lucas Stach <l.stach@pengutronix.de>\0" "\00:1\0" "b\0" "On Tue, Jun 06, 2017 at 01:51:53PM +0300, Leonard Crestez wrote:\n" @@ -16,18 +22,18 @@ "> > > \n" "> > > Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>\n" "> > > ---\n" - "> > > ?arch/arm/mach-imx/mxc.h?????| 6 ++++++\n" - "> > > ?arch/arm/mach-imx/pm-imx6.c | 6 ++++--\n" - "> > > ?2 files changed, 10 insertions(+), 2 deletions(-)\n" + "> > > \302\240arch/arm/mach-imx/mxc.h\302\240\302\240\302\240\302\240\302\240| 6 ++++++\n" + "> > > \302\240arch/arm/mach-imx/pm-imx6.c | 6 ++++--\n" + "> > > \302\2402 files changed, 10 insertions(+), 2 deletions(-)\n" "> > > \n" "> > > diff --git a/arch/arm/mach-imx/mxc.h b/arch/arm/mach-imx/mxc.h\n" "> > > index 34f2ff6..e00d626 100644\n" "> > > --- a/arch/arm/mach-imx/mxc.h\n" "> > > +++ b/arch/arm/mach-imx/mxc.h\n" "> > > @@ -39,6 +39,7 @@\n" - "> > > ?#define MXC_CPU_IMX6SX\t\t0x62\n" - "> > > ?#define MXC_CPU_IMX6Q\t\t0x63\n" - "> > > ?#define MXC_CPU_IMX6UL\t\t0x64\n" + "> > > \302\240#define MXC_CPU_IMX6SX\t\t0x62\n" + "> > > \302\240#define MXC_CPU_IMX6Q\t\t0x63\n" + "> > > \302\240#define MXC_CPU_IMX6UL\t\t0x64\n" "> > > +#define MXC_CPU_IMX6ULL\t\t0x65\n" "> > Since you are adding a new CPU type, you should probably patch\n" "> > imx_soc_device_init() for it as well.\n" @@ -53,4 +59,4 @@ "\n" Shawn -642365a09bc84b738fde160460ce724be24d715b80b9c5a9992aec5579f14824 +698261be2509cdaeff6b2d1f092a4f7d7486b07132282974563365c0cb1fbd91
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.