Patchwork [fsl-community-bsp-platform] linux-imx (2.6.35): mxs and mx5: Update to latest from FSL GIT

login
register
mail settings
Submitter Mahesh Mahadevan
Date April 4, 2013, 7:50 p.m.
Message ID <1365105059-3021-1-git-send-email-Mahesh.Mahadevan@freescale.com>
Download mbox | patch
Permalink /patch/47445/
State Deferred
Delegated to: Otavio Salvador
Headers show

Comments

Mahesh Mahadevan - April 4, 2013, 7:50 p.m.
Update to the latest code available from Freescale's GIT repository

Signed-off-by: Mahesh Mahadevan <Mahesh.Mahadevan@freescale.com>
---
 recipes-kernel/linux/linux-imx_2.6.35.3.bb | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
Otavio Salvador - April 4, 2013, 8:19 p.m.
On Thu, Apr 4, 2013 at 4:50 PM, Mahesh Mahadevan
<Mahesh.Mahadevan@freescale.com> wrote:
> Update to the latest code available from Freescale's GIT repository
>
> Signed-off-by: Mahesh Mahadevan <Mahesh.Mahadevan@freescale.com>

Please elaborate more, in commit log, the reasoning of the change of
branch as this is not a simply revision change.

How will it be maintained in future? All fixes done in 1.1.0 release
of MX28 are merged in maintain branch? will evey update done for
MX28/MX5 be merged there?

--
Otavio Salvador                             O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br
Mahadevan Mahesh-R9AADQ - April 4, 2013, 9:02 p.m.
Merge has already been done. Future releases for MX53 and MX28 will be based off this branch.

Same branch for both.

Best regards,
-Mahesh

-----Original Message-----
From: otavio.salvador@gmail.com [mailto:otavio.salvador@gmail.com] On Behalf Of Otavio Salvador
Sent: Thursday, April 04, 2013 3:19 PM
To: Mahadevan Mahesh-R9AADQ
Cc: meta-freescale@yoctoproject.org
Subject: Re: [meta-freescale] [fsl-community-bsp-platform][PATCH] linux-imx (2.6.35): mxs and mx5: Update to latest from FSL GIT

On Thu, Apr 4, 2013 at 4:50 PM, Mahesh Mahadevan
<Mahesh.Mahadevan@freescale.com> wrote:
> Update to the latest code available from Freescale's GIT repository
>
> Signed-off-by: Mahesh Mahadevan <Mahesh.Mahadevan@freescale.com>

Please elaborate more, in commit log, the reasoning of the change of
branch as this is not a simply revision change.

How will it be maintained in future? All fixes done in 1.1.0 release
of MX28 are merged in maintain branch? will evey update done for
MX28/MX5 be merged there?

--
Otavio Salvador                             O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br
Otavio Salvador - April 4, 2013, 9:16 p.m.
On Thu, Apr 4, 2013 at 6:02 PM, Mahadevan Mahesh-R9AADQ
<r9aadq@freescale.com> wrote:
> Merge has already been done. Future releases for MX53 and MX28 will be based off this branch.
>
> Same branch for both.


We are very close of branching to 1.4 release and I am not comfortable
in changing the kernel version to a new branch that close. We're using
the "oficial" BSP release for now and I'd prefer to change it after we
start 1.5 development so we can get a good test coverage.

--
Otavio Salvador                             O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br
Eric BENARD - April 5, 2013, 6:46 a.m.
Hi Otavio,

Le Thu, 4 Apr 2013 18:16:11 -0300,
Otavio Salvador <otavio@ossystems.com.br> a écrit :

> On Thu, Apr 4, 2013 at 6:02 PM, Mahadevan Mahesh-R9AADQ
> <r9aadq@freescale.com> wrote:
> > Merge has already been done. Future releases for MX53 and MX28 will be based off this branch.
> >
> > Same branch for both.
> 
> 
> We are very close of branching to 1.4 release and I am not comfortable
> in changing the kernel version to a new branch that close. We're using
> the "oficial" BSP release for now and I'd prefer to change it after we
> start 1.5 development so we can get a good test coverage.
> 
We still have 20 days before Yocto 1.4's release to validate these
changes so if the official Freescale maintainers say this kernel is the
one to use for i.MX53 and i.MX28 I would trust him and I think it
would be great to take the opportunity to release 1.4 as a really up to
date BSP for mature products like i.MX28 and i.MX53.

