From: Arnd Bergmann Date: Mon, 9 Jan 2023 22:16:08 +0000 (+0100) Subject: Merge tag 'reset-fixes-for-v6.2' of git://git.pengutronix.de/pza/linux into arm/fixes X-Git-Tag: v6.6.17~5727^2~12 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=97bcdf24e00075cf37ee4cbd63f07f54e25c5265;p=platform%2Fkernel%2Flinux-rpi.git 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 --- 97bcdf24e00075cf37ee4cbd63f07f54e25c5265