Skip to contentSkip to conversation

linux-4.4.y-cip-rebase: patches in wrong order?

DISCUSSION Pavel Machek 2 participants 3 messages May 5, 2022 – May 19, 2022

lore
Share & tools
lore
#0 lore raw

Hi!

In previous linux-4.4.y-cip-rebases, order of patches was:

git log:
[CIP patches]
[Greg's stable tree]
[Linus tree]

With start of self-maintainance, we now have:

git log:
[-st patches]
[CIP patches]
[Greg's stable tree]
[Linus tree]

This was unexpected for me, may be unexpected for our users, and would make -cip-rt release different to previous ones. COuld we get order of patches be

git log:
[CIP patches]
[-st patches]
[Greg's stable tree]
[Linus tree]

?

(Simply ... put the stable patches where they would be if Greg continued doing them).

Best regards,
Pavel

Signature · 2 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
#1 lore raw

Hi Pavel,

Sorry, reply was late.

Quoted 20 lines

In previous linux-4.4.y-cip-rebases, order of patches was:

git log:
[CIP patches]
[Greg's stable tree]
[Linus tree]

With start of self-maintainance, we now have:

git log:
[-st patches]
[CIP patches]
[Greg's stable tree]
[Linus tree]

This was unexpected for me, may be unexpected for our users, and would make -cip-rt release different to previous ones. COuld we get order of patches be

Quoted 5 lines

git log:
[CIP patches]
[-st patches]
[Greg's stable tree]
[Linus tree]

Indeed.
I will revert to the commit order above, and force-push.

Best regards,
Nobuhiro

#2 lore raw

Hi,

Quoted 4 lines
Quoted 4 lines

This was unexpected for me, may be unexpected for our users, and would make -cip-rt release different to previous ones. COuld we get order of patches be

Quoted 8 lines
Quoted 5 lines

git log:
[CIP patches]
[-st patches]
[Greg's stable tree]
[Linus tree]

Indeed.
I will revert to the commit order above, and force-push.

I updated linux-4.4.y-cip-rebases branch and v4.4.302-cip69-rebase.

Best regards,
Nobuhiro

Quoted 41 lines

-----Original Message-----
From: iwamatsu nobuhiro(岩松 信洋 □SWC◯ACT)
Sent: Thursday, May 19, 2022 8:40 AM
To: [email protected]; [email protected]
Subject: RE: [cip-dev] linux-4.4.y-cip-rebase: patches in wrong order?

Hi Pavel,

Sorry, reply was late.

Quoted 20 lines

In previous linux-4.4.y-cip-rebases, order of patches was:

git log:
[CIP patches]
[Greg's stable tree]
[Linus tree]

With start of self-maintainance, we now have:

git log:
[-st patches]
[CIP patches]
[Greg's stable tree]
[Linus tree]

This was unexpected for me, may be unexpected for our users, and would make -cip-rt release different to previous ones. COuld we get order of patches be

Quoted 5 lines

git log:
[CIP patches]
[-st patches]
[Greg's stable tree]
[Linus tree]

Indeed.
I will revert to the commit order above, and force-push.

Best regards,
Nobuhiro