When looking at the commit log of this branch we can see that it
contains many fixes so the risk of regression is quite limited.

Best regards,
Eric
Otavio Salvador - April 5, 2013, 12:34 p.m.
On Fri, Apr 5, 2013 at 3:46 AM, Eric Bénard <eric@eukrea.com> wrote:
> Hi Otavio,
>
> Le Thu, 4 Apr 2013 18:16:11 -0300,
> Otavio Salvador <otavio@ossystems.com.br> a écrit :
>
>> On Thu, Apr 4, 2013 at 6:02 PM, Mahadevan Mahesh-R9AADQ
>> <r9aadq@freescale.com> wrote:
>> > Merge has already been done. Future releases for MX53 and MX28 will be based off this branch.
>> >
>> > Same branch for both.
>>
>>
>> We are very close of branching to 1.4 release and I am not comfortable
>> in changing the kernel version to a new branch that close. We're using
>> the "oficial" BSP release for now and I'd prefer to change it after we
>> start 1.5 development so we can get a good test coverage.
>>
> We still have 20 days before Yocto 1.4's release to validate these
> changes so if the official Freescale maintainers say this kernel is the
> one to use for i.MX53 and i.MX28 I would trust him and I think it
> would be great to take the opportunity to release 1.4 as a really up to
> date BSP for mature products like i.MX28 and i.MX53.
>
> When looking at the commit log of this branch we can see that it
> contains many fixes so the risk of regression is quite limited.

If you check the number of fixes included in MX28 1.1.0 and which are
not included in the "maintain" branch, it is a huge delta. Both
11.09.01 and 1.1.0 cannot be merge on the "maintain" branch without a
HUGE number of conflicts.

--
Otavio Salvador                             O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br
Eric BENARD - April 5, 2013, 12:48 p.m.
Le Fri, 5 Apr 2013 09:34:12 -0300,
Otavio Salvador <otavio@ossystems.com.br> a écrit :

> On Fri, Apr 5, 2013 at 3:46 AM, Eric Bénard <eric@eukrea.com> wrote:
> > Hi Otavio,
> >
> > Le Thu, 4 Apr 2013 18:16:11 -0300,
> > Otavio Salvador <otavio@ossystems.com.br> a écrit :
> >
> >> On Thu, Apr 4, 2013 at 6:02 PM, Mahadevan Mahesh-R9AADQ
> >> <r9aadq@freescale.com> wrote:
> >> > Merge has already been done. Future releases for MX53 and MX28 will be based off this branch.
> >> >
> >> > Same branch for both.
> >>
> >>
> >> We are very close of branching to 1.4 release and I am not comfortable
> >> in changing the kernel version to a new branch that close. We're using
> >> the "oficial" BSP release for now and I'd prefer to change it after we
> >> start 1.5 development so we can get a good test coverage.
> >>
> > We still have 20 days before Yocto 1.4's release to validate these
> > changes so if the official Freescale maintainers say this kernel is the
> > one to use for i.MX53 and i.MX28 I would trust him and I think it
> > would be great to take the opportunity to release 1.4 as a really up to
> > date BSP for mature products like i.MX28 and i.MX53.
> >
> > When looking at the commit log of this branch we can see that it
> > contains many fixes so the risk of regression is quite limited.
> 
> If you check the number of fixes included in MX28 1.1.0 and which are
> not included in the "maintain" branch, it is a huge delta. Both
> 11.09.01 and 1.1.0 cannot be merge on the "maintain" branch without a
> HUGE number of conflicts.
> 
Who is in a better place than Freescale's kernel maintainer to say
which kernel we should use on their platforms ?

