[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-Id: <9c7ff142-214a-4329-b288-00f260ba50e3@app.fastmail.com>
Date: Wed, 08 May 2024 21:52:32 +0200
From: "Arnd Bergmann" <arnd@...db.de>
To: "Linus Torvalds" <torvalds@...ux-foundation.org>
Cc: soc@...nel.org, linux-kernel@...r.kernel.org,
linux-arm-kernel@...ts.infradead.org
Subject: Re: [GIT PULL] ARM SoC fixes for 6.9, part 3
On Wed, May 8, 2024, at 19:22, Linus Torvalds wrote:
> On Tue, 7 May 2024 at 23:00, Arnd Bergmann <arnd@...db.de> wrote:
>>
>> ARM SoC fixes for 6.9, part 3
>
> Hmm. Some of this already came in in "part 2", and your diffstat is
> wrong as a result.
>
> You seem to have done the mtk-soc merge again:
>
>> Arnd Bergmann (3):
>> Merge tag 'mtk-soc-fixes-for-v6.9' of https://git.kernel.org/pub/scm/linux/kernel/git/mediatek/linux into for-next
>
> and this part of the diffstat:
>
>> drivers/soc/mediatek/Kconfig | 1 +
>> drivers/soc/mediatek/mtk-svs.c | 7 +++++--
>
> doesn't show up for me because I already had it from your
> soc-fixes-6.9-2 pull request.
>
> I've pulled this, but am a bit confused about how you missed your own
> previous pull..
I'm still not sure either what happened exactly, but I do see
that this is a pull request that I ended up pulling manually
using 'git pull' instead of using 'b4' because it had a malformed
URL, and that confused the rest of the tooling I normally
have in place to avoid this.
Arnd
Powered by blists - more mailing lists