diff options
| author | Arnd Bergmann <[email protected]> | 2021-08-23 21:41:27 +0000 |
|---|---|---|
| committer | Arnd Bergmann <[email protected]> | 2021-08-26 11:47:45 +0000 |
| commit | 6c35ca06974105d929f25f487c6ae7a47fffa128 (patch) | |
| tree | a000dfceb691dace1f488c750a9c4ae250b0b69b /net/unix/af_unix.c | |
| parent | Linux 5.14-rc7 (diff) | |
| parent | reset: reset-zynqmp: Fixed the argument data type (diff) | |
| download | kernel-6c35ca06974105d929f25f487c6ae7a47fffa128.tar.gz kernel-6c35ca06974105d929f25f487c6ae7a47fffa128.zip | |
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/[email protected]
Signed-off-by: Arnd Bergmann <[email protected]>
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions