diff options
author | Olof Johansson <olof@lixom.net> | 2019-04-29 19:53:21 +0300 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2019-04-29 19:53:21 +0300 |
commit | 1e6df9493700e92d26e4699a3f40846129b863e6 (patch) | |
tree | af77e028eb25f3c0828b685d35f469930c71d670 /net/ceph/mon_client.c | |
parent | c687702b5f506c8575881548432dbe26e741ec55 (diff) | |
parent | d005aa750c9b7ca7f77dafd6dda33a0fcb6e7ae3 (diff) | |
download | linux-1e6df9493700e92d26e4699a3f40846129b863e6.tar.xz |
Merge tag 'reset-for-5.2' of git://git.pengutronix.de/pza/linux into arm/drivers
Reset controller changes for v5.2
This adds support for 'acquired'/'released' states to exclusive reset
controls to allow drivers that usually need direct control over their
reset line, to temporarily yield control to another driver, such as a
power domain controller during power transitions. A fix adds missing
headers to linux/reset.h, which caused build errors in linux-next,
discovered by the new lima DRM driver.
* tag 'reset-for-5.2' of git://git.pengutronix.de/pza/linux:
reset: fix linux/reset.h errors
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'net/ceph/mon_client.c')
0 files changed, 0 insertions, 0 deletions