From: "Arnd Bergmann" <arnd@arndb.de>
To: "Jernej Skrabec" <jernej@kernel.org>, arm <arm@kernel.org>,
soc@kernel.org
Cc: "Chen-Yu Tsai" <wens@csie.org>,
"Samuel Holland" <samuel@sholland.org>,
linux-arm-kernel@lists.infradead.org,
linux-sunxi@lists.linux.dev
Subject: Re: [GIT PULL] Allwinner device tree changes for 6.3
Date: Mon, 30 Jan 2023 18:19:42 +0100 [thread overview]
Message-ID: <161e4bee-e1c3-4fb1-ab3a-aab5d81796c5@app.fastmail.com> (raw)
In-Reply-To: <Y9Raak4mhdtL0L8e@jernej-laptop>
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?
Arnd
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2023-01-30 17:21 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-27 23:12 [GIT PULL] Allwinner device tree changes for 6.3 Jernej Skrabec
2023-01-30 17:19 ` Arnd Bergmann [this message]
2023-01-30 17:24 ` Arnd Bergmann
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=161e4bee-e1c3-4fb1-ab3a-aab5d81796c5@app.fastmail.com \
--to=arnd@arndb.de \
--cc=arm@kernel.org \
--cc=jernej@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-sunxi@lists.linux.dev \
--cc=samuel@sholland.org \
--cc=soc@kernel.org \
--cc=wens@csie.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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