linux-kernel - Re: linux-next: duplicate patches in the sophgo tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID:
 <MA0P287MB282200D15F3A93CE187FA66FFE9E2@MA0P287MB2822.INDP287.PROD.OUTLOOK.COM>
Date: Fri, 6 Sep 2024 11:24:14 +0800
From: Chen Wang <unicorn_wang@...look.com>
To: Stephen Rothwell <sfr@...b.auug.org.au>,
 Inochi Amaoto <inochiama@...look.com>, Olof Johansson <olof@...om.net>,
 Arnd Bergmann <arnd@...db.de>
Cc: ARM <linux-arm-kernel@...ts.infradead.org>,
 Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
 Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: duplicate patches in the sophgo tree

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?

Thanks,

Chen

On 2024/9/6 10:04, Stephen Rothwell wrote:
> Hi all,
>
> The following commits are also in the arm-soc tree as different commits
> (but the same patches):
>
>    0014d11186f5 ("riscv: dts: sophgo: Add sdhci0 configuration for Huashan Pi")
>    161477baee0f ("riscv: dts: sophgo: Add i2c device support for sg2042")
>    33ae4c56cacf ("riscv: sophgo: dts: add mmc controllers for SG2042 SoC")
>    47e5a8daf0b9 ("dt-bindings: riscv: Add Sipeed LicheeRV Nano board compatibles
> ")
>    4f8fb973389d ("riscv: sophgo: dts: add gpio controllers for SG2042 SoC")
>    7f3cf53e4c65 ("riscv: dts: sophgo: Use common "interrupt-parent" for all peri
> pherals for sg2042")
>    c0a4490b120f ("riscv: dts: sophgo: cv18xx: add DMA controller")
>    e8b4716e68ba ("riscv: dts: sophgo: Add mcu device for Milk-V Pioneer")
>    f9cc479ddc8c ("dt-bindings: interrupt-controller: Add SOPHGO SG2002 plic")
>