Eric
Otavio Salvador - April 5, 2013, 12:51 p.m.
On Fri, Apr 5, 2013 at 9:48 AM, Eric Bénard <eric@eukrea.com> wrote:
> Le Fri, 5 Apr 2013 09:34:12 -0300,
> Otavio Salvador <otavio@ossystems.com.br> a écrit :
>
>> On Fri, Apr 5, 2013 at 3:46 AM, Eric Bénard <eric@eukrea.com> wrote:
>> > Hi Otavio,
>> >
>> > Le Thu, 4 Apr 2013 18:16:11 -0300,
>> > Otavio Salvador <otavio@ossystems.com.br> a écrit :
>> >
>> >> On Thu, Apr 4, 2013 at 6:02 PM, Mahadevan Mahesh-R9AADQ
>> >> <r9aadq@freescale.com> wrote:
>> >> > Merge has already been done. Future releases for MX53 and MX28 will be based off this branch.
>> >> >
>> >> > Same branch for both.
>> >>
>> >>
>> >> We are very close of branching to 1.4 release and I am not comfortable
>> >> in changing the kernel version to a new branch that close. We're using
>> >> the "oficial" BSP release for now and I'd prefer to change it after we
>> >> start 1.5 development so we can get a good test coverage.
>> >>
>> > We still have 20 days before Yocto 1.4's release to validate these
>> > changes so if the official Freescale maintainers say this kernel is the
>> > one to use for i.MX53 and i.MX28 I would trust him and I think it
>> > would be great to take the opportunity to release 1.4 as a really up to
>> > date BSP for mature products like i.MX28 and i.MX53.
>> >
>> > When looking at the commit log of this branch we can see that it
>> > contains many fixes so the risk of regression is quite limited.
>>
>> If you check the number of fixes included in MX28 1.1.0 and which are
>> not included in the "maintain" branch, it is a huge delta. Both
>> 11.09.01 and 1.1.0 cannot be merge on the "maintain" branch without a
>> HUGE number of conflicts.
>>
> Who is in a better place than Freescale's kernel maintainer to say
> which kernel we should use on their platforms ?

The BSP release team.

It has not yet been released as part of any official BSP.

--
Otavio Salvador                             O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br
Eric BENARD - April 5, 2013, 1:14 p.m.
Le Fri, 5 Apr 2013 09:51:35 -0300,
Otavio Salvador <otavio@ossystems.com.br> a écrit :

> On Fri, Apr 5, 2013 at 9:48 AM, Eric Bénard <eric@eukrea.com> wrote:
> > Le Fri, 5 Apr 2013 09:34:12 -0300,
> > Otavio Salvador <otavio@ossystems.com.br> a écrit :
> >
> >> On Fri, Apr 5, 2013 at 3:46 AM, Eric Bénard <eric@eukrea.com> wrote:
> >> > Hi Otavio,
> >> >
> >> > Le Thu, 4 Apr 2013 18:16:11 -0300,
> >> > Otavio Salvador <otavio@ossystems.com.br> a écrit :
> >> >
> >> >> On Thu, Apr 4, 2013 at 6:02 PM, Mahadevan Mahesh-R9AADQ
> >> >> <r9aadq@freescale.com> wrote:
> >> >> > Merge has already been done. Future releases for MX53 and MX28 will be based off this branch.
> >> >> >
> >> >> > Same branch for both.
> >> >>
> >> >>
> >> >> We are very close of branching to 1.4 release and I am not comfortable
> >> >> in changing the kernel version to a new branch that close. We're using
> >> >> the "oficial" BSP release for now and I'd prefer to change it after we
> >> >> start 1.5 development so we can get a good test coverage.
> >> >>
> >> > We still have 20 days before Yocto 1.4's release to validate these
> >> > changes so if the official Freescale maintainers say this kernel is the
> >> > one to use for i.MX53 and i.MX28 I would trust him and I think it
> >> > would be great to take the opportunity to release 1.4 as a really up to
> >> > date BSP for mature products like i.MX28 and i.MX53.
> >> >
> >> > When looking at the commit log of this branch we can see that it
> >> > contains many fixes so the risk of regression is quite limited.
> >>
> >> If you check the number of fixes included in MX28 1.1.0 and which are
> >> not included in the "maintain" branch, it is a huge delta. Both
> >> 11.09.01 and 1.1.0 cannot be merge on the "maintain" branch without a
> >> HUGE number of conflicts.
> >>
> > Who is in a better place than Freescale's kernel maintainer to say
> > which kernel we should use on their platforms ?
> 
> The BSP release team.
> 
> It has not yet been released as part of any official BSP.
> 
you're right, that's only the recommended branch by Freescale's kernel
maintainer.

Eric
Fabio Estevam - April 5, 2013, 4:50 p.m.
Hi Mahesh,

