mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 09:19:51 +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> |
||
|---|---|---|
| .. | ||
| aperture_gm.c | ||
| cfg_space.c | ||
| cmd_parser.c | ||
| cmd_parser.h | ||
| debug.h | ||
| debugfs.c | ||
| display.c | ||
| display.h | ||
| dmabuf.c | ||
| dmabuf.h | ||
| edid.c | ||
| edid.h | ||
| execlist.c | ||
| execlist.h | ||
| fb_decoder.c | ||
| fb_decoder.h | ||
| firmware.c | ||
| gtt.c | ||
| gtt.h | ||
| gvt.h | ||
| handlers.c | ||
| interrupt.c | ||
| interrupt.h | ||
| kvmgt.c | ||
| Makefile | ||
| mmio.c | ||
| mmio.h | ||
| mmio_context.c | ||
| mmio_context.h | ||
| opregion.c | ||
| page_track.c | ||
| page_track.h | ||
| reg.h | ||
| sched_policy.c | ||
| sched_policy.h | ||
| scheduler.c | ||
| scheduler.h | ||
| trace.h | ||
| trace_points.c | ||
| vgpu.c | ||