From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 5 Jan 2018 11:24:25 +0000 (+0100)
Subject: Merge tag 'reset-for-4.16' of git://git.pengutronix.de/git/pza/linux into next/drivers
X-Git-Tag: v4.16-rc1~98^2~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c8ac0b10fd941d31295eed01acc1564415390f39;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'reset-for-4.16' of git://git.pengutronix.de/git/pza/linux into next/drivers

Pull "Reset controller changes for v4.16" from Philipp Zabel:

This adds Meson-AXG reset support and fixes a few issues with the reset
include header: device_reset_optional is fixed to be really optional,
unused headers are pruned, and useless warnings and deprecated API calls
are removed.

* tag 'reset-for-4.16' of git://git.pengutronix.de/git/pza/linux:
  reset: meson-axg: add compatible string for Meson-AXG SoC
  dt-bindings: reset: Add bindings for the Meson-AXG SoC Reset Controller
  reset: remove reset_control_get(_optional)
  reset: minimize the number of headers included from <linux/reset.h>
  reset: remove remaining WARN_ON() in <linux/reset.h>
  reset: make device_reset_optional() really optional
---

c8ac0b10fd941d31295eed01acc1564415390f39