From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 23 Aug 2021 21:41:27 +0000 (+0200)
Subject: Merge tag 'reset-fixes-for-v5.14' of git://git.pengutronix.de/pza/linux into arm... 
X-Git-Tag: microblaze-v5.16~235^2
X-Git-Url: http://git.monstr.eu/?p=linux-2.6-microblaze.git;a=commitdiff_plain;h=6c35ca06974105d929f25f487c6ae7a47fffa128

Merge tag 'reset-fixes-for-v5.14' of git://git.pengutronix.de/pza/linux into arm/fixes

Reset controller fixes for v5.14

Hide the Sparx5 reset driver unless the ARCH_SPARX5 or COMPILE_TEST
options are enabled, to avoid unnecessarily asking users about this
driver. Fix a return value argument type in the ZynqMP reset driver.

* tag 'reset-fixes-for-v5.14' of git://git.pengutronix.de/pza/linux:
  reset: reset-zynqmp: Fixed the argument data type
  reset: RESET_MCHP_SPARX5 should depend on ARCH_SPARX5

Link: https://lore.kernel.org/r/e543959c5b5ee7b25686f81049bf187d602daeda.camel@pengutronix.de
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

6c35ca06974105d929f25f487c6ae7a47fffa128