mbox series

[GIT,PULL] ARM SoC fixes for 6.9, part 3

Message ID 7abb76bb-eb4a-4136-af2f-6b22fbf3d79f@app.fastmail.com (mailing list archive)
State New, archived
Headers show
Series [GIT,PULL] ARM SoC fixes for 6.9, part 3 | expand

Pull-request

https://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git tags/soc-fixes-6.9-3

Message

Arnd Bergmann May 8, 2024, 6 a.m. UTC
The following changes since commit 14672a9b3ec5c934cf86658328a56207337b54ff:

  Merge tag 'qcom-drivers-fixes-for-6.9' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into for-next (2024-04-26 18:08:02 +0200)

are available in the Git repository at:

  https://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git tags/soc-fixes-6.9-3

for you to fetch changes up to 5549d1e39989e2ba86c4775546d0bd8055746cfa:

  Merge tag 'qcom-arm64-fixes-for-6.9-2' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into arm/fixes (2024-05-07 08:07:06 +0200)

----------------------------------------------------------------
ARM SoC fixes for 6.9, part 3

These are a couple of last minute fixes that came in over the
previous week, addressing:

 - A pin configuration bug on a qualcomm board that caused
   issues with ethernet and mmc.

 - Two minor code fixes for misleading console output in the
   microchip firmware driver.

 - A build warning in the sifive cache driver

----------------------------------------------------------------
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
      Merge tag 'riscv-soc-fixes-for-v6.9-rc6' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux into arm/fixes
      Merge tag 'qcom-arm64-fixes-for-6.9-2' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into arm/fixes

Conor Dooley (2):
      firmware: microchip: don't unconditionally print validation success
      firmware: microchip: clarify that sizes and addresses are in hex

Samuel Holland (1):
      cache: sifive_ccache: Silence unused variable warning

Volodymyr Babchuk (1):
      arm64: dts: qcom: sa8155p-adp: fix SDHC2 CD pin configuration

 arch/arm64/boot/dts/qcom/sa8155p-adp.dts      | 30 ++++++++++++---------------
 drivers/cache/sifive_ccache.c                 |  2 +-
 drivers/firmware/microchip/mpfs-auto-update.c |  8 ++++---
 drivers/soc/mediatek/Kconfig                  |  1 +
 drivers/soc/mediatek/mtk-svs.c                |  7 +++++--
 5 files changed, 25 insertions(+), 23 deletions(-)

Comments

Linus Torvalds May 8, 2024, 5:22 p.m. UTC | #1
On Tue, 7 May 2024 at 23:00, Arnd Bergmann <arnd@arndb.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..

               Linus
pr-tracker-bot@kernel.org May 8, 2024, 5:24 p.m. UTC | #2
The pull request you sent on Wed, 08 May 2024 08:00:08 +0200:

> https://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git tags/soc-fixes-6.9-3

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/6d7ddd805123e03db0a16c7dbc8509366432a630

Thank you!
Arnd Bergmann May 8, 2024, 7:52 p.m. UTC | #3
On Wed, May 8, 2024, at 19:22, Linus Torvalds wrote:
> On Tue, 7 May 2024 at 23:00, Arnd Bergmann <arnd@arndb.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