On Thu, Apr 4, 2013 at 4:50 PM, Mahesh Mahadevan
<Mahesh.Mahadevan@freescale.com> wrote:
> Update to the latest code available from Freescale's GIT repository
>
> Signed-off-by: Mahesh Mahadevan <Mahesh.Mahadevan@freescale.com>
> ---
>  recipes-kernel/linux/linux-imx_2.6.35.3.bb | 14 +++++++-------
>  1 file changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/recipes-kernel/linux/linux-imx_2.6.35.3.bb b/recipes-kernel/linux/linux-imx_2.6.35.3.bb
> index 692a290..6d303e2 100644
> --- a/recipes-kernel/linux/linux-imx_2.6.35.3.bb
> +++ b/recipes-kernel/linux/linux-imx_2.6.35.3.bb
> @@ -1,19 +1,19 @@
>  # Copyright (C) 2011-2012 Freescale Semiconductor
>  # Released under the MIT license (see COPYING.MIT for the terms)
>
> -PR = "${INC_PR}.22"
> +PR = "${INC_PR}.23"
>
>  include linux-imx.inc
>
>  COMPATIBLE_MACHINE = "(mxs|mx5)"
>
> -# Revision of imx_2.6.35_1.1.0 branch
> -SRCREV_mxs = "914558e17e95a55ac1eac9a6c219d17d7825f715"
> -LOCALVERSION_mxs = "-1.1.0+yocto"
> +# Revision of imx_2.6.35_maintain branch
> +SRCREV_mxs = "a8e0615aab26a69b306c50d27409d732869e6609"
> +LOCALVERSION_mxs = "-mxs+yocto"
>
> -# Revision of imx_2.6.35_11.09.01 branch
> -SRCREV_mx5 = "bc8159027063aded47316b669b1293998337b2ee"
> -LOCALVERSION_mx5 = "-11.09.01+yocto"
> +# Revision of imx_2.6.35_maintain branch
> +SRCREV_mx5 = "a8e0615aab26a69b306c50d27409d732869e6609"
> +LOCALVERSION_mx5 = "-mx5+yocto"

I haven't seen a patch touching the defconfigs.

Does the maintain branch have the latest defconfig for mx28 and mx53?

Regards,

Fabio Estevam
Mahadevan Mahesh-R9AADQ - April 5, 2013, 5:26 p.m.
Yes.

Best regards,
-Mahesh

-----Original Message-----
From: Fabio Estevam [mailto:festevam@gmail.com] 
Sent: Friday, April 05, 2013 11:50 AM
To: Mahadevan Mahesh-R9AADQ
Cc: meta-freescale@yoctoproject.org; Otavio Salvador; Angolini Daiane-B19406
Subject: Re: [meta-freescale] [fsl-community-bsp-platform][PATCH] linux-imx (2.6.35): mxs and mx5: Update to latest from FSL GIT

Hi Mahesh,

On Thu, Apr 4, 2013 at 4:50 PM, Mahesh Mahadevan
<Mahesh.Mahadevan@freescale.com> wrote:
> Update to the latest code available from Freescale's GIT repository
>
> Signed-off-by: Mahesh Mahadevan <Mahesh.Mahadevan@freescale.com>
> ---
>  recipes-kernel/linux/linux-imx_2.6.35.3.bb | 14 +++++++-------
>  1 file changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/recipes-kernel/linux/linux-imx_2.6.35.3.bb b/recipes-kernel/linux/linux-imx_2.6.35.3.bb
> index 692a290..6d303e2 100644
> --- a/recipes-kernel/linux/linux-imx_2.6.35.3.bb
> +++ b/recipes-kernel/linux/linux-imx_2.6.35.3.bb
> @@ -1,19 +1,19 @@
>  # Copyright (C) 2011-2012 Freescale Semiconductor
>  # Released under the MIT license (see COPYING.MIT for the terms)
>
> -PR = "${INC_PR}.22"
> +PR = "${INC_PR}.23"
>
>  include linux-imx.inc
>
>  COMPATIBLE_MACHINE = "(mxs|mx5)"
>
> -# Revision of imx_2.6.35_1.1.0 branch
> -SRCREV_mxs = "914558e17e95a55ac1eac9a6c219d17d7825f715"
> -LOCALVERSION_mxs = "-1.1.0+yocto"
> +# Revision of imx_2.6.35_maintain branch
> +SRCREV_mxs = "a8e0615aab26a69b306c50d27409d732869e6609"
> +LOCALVERSION_mxs = "-mxs+yocto"
>
> -# Revision of imx_2.6.35_11.09.01 branch
> -SRCREV_mx5 = "bc8159027063aded47316b669b1293998337b2ee"
> -LOCALVERSION_mx5 = "-11.09.01+yocto"
> +# Revision of imx_2.6.35_maintain branch
> +SRCREV_mx5 = "a8e0615aab26a69b306c50d27409d732869e6609"
> +LOCALVERSION_mx5 = "-mx5+yocto"

