diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2021-08-23 23:41:27 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2021-08-26 13:47:45 +0200 |
| commit | 6c35ca06974105d929f25f487c6ae7a47fffa128 (patch) | |
| tree | a000dfceb691dace1f488c750a9c4ae250b0b69b /drivers/net/vsockmon.c | |
| parent | e22ce8eb631bdc47a4a4ea7ecf4e4ba499db4f93 (diff) | |
| parent | ed104ca4bd9c405b41e968ad4ece51f6462e90b6 (diff) | |
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>
Diffstat (limited to 'drivers/net/vsockmon.c')
0 files changed, 0 insertions, 0 deletions