Re: [GIT PULL 1/2] SoCFPGA DTS updates for v7.4

["Arnd Bergmann" <arnd@arndb.de>]

On Wed, Oct 21, 2026, at 22:33, Dinh Nguyen wrote:
> On 10/21/26 13:26, Alexandre Belloni wrote:
>> On 21/10/2026 18:46:39+0200, Arnd Bergmann wrote:
>>> On Mon, Oct 19, 2026, at 15:21, Dinh Nguyen wrote:
>>>
>>> Sorry for missing this: Alexandre pointed out that when he looked
>>> at the branch it was not part of linux-next and did not pull it,
>>> and I assumed that he had notified you about it when I did the
>>> final merges for 7.4.
>>>
>>> I see that you have a for-next branch with a different set of commit
>>> IDs but overlapping contents. Can you explain what is going on?
>>> I normall expect that whatever you send for inclusion in the soc
>>> tree has seen some time in linux-next using the exact git commits.
>
> Yes, I was aware of the linux-next requirement and have been placing the 
> commits into the for-next branch. I was cherry-picking the commits into 
> my for-next branch. I didn't realized you needed to preserve the same 
> commit IDs as well. I will change my process to keep the same commit IDs 
> going forward.

Thanks! There are two reasons for requiring the exact commits here:

 - we all rely on scripts to check if commits are merged already,
   and those break if the changesets are different.

 - once the branch gets merged into the soc tree, it may conflict
   with the same patches in another branch, at least if there are
   multiple patches touching the same lines.

      Arnd