I haven't seen a patch touching the defconfigs.

Does the maintain branch have the latest defconfig for mx28 and mx53?

Regards,

Fabio Estevam
Otavio Salvador - April 5, 2013, 5:37 p.m.
On Fri, Apr 5, 2013 at 1:50 PM, Fabio Estevam <festevam@gmail.com> wrote:
> Hi Mahesh,
>
> On Thu, Apr 4, 2013 at 4:50 PM, Mahesh Mahadevan
> <Mahesh.Mahadevan@freescale.com> wrote:
>> Update to the latest code available from Freescale's GIT repository
>>
>> Signed-off-by: Mahesh Mahadevan <Mahesh.Mahadevan@freescale.com>
>> ---
>>  recipes-kernel/linux/linux-imx_2.6.35.3.bb | 14 +++++++-------
>>  1 file changed, 7 insertions(+), 7 deletions(-)
>>
>> diff --git a/recipes-kernel/linux/linux-imx_2.6.35.3.bb b/recipes-kernel/linux/linux-imx_2.6.35.3.bb
>> index 692a290..6d303e2 100644
>> --- a/recipes-kernel/linux/linux-imx_2.6.35.3.bb
>> +++ b/recipes-kernel/linux/linux-imx_2.6.35.3.bb
>> @@ -1,19 +1,19 @@
>>  # Copyright (C) 2011-2012 Freescale Semiconductor
>>  # Released under the MIT license (see COPYING.MIT for the terms)
>>
>> -PR = "${INC_PR}.22"
>> +PR = "${INC_PR}.23"
>>
>>  include linux-imx.inc
>>
>>  COMPATIBLE_MACHINE = "(mxs|mx5)"
>>
>> -# Revision of imx_2.6.35_1.1.0 branch
>> -SRCREV_mxs = "914558e17e95a55ac1eac9a6c219d17d7825f715"
>> -LOCALVERSION_mxs = "-1.1.0+yocto"
>> +# Revision of imx_2.6.35_maintain branch
>> +SRCREV_mxs = "a8e0615aab26a69b306c50d27409d732869e6609"
>> +LOCALVERSION_mxs = "-mxs+yocto"
>>
>> -# Revision of imx_2.6.35_11.09.01 branch
>> -SRCREV_mx5 = "bc8159027063aded47316b669b1293998337b2ee"
>> -LOCALVERSION_mx5 = "-11.09.01+yocto"
>> +# Revision of imx_2.6.35_maintain branch
>> +SRCREV_mx5 = "a8e0615aab26a69b306c50d27409d732869e6609"
>> +LOCALVERSION_mx5 = "-mx5+yocto"
>
> I haven't seen a patch touching the defconfigs.
>
> Does the maintain branch have the latest defconfig for mx28 and mx53?

I did a basic search checking for missing changes in maintain branch.

From 1.1.0 branch:

ENGR00235714-1 is missing
ENGR00235714-2 is missing
ENGR00235714-3 is missing
ENGR00235714-3 is missing
ENGR00235714-2 is missing
ENGR00235714-1 is missing
ENGR00236853-2 is missing
ENGR00238863 is missing

And I know some are repeated but they appear repeated on the commitlog
so that's why.

