diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2023-01-09 23:16:08 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2023-01-09 23:16:09 +0100 |
| commit | 97bcdf24e00075cf37ee4cbd63f07f54e25c5265 (patch) | |
| tree | 159e8133603588941ad504fe7e656e11d38b287a /arch/arm/mach-asm9260 | |
| parent | 13d159553ef2c2b68d5c643db4491999f8b6bbb1 (diff) | |
| parent | 3a2390c6777e3f6662980c6cfc25cafe9e4fef98 (diff) | |
Merge tag 'reset-fixes-for-v6.2' of git://git.pengutronix.de/pza/linux into arm/fixes
Reset controller fixes for v6.2
Avoid a build error by disabling the invalid combination of building
reset-ti-sci built-in but ti-sci as a module.
Fix a possible NULL pointer dereference in reset-uniphier-glue in case
platform_get_resource() fails.
* tag 'reset-fixes-for-v6.2' of git://git.pengutronix.de/pza/linux:
reset: uniphier-glue: Fix possible null-ptr-deref
reset: ti-sci: honor TI_SCI_PROTOCOL setting when not COMPILE_TEST
Link: https://lore.kernel.org/r/20230104095855.3809733-1-p.zabel@pengutronix.de
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-asm9260')
0 files changed, 0 insertions, 0 deletions