| commit | 112e505a76de69f8667e2fe8da38433f754364a8 | [log] [tgz] |
|---|---|---|
| author | Thomas Zimmermann <tzimmermann@suse.de> | Tue Nov 10 17:11:37 2020 +0100 |
| committer | Thomas Zimmermann <tzimmermann@suse.de> | Tue Nov 10 17:11:37 2020 +0100 |
| tree | 75fba3a00d8c093604f83bdd8a3c3c1e0b94f823 | |
| parent | 55c8bcaeccaa5c6d9e7a432ebd0a1717f488a3f4 [diff] | |
| parent | 512bce50a41c528fa15c4c014293e7bebf018658 [diff] |
Merge drm/drm-next into drm-misc-next
We need commit f8f6ae5d077a ("mm: always have io_remap_pfn_range() set
pgprot_decrypted()") to be able to merge Jason's cleanup patch.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>