[GIT PULL] Allwinner device tree changes for 6.3

[Arnd Bergmann]

On Mon, Jan 30, 2023, at 18:19, Arnd Bergmann wrote:
> On Sat, Jan 28, 2023, at 00:12, Jernej Skrabec wrote:
>> Hi!
>>
>> Please pull following device tree changes for 6.3. Note that this PR
>> depends on following immutable tag:
>>
>> https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git 
>> soc2arch-immutable
>>
>> Let me know if I should split this PR into two, one for ARM and another
>> for RISC-V.
>>
>> Best regards,
>> Jernej
>>
>> The following changes since commit 3af577f9826fdddefac42b35fc5eb3912c5b7d85:
>>
>>   RISC-V: stop directly selecting drivers for SOC_CANAAN (2022-12-27 
>> 18:01:40 +0000)
>>
>> are available in the Git repository at:
>>
>>   https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git 
>> tags/sunxi-dt-for-6.3-1
>>
>> for you to fetch changes up to dca36f7b3dd7eb574f0958484d3d21cfd8af2651:
>>
>>   riscv: dts: allwinner: d1: Add power controller node (2023-01-27 
>> 23:21:06 +0100)
>
> Something looks wrong here, I get an error when pulling this:
>
> ERROR: commit-id mismatch between pull request and remote
>        msg=dca36f7b3dd7eb574f0958484d3d21cfd8af2651, 
> remote=3af577f9826fdddefac42b35fc5eb3912c5b7d85
> Topmost hash is not the same. Expected 
> dca36f7b3dd7eb574f0958484d3d21cfd8af2651
>
> Can you check what happened and then either push the correct branch
> or send a new pull request, depending on which one has the intended
> commit?

nevermind, I see what happened: the script parsed the pull
request incorrectly and tried to pull the soc2arch-immutable
tag instead of your tags/sunxi-dt-for-6.3-1 tag.

I can handle that here and fix it up then, it's not your fault.

Combining the risc-v and arm bits is fine as long as this makes
sense as a branch overall. If you have too many different things
in one branch, it makes sense to split it up along some boundary,
but that does not have to be between architectures, just based
on what makes the most sensible changelog text in each pull
request.

     Arnd