--
Otavio Salvador                             O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br
Otavio Salvador - April 5, 2013, 5:38 p.m.
On Fri, Apr 5, 2013 at 2:37 PM, Otavio Salvador <otavio@ossystems.com.br> wrote:
> On Fri, Apr 5, 2013 at 1:50 PM, Fabio Estevam <festevam@gmail.com> wrote:
>> Hi Mahesh,
>>
>> On Thu, Apr 4, 2013 at 4:50 PM, Mahesh Mahadevan
>> <Mahesh.Mahadevan@freescale.com> wrote:
>>> Update to the latest code available from Freescale's GIT repository
>>>
>>> Signed-off-by: Mahesh Mahadevan <Mahesh.Mahadevan@freescale.com>
>>> ---
>>>  recipes-kernel/linux/linux-imx_2.6.35.3.bb | 14 +++++++-------
>>>  1 file changed, 7 insertions(+), 7 deletions(-)
>>>
>>> diff --git a/recipes-kernel/linux/linux-imx_2.6.35.3.bb b/recipes-kernel/linux/linux-imx_2.6.35.3.bb
>>> index 692a290..6d303e2 100644
>>> --- a/recipes-kernel/linux/linux-imx_2.6.35.3.bb
>>> +++ b/recipes-kernel/linux/linux-imx_2.6.35.3.bb
>>> @@ -1,19 +1,19 @@
>>>  # Copyright (C) 2011-2012 Freescale Semiconductor
>>>  # Released under the MIT license (see COPYING.MIT for the terms)
>>>
>>> -PR = "${INC_PR}.22"
>>> +PR = "${INC_PR}.23"
>>>
>>>  include linux-imx.inc
>>>
>>>  COMPATIBLE_MACHINE = "(mxs|mx5)"
>>>
>>> -# Revision of imx_2.6.35_1.1.0 branch
>>> -SRCREV_mxs = "914558e17e95a55ac1eac9a6c219d17d7825f715"
>>> -LOCALVERSION_mxs = "-1.1.0+yocto"
>>> +# Revision of imx_2.6.35_maintain branch
>>> +SRCREV_mxs = "a8e0615aab26a69b306c50d27409d732869e6609"
>>> +LOCALVERSION_mxs = "-mxs+yocto"
>>>
>>> -# Revision of imx_2.6.35_11.09.01 branch
>>> -SRCREV_mx5 = "bc8159027063aded47316b669b1293998337b2ee"
>>> -LOCALVERSION_mx5 = "-11.09.01+yocto"
>>> +# Revision of imx_2.6.35_maintain branch
>>> +SRCREV_mx5 = "a8e0615aab26a69b306c50d27409d732869e6609"
>>> +LOCALVERSION_mx5 = "-mx5+yocto"
>>
>> I haven't seen a patch touching the defconfigs.
>>
>> Does the maintain branch have the latest defconfig for mx28 and mx53?
>
> I did a basic search checking for missing changes in maintain branch.
>
> From 1.1.0 branch:
>
> ENGR00235714-1 is missing
> ENGR00235714-2 is missing
> ENGR00235714-3 is missing
> ENGR00235714-3 is missing
> ENGR00235714-2 is missing
> ENGR00235714-1 is missing
> ENGR00236853-2 is missing
> ENGR00238863 is missing
>
> And I know some are repeated but they appear repeated on the commitlog
> so that's why.

To generate this list:

for c in $(git log --oneline --reverse
freescale-upstream/imx_2.6.35_10.12.01..freescale-upstream/imx_2.6.35_1.1.0
| sed 's,.*\(ENGR[^: ]*\).*,\1,g'| grep '^ENGR' ); do log=`git log
freescale-upstream/imx_2.6.35_maintain --grep=".*$c.*"`; [ -n "$log" ]
|| echo "$c is missing"; done


--
Otavio Salvador                             O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br
Mahadevan Mahesh-R9AADQ - April 25, 2013, 7:45 p.m.
Hi Otavio,
The below list of patches are either applied on the Freescales master 2.6.35 branch or are not relevant:
> ENGR00235714-1 is missing
> ENGR00235714-2 is missing
> ENGR00235714-3 is missing
> ENGR00235714-3 is missing
> ENGR00235714-2 is missing
> ENGR00235714-1 is missing
ENGR00237051-x:Revert "ENGR00235714-1 - MX28 USB certification" 
This commit is reverting an earlier commit

> ENGR00236853-2 is missing
This is applied as part of the below commit on the master branch:
ENGR00251985: ENGR00236853-02: [MX28] - add suspend-to-ram feature

> ENGR00238863 is missing
ENGR00238863: usb: gadget: fix the build error
Fixes a build error on the 1.1 branch, does not apply to the master branch

Per my investigation, this branch should have all the patches applied and should be good for MX28 & MX53.

Best regards,
-Mahesh

-----Original Message-----
From: otavio.salvador@gmail.com [mailto:otavio.salvador@gmail.com] On Behalf Of Otavio Salvador
Sent: Friday, April 05, 2013 12:39 PM
To: Fabio Estevam
Cc: Mahadevan Mahesh-R9AADQ; meta-freescale@yoctoproject.org; Angolini Daiane-B19406
Subject: Re: [meta-freescale] [fsl-community-bsp-platform][PATCH] linux-imx (2.6.35): mxs and mx5: Update to latest from FSL GIT

