mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 17:30:02 +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> |
||
|---|---|---|
| .. | ||
| adreno | ||
| disp | ||
| dp | ||
| dsi | ||
| hdmi | ||
| Kconfig | ||
| Makefile | ||
| msm_atomic.c | ||
| msm_atomic_trace.h | ||
| msm_atomic_tracepoints.c | ||
| msm_debugfs.c | ||
| msm_debugfs.h | ||
| msm_drv.c | ||
| msm_drv.h | ||
| msm_fb.c | ||
| msm_fbdev.c | ||
| msm_fence.c | ||
| msm_fence.h | ||
| msm_gem.c | ||
| msm_gem.h | ||
| msm_gem_prime.c | ||
| msm_gem_shrinker.c | ||
| msm_gem_submit.c | ||
| msm_gem_vma.c | ||
| msm_gpu.c | ||
| msm_gpu.h | ||
| msm_gpu_devfreq.c | ||
| msm_gpu_trace.h | ||
| msm_gpu_tracepoints.c | ||
| msm_gpummu.c | ||
| msm_io_utils.c | ||
| msm_iommu.c | ||
| msm_kms.h | ||
| msm_mdss.c | ||
| msm_mmu.h | ||
| msm_perf.c | ||
| msm_rd.c | ||
| msm_ringbuffer.c | ||
| msm_ringbuffer.h | ||
| msm_submitqueue.c | ||
| NOTES | ||