On Mon, 28 Mar 2011, Nicolas Pitre wrote:
> Let's see... I currently have:
>
> $ git diff --shortstat old_linaro-2.6.38..new_linaro-2.6.38
> 805 files changed, 55412 insertions(+), 25203 deletions(-)
>
> $ git diff --shortstat old_linaro-2.6.38..v2.6.38
> 966 files changed, 15985 insertions(
On Mon, Mar 28, 2011, Arnd Bergmann wrote:
> If you worry about the users of the Android tree more than the
> git history of it, there may be another option: Take the diff between
> the old and the new linaro-2.6.38 and apply that on the Android
> tree. After you have fixed up all conflicts you get
On Mon, 28 Mar 2011, john stultz wrote:
> On Mon, 2011-03-28 at 00:06 -0400, Nicolas Pitre wrote:
> > Given those issues, I decided to rebuild the linaro-2.6.38 branch from
> > scratch to see where that would bring me. And as could be expected, the
> > result looks nicer and it is much easier t
On Monday 28 March 2011 20:22:42 john stultz wrote:
> On Mon, 2011-03-28 at 00:06 -0400, Nicolas Pitre wrote:
> > Given those issues, I decided to rebuild the linaro-2.6.38 branch from
> > scratch to see where that would bring me. And as could be expected, the
> > result looks nicer and it is mu
On Mon, 2011-03-28 at 00:06 -0400, Nicolas Pitre wrote:
> Given those issues, I decided to rebuild the linaro-2.6.38 branch from
> scratch to see where that would bring me. And as could be expected, the
> result looks nicer and it is much easier to work with than the current
> tree. For exampl
On Sun, Mar 27, 2011 at 10:06 PM, Nicolas Pitre
wrote:
[...]> Given those issues, I decided to rebuild the linaro-2.6.38 branch from
> scratch to see where that would bring me. And as could be expected, the
> result looks nicer and it is much easier to work with than the current
> tree. For exam
I favor sticking close to mainline unless it irreparably breaks something.
Thanx, Paul
On Mon, Mar 28, 2011 at 12:06:31AM -0400, Nicolas Pitre wrote:
> Hello everyone,
>
> As I've been working on the integration of the latest developments a
The rebuilt branch is fine for me. My tree creation methodology is
patterned after the Ubuntu kernel which means I rebase to new
upstreams each release so I don't mind if my upstreams do as well.
John
On Sun, Mar 27, 2011 at 10:06 PM, Nicolas Pitre
wrote:
> Hello everyone,
>
> As I've been work
Hello everyone,
As I've been working on the integration of the latest developments and
fixes from upstream into the linaro-2.6.38 kernel lately, it became
quickly evident that major merge conflicts were to be expected. The
problem stems from the fact that we opened the 2.6.38 branch early i.e.
