tree 474c8fb8df9797b6e0d1e562b389f575c24afc50
parent ccf953d8f3d68e85e577e843fdcde8872b0a9769
parent 51c3b916a4d7e24b4918925965867fdd9bd8dd59
author Maxime Ripard <maxime@cerno.tech> 1615881983 +0100
committer Maxime Ripard <maxime@cerno.tech> 1615881983 +0100
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iHUEABYIAB0WIQRcEzekXsqa64kGDp7j7w1vZxhRxQUCYFBnOQAKCRDj7w1vZxhR
 xVhkAQCccQRrRtfx5ZH+AzuZPt++Of3d+ZyyjP23Mu0lh3ByPgD/Wfem8v6ZMueb
 CFKSEb5N3dsgxnSNX6vYTH+5tS+ksQE=
 =f1Rk
 -----END PGP SIGNATURE-----

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>