From: Olof Johansson Date: Wed, 22 Mar 2017 00:30:51 +0000 (-0700) Subject: Merge tag 'reset-fixes-for-4.11' of git://git.pengutronix.de/git/pza/linux into fixes X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=6014ce8559934580c919485fdc96b4d2d4b18c12;p=openwrt%2Fstaging%2Fblogic.git Merge tag 'reset-fixes-for-4.11' of git://git.pengutronix.de/git/pza/linux into fixes Reset controller fixes for v4.11 Fix optional reset_control_get_stubs to return NULL and remove warnings from reset_control_* stubs. This fixes commit bb475230b8e5 ("reset: make optional functions really optional"), which was merged in reset-for-4.11, and would cause consumer drivers depending on the new behaviour of optional resets to fail probing if RESET_CONTROLLER Kconfig option is disabled. * tag 'reset-fixes-for-4.11' of git://git.pengutronix.de/git/pza/linux: reset: fix optional reset_control_get stubs to return NULL Signed-off-by: Olof Johansson --- 6014ce8559934580c919485fdc96b4d2d4b18c12