mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 09:19:51 +00:00
![]() -----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> |
||
---|---|---|
.. | ||
i915_active.c | ||
i915_gem.c | ||
i915_gem_evict.c | ||
i915_gem_gtt.c | ||
i915_live_selftests.h | ||
i915_mock_selftests.h | ||
i915_perf.c | ||
i915_perf_selftests.h | ||
i915_random.c | ||
i915_random.h | ||
i915_request.c | ||
i915_selftest.c | ||
i915_sw_fence.c | ||
i915_syncmap.c | ||
i915_vma.c | ||
igt_atomic.c | ||
igt_atomic.h | ||
igt_flush_test.c | ||
igt_flush_test.h | ||
igt_live_test.c | ||
igt_live_test.h | ||
igt_mmap.c | ||
igt_mmap.h | ||
igt_reset.c | ||
igt_reset.h | ||
igt_spinner.c | ||
igt_spinner.h | ||
intel_memory_region.c | ||
intel_scheduler_helpers.c | ||
intel_scheduler_helpers.h | ||
intel_uncore.c | ||
lib_sw_fence.c | ||
lib_sw_fence.h | ||
librapl.c | ||
librapl.h | ||
mock_drm.h | ||
mock_gem_device.c | ||
mock_gem_device.h | ||
mock_gtt.c | ||
mock_gtt.h | ||
mock_region.c | ||
mock_region.h | ||
mock_request.c | ||
mock_request.h | ||
mock_uncore.c | ||
mock_uncore.h | ||
scatterlist.c |