On Fri, Apr 5, 2013 at 2:37 PM, Otavio Salvador <otavio@ossystems.com.br> wrote:
> On Fri, Apr 5, 2013 at 1:50 PM, Fabio Estevam <festevam@gmail.com> wrote:
>> Hi Mahesh,
>>
>> On Thu, Apr 4, 2013 at 4:50 PM, Mahesh Mahadevan
>> <Mahesh.Mahadevan@freescale.com> wrote:
>>> Update to the latest code available from Freescale's GIT repository
>>>
>>> Signed-off-by: Mahesh Mahadevan <Mahesh.Mahadevan@freescale.com>
>>> ---
>>>  recipes-kernel/linux/linux-imx_2.6.35.3.bb | 14 +++++++-------
>>>  1 file changed, 7 insertions(+), 7 deletions(-)
>>>
>>> diff --git a/recipes-kernel/linux/linux-imx_2.6.35.3.bb b/recipes-kernel/linux/linux-imx_2.6.35.3.bb
>>> index 692a290..6d303e2 100644
>>> --- a/recipes-kernel/linux/linux-imx_2.6.35.3.bb
>>> +++ b/recipes-kernel/linux/linux-imx_2.6.35.3.bb
>>> @@ -1,19 +1,19 @@
>>>  # Copyright (C) 2011-2012 Freescale Semiconductor
>>>  # Released under the MIT license (see COPYING.MIT for the terms)
>>>
>>> -PR = "${INC_PR}.22"
>>> +PR = "${INC_PR}.23"
>>>
>>>  include linux-imx.inc
>>>
>>>  COMPATIBLE_MACHINE = "(mxs|mx5)"
>>>
>>> -# Revision of imx_2.6.35_1.1.0 branch
>>> -SRCREV_mxs = "914558e17e95a55ac1eac9a6c219d17d7825f715"
>>> -LOCALVERSION_mxs = "-1.1.0+yocto"
>>> +# Revision of imx_2.6.35_maintain branch
>>> +SRCREV_mxs = "a8e0615aab26a69b306c50d27409d732869e6609"
>>> +LOCALVERSION_mxs = "-mxs+yocto"
>>>
>>> -# Revision of imx_2.6.35_11.09.01 branch
>>> -SRCREV_mx5 = "bc8159027063aded47316b669b1293998337b2ee"
>>> -LOCALVERSION_mx5 = "-11.09.01+yocto"
>>> +# Revision of imx_2.6.35_maintain branch
>>> +SRCREV_mx5 = "a8e0615aab26a69b306c50d27409d732869e6609"
>>> +LOCALVERSION_mx5 = "-mx5+yocto"
>>
>> I haven't seen a patch touching the defconfigs.
>>
>> Does the maintain branch have the latest defconfig for mx28 and mx53?
>
> I did a basic search checking for missing changes in maintain branch.
>
> From 1.1.0 branch:
>
> ENGR00235714-1 is missing
> ENGR00235714-2 is missing
> ENGR00235714-3 is missing
> ENGR00235714-3 is missing
> ENGR00235714-2 is missing
> ENGR00235714-1 is missing
> ENGR00236853-2 is missing
> ENGR00238863 is missing
>
> And I know some are repeated but they appear repeated on the commitlog
> so that's why.

To generate this list:

for c in $(git log --oneline --reverse
freescale-upstream/imx_2.6.35_10.12.01..freescale-upstream/imx_2.6.35_1.1.0
| sed 's,.*\(ENGR[^: ]*\).*,\1,g'| grep '^ENGR' ); do log=`git log
freescale-upstream/imx_2.6.35_maintain --grep=".*$c.*"`; [ -n "$log" ]
|| echo "$c is missing"; done


--
Otavio Salvador                             O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br
Otavio Salvador - April 25, 2013, 8:21 p.m.
On Thu, Apr 25, 2013 at 4:45 PM, Mahadevan Mahesh-R9AADQ
<r9aadq@freescale.com> wrote:
> Hi Otavio,
> The below list of patches are either applied on the Freescales master 2.6.35 branch or are not relevant:
>> ENGR00235714-1 is missing
>> ENGR00235714-2 is missing
>> ENGR00235714-3 is missing
>> ENGR00235714-3 is missing
>> ENGR00235714-2 is missing
>> ENGR00235714-1 is missing
> ENGR00237051-x:Revert "ENGR00235714-1 - MX28 USB certification"
> This commit is reverting an earlier commit

But has this revert been done in 1.1 branch? If not, why?

>> ENGR00236853-2 is missing
> This is applied as part of the below commit on the master branch:
> ENGR00251985: ENGR00236853-02: [MX28] - add suspend-to-ram feature

Ok, good.

>> ENGR00238863 is missing
> ENGR00238863: usb: gadget: fix the build error
> Fixes a build error on the 1.1 branch, does not apply to the master branch

Ok, good.

> Per my investigation, this branch should have all the patches applied and should be good for MX28 & MX53.

We're very close of release so I'd prefer to defer this change once we
release 1.4 version.

Can you rebase this change and resend it after 1.4 release?

--
Otavio Salvador                             O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br
Mahadevan Mahesh-R9AADQ - April 25, 2013, 8:52 p.m.
Yes it was applied and reverted on the 1.1 branch. 

I will re-submit on master after the release.

Best regards,
-Mahesh

-----Original Message-----
From: otavio.salvador@gmail.com [mailto:otavio.salvador@gmail.com] On Behalf Of Otavio Salvador
Sent: Thursday, April 25, 2013 3:21 PM
To: Mahadevan Mahesh-R9AADQ
Cc: Fabio Estevam; meta-freescale@yoctoproject.org; Angolini Daiane-B19406
Subject: Re: [meta-freescale] [fsl-community-bsp-platform][PATCH] linux-imx (2.6.35): mxs and mx5: Update to latest from FSL GIT

On Thu, Apr 25, 2013 at 4:45 PM, Mahadevan Mahesh-R9AADQ
<r9aadq@freescale.com> wrote:
> Hi Otavio,
> The below list of patches are either applied on the Freescales master 2.6.35 branch or are not relevant:
>> ENGR00235714-1 is missing
>> ENGR00235714-2 is missing
>> ENGR00235714-3 is missing
>> ENGR00235714-3 is missing
>> ENGR00235714-2 is missing
>> ENGR00235714-1 is missing
> ENGR00237051-x:Revert "ENGR00235714-1 - MX28 USB certification"
> This commit is reverting an earlier commit

But has this revert been done in 1.1 branch? If not, why?

>> ENGR00236853-2 is missing
> This is applied as part of the below commit on the master branch:
> ENGR00251985: ENGR00236853-02: [MX28] - add suspend-to-ram feature

Ok, good.

>> ENGR00238863 is missing
> ENGR00238863: usb: gadget: fix the build error
> Fixes a build error on the 1.1 branch, does not apply to the master branch

Ok, good.

> Per my investigation, this branch should have all the patches applied and should be good for MX28 & MX53.

We're very close of release so I'd prefer to defer this change once we
release 1.4 version.

Can you rebase this change and resend it after 1.4 release?

--
Otavio Salvador                             O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br

Patch

diff --git a/recipes-kernel/linux/linux-imx_2.6.35.3.bb b/recipes-kernel/linux/linux-imx_2.6.35.3.bb
index 692a290..6d303e2 100644
--- a/recipes-kernel/linux/linux-imx_2.6.35.3.bb
+++ b/recipes-kernel/linux/linux-imx_2.6.35.3.bb
@@ -1,19 +1,19 @@ 
 # Copyright (C) 2011-2012 Freescale Semiconductor
 # Released under the MIT license (see COPYING.MIT for the terms)
 
-PR = "${INC_PR}.22"
+PR = "${INC_PR}.23"
 
 include linux-imx.inc
 
 COMPATIBLE_MACHINE = "(mxs|mx5)"
 
-# Revision of imx_2.6.35_1.1.0 branch
-SRCREV_mxs = "914558e17e95a55ac1eac9a6c219d17d7825f715"
-LOCALVERSION_mxs = "-1.1.0+yocto"
+# Revision of imx_2.6.35_maintain branch
+SRCREV_mxs = "a8e0615aab26a69b306c50d27409d732869e6609"
+LOCALVERSION_mxs = "-mxs+yocto"
 
-# Revision of imx_2.6.35_11.09.01 branch
-SRCREV_mx5 = "bc8159027063aded47316b669b1293998337b2ee"
-LOCALVERSION_mx5 = "-11.09.01+yocto"
+# Revision of imx_2.6.35_maintain branch
+SRCREV_mx5 = "a8e0615aab26a69b306c50d27409d732869e6609"
+LOCALVERSION_mx5 = "-mx5+yocto"
 
 SRC_URI += "file://NFS-Fix-nfsroot-support.patch \
             file://NFS-allow-nfs-root-mount-to-use-alternate-rpc-ports.patch \