From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 27 Aug 2021 22:59:00 +0000 (-0700)
Subject: Merge tag 'soc-fixes-5.14-4' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
X-Git-Tag: accepted/tizen/unified/20230118.172025~6604
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6f18b82b41147ee15b0b5bf7c9ae0464dda287f9;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'soc-fixes-5.14-4' of git://git./linux/kernel/git/soc/soc

Pull ARM SoC fixes from Arnd Bergmann:
 "Just two trivial fixes from the reset driver tree, nothing else came
  up since the last soc fixes"

* tag 'soc-fixes-5.14-4' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
  reset: reset-zynqmp: Fixed the argument data type
  reset: RESET_MCHP_SPARX5 should depend on ARCH_SPARX5
---

6f18b82b41147ee15b0b5bf7c9ae0464dda287f9