diff options
| author | Maxime Ripard <maxime@cerno.tech> | 2021-03-16 09:06:23 +0100 |
|---|---|---|
| committer | Maxime Ripard <maxime@cerno.tech> | 2021-03-16 09:06:23 +0100 |
| commit | f8bade6c9a6213c2c5ba6e5bf32415ecab6e41e5 (patch) | |
| tree | 474c8fb8df9797b6e0d1e562b389f575c24afc50 /include/linux/ceph/osd_client.h | |
| parent | ccf953d8f3d68e85e577e843fdcde8872b0a9769 (diff) | |
| parent | 51c3b916a4d7e24b4918925965867fdd9bd8dd59 (diff) | |
Merge drm/drm-next into drm-misc-next
Noralf needs some patches in 5.12-rc3, and we've been delaying the 5.12
merge due to the swap issue so it looks like a good time.
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Diffstat (limited to 'include/linux/ceph/osd_client.h')
0 files changed, 0 insertions, 0 deletions