linux-next: duplicate patches in the sophgo tree

Chen Wang unicorn_wang at outlook.com
Fri Sep 6 01:12:26 PDT 2024


On 2024/9/6 14:54, Arnd Bergmann wrote:
> On Fri, Sep 6, 2024, at 03:24, Chen Wang wrote:
>> Hi,Stephen,
>>
>> The arm-soc tree contains these patches is due to I submited a PR to
>> Arnd and he merged this today.
>>
>> And for the sophgo/for-next branch, it does contains these patches. I
>> created the PR branch(sophgo/riscv-sophgo-dt-for-next) and cherry-picked
>> these patches from sophgo/for-next and submited the PR. I see the
>> commits in arm-soc are the same as that from
>> sophgo/riscv-sophgo-dt-for-next, but they are different against the
>> commit ids from sophgo/for-next due to cherry-pick operation.
>>
>> So my question is, do we need to make sure commit id the same between PR
>> branch and sophgo/for-next branch?
> It certainly makes things easier for everyone if you have the
> same commit IDs, yes. Aside from tripping Stephen's sanity checks,
> having rebased commits in your tree also means that the branch that
> gets tested is different from the one that gets merged.
>
> If you have multiple branches that you want to be in linux-next but
> get merged through different upstream trees, your for-next branch
> would normally just be a merge of those rather than a cherry-pick.
>
> [Side note: you should also ensure that each of those branches
> individually works correctly, i.e. it may add features that only work
> when combined with the other branches, but it never introduces
> regressions when merged without the other ones.]
>
>        Arnd

Thank you Arnd for your careful explaination. I will pay attention to 
these issues later.

Regards,

Chen





More information about the linux-arm-kernel mailing list