mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-08-05 16:54:27 +00:00
aebd8f0c6f
-----BEGIN PGP SIGNATURE----- iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAmPW7E8eHHRvcnZhbGRz QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiGf7MIAI0JnHN9WvtEukSZ E6j6+cEGWxsvD6q0g3GPolaKOCw7hlv0pWcFJFcUAt0jebspMdxV2oUGJ8RYW7Lg nCcHvEVswGKLAQtQSWw52qotW6fUfMPsNYYB5l31sm1sKH4Cgss0W7l2HxO/1LvG TSeNHX53vNAZ8pVnFYEWCSXC9bzrmU/VALF2EV00cdICmfvjlgkELGXoLKJJWzUp s63fBHYGGURSgwIWOKStoO6HNo0j/F/wcSMx8leY8qDUtVKHj4v24EvSgxUSDBER ch3LiSQ6qf4sw/z7pqruKFthKOrlNmcc0phjiES0xwwGiNhLv0z3rAhc4OM2cgYh SDc/Y/c= =zpaD -----END PGP SIGNATURE----- Merge v6.2-rc6 into drm-next Due to holidays we started -next with more -fixes in-flight than usual, and people have been asking where they are. Backmerge to get things better in sync. Conflicts: - Tiny conflict in drm_fbdev_generic.c between variable rename and missing error handling that got added. - Conflict in drm_fb_helper.c between the added call to vgaswitcheroo in drm_fb_helper_single_fb_probe and a refactor patch that extracted lots of helpers and incidentally removed the dev local variable. Readd it to make things compile. Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> |
||
|---|---|---|
| .. | ||
| device_include | ||
| Kconfig | ||
| Makefile | ||
| ttm_object.c | ||
| ttm_object.h | ||
| vmw_surface_cache.h | ||
| vmwgfx_binding.c | ||
| vmwgfx_binding.h | ||
| vmwgfx_blit.c | ||
| vmwgfx_bo.c | ||
| vmwgfx_cmd.c | ||
| vmwgfx_cmdbuf.c | ||
| vmwgfx_cmdbuf_res.c | ||
| vmwgfx_context.c | ||
| vmwgfx_cotable.c | ||
| vmwgfx_devcaps.c | ||
| vmwgfx_devcaps.h | ||
| vmwgfx_drv.c | ||
| vmwgfx_drv.h | ||
| vmwgfx_execbuf.c | ||
| vmwgfx_fence.c | ||
| vmwgfx_fence.h | ||
| vmwgfx_gem.c | ||
| vmwgfx_gmr.c | ||
| vmwgfx_gmrid_manager.c | ||
| vmwgfx_ioctl.c | ||
| vmwgfx_irq.c | ||
| vmwgfx_kms.c | ||
| vmwgfx_kms.h | ||
| vmwgfx_ldu.c | ||
| vmwgfx_mksstat.h | ||
| vmwgfx_mob.c | ||
| vmwgfx_msg.c | ||
| vmwgfx_msg_arm64.h | ||
| vmwgfx_msg_x86.h | ||
| vmwgfx_overlay.c | ||
| vmwgfx_page_dirty.c | ||
| vmwgfx_prime.c | ||
| vmwgfx_reg.h | ||
| vmwgfx_resource.c | ||
| vmwgfx_resource_priv.h | ||
| vmwgfx_scrn.c | ||
| vmwgfx_shader.c | ||
| vmwgfx_simple_resource.c | ||
| vmwgfx_so.c | ||
| vmwgfx_so.h | ||
| vmwgfx_stdu.c | ||
| vmwgfx_streamoutput.c | ||
| vmwgfx_surface.c | ||
| vmwgfx_system_manager.c | ||
| vmwgfx_ttm_buffer.c | ||
| vmwgfx_ttm_glue.c | ||
| vmwgfx_va.c | ||
| vmwgfx_validation.c | ||
| vmwgfx_validation.h | ||