From: Chen Wang <unicorn_wang@outlook•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Inochi Amaoto <inochiama@outlook•com>,
Olof Johansson <olof@lixom•net>, Arnd Bergmann <arnd@arndb•de>,
ARM <linux-arm-kernel@lists•infradead.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: Re: linux-next: duplicate patches in the sophgo tree
Date: Fri, 6 Sep 2024 13:34:25 +0800 [thread overview]
Message-ID: <MA0P287MB28229FEF2DA245AAA82DF5DBFE9E2@MA0P287MB2822.INDP287.PROD.OUTLOOK.COM> (raw)
In-Reply-To: <20240906134030.6c440803@canb.auug.org.au>
On 2024/9/6 11:40, Stephen Rothwell wrote:
> Hi Chen,
>
> On Fri, 6 Sep 2024 11:24:14 +0800 Chen Wang <unicorn_wang@outlook•com> wrote:
>> 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?
> If you are submitting everything that is in the for-next branch, you
> should just submit that branch as is, that way you have submitted what
> has been tested and all the commit id's will not change.
>
> However, if you are submitting a subset, you should probably create a
> branch with that subset (as you did) and then rebase the for-next
> branch on top of that and then test the result yourself and then let it
> it in linux-next for a day or 2 (to check for any new conflicts - there
> should be none). After that, you should submit the subset branch to
> arm-soc. This way (again) you have submitted what has been tested and
> all the commit id's will not change.
>
> Right now, you should rebase your for-next branch onto your
> riscv-sophgo-dt-for-next branch so that the duplicate patches are
> removed (they will be the same commits in both trees).
Thanks, Stephen. I have updated the sophgo/for-next.
Regards,
Chen
next prev parent reply other threads:[~2024-09-06 5:34 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-06 2:04 linux-next: duplicate patches in the sophgo tree Stephen Rothwell
2024-09-06 3:24 ` Chen Wang
2024-09-06 3:40 ` Stephen Rothwell
2024-09-06 5:34 ` Chen Wang [this message]
2024-09-06 6:54 ` Arnd Bergmann
2024-09-06 8:12 ` Chen Wang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=MA0P287MB28229FEF2DA245AAA82DF5DBFE9E2@MA0P287MB2822.INDP287.PROD.OUTLOOK.COM \
--to=unicorn_wang@outlook$(echo .)com \
--cc=arnd@arndb$(echo .)de \
--cc=inochiama@outlook$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=olof@lixom$(echo .)net \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox