| commit | 99b03ca651f1c409d296d6c6e9440d9b005c722f | [log] [tgz] |
|---|---|---|
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | Tue Dec 14 09:43:25 2021 +0100 |
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | Tue Dec 14 10:24:28 2021 +0100 |
| tree | 8773b8cbab631258b561ddb3d9b219072095bee4 | |
| parent | 211b4dbc070090b4183d6f9db7dd3bd4e6170447 [diff] | |
| parent | 2585cf9dfaaddf00b069673f27bb3f8530e2039c [diff] |
Merge v5.16-rc5 into drm-next
Thomas Zimmermann requested a fixes backmerge, specifically also for
96c5f82ef0a1 ("drm/vc4: fix error code in vc4_create_object()")
Just a bunch of adjacent changes conflicts, even the big pile of them
in vc4.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>