mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-08-05 16:54:27 +00:00
71e4a70290
probe fix for vga16fb, a locking fix for the CMA dma-buf heap and a
compilation fix for ttm.
-----BEGIN PGP SIGNATURE-----
iHUEABYKAB0WIQRcEzekXsqa64kGDp7j7w1vZxhRxQUCYeFyZQAKCRDj7w1vZxhR
xel6AQCm6cP8oxsADsMgKCmJQXff0a3/AH+LhXAsl0bX5coUVQEAwN2tsBgjJi2D
R8imZ0Ex9llmuxAGx6izKSyyFmeLKAM=
=teXV
-----END PGP SIGNATURE-----
Merge tag 'drm-misc-fixes-2022-01-14' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
Two DT bindings fixes for meson, a device refcounting fix for sun4i, a
probe fix for vga16fb, a locking fix for the CMA dma-buf heap and a
compilation fix for ttm.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
[danvet: I made sure I have exactly the same conflict resolution as
Linus in
|
||
|---|---|---|
| .. | ||
| dispnv04 | ||
| dispnv50 | ||
| include | ||
| nvif | ||
| nvkm | ||
| Kbuild | ||
| Kconfig | ||
| nouveau_abi16.c | ||
| nouveau_abi16.h | ||
| nouveau_acpi.c | ||
| nouveau_acpi.h | ||
| nouveau_backlight.c | ||
| nouveau_bios.c | ||
| nouveau_bios.h | ||
| nouveau_bo.c | ||
| nouveau_bo.h | ||
| nouveau_bo0039.c | ||
| nouveau_bo74c1.c | ||
| nouveau_bo85b5.c | ||
| nouveau_bo90b5.c | ||
| nouveau_bo5039.c | ||
| nouveau_bo9039.c | ||
| nouveau_boa0b5.c | ||
| nouveau_chan.c | ||
| nouveau_chan.h | ||
| nouveau_connector.c | ||
| nouveau_connector.h | ||
| nouveau_crtc.h | ||
| nouveau_debugfs.c | ||
| nouveau_debugfs.h | ||
| nouveau_display.c | ||
| nouveau_display.h | ||
| nouveau_dma.c | ||
| nouveau_dma.h | ||
| nouveau_dmem.c | ||
| nouveau_dmem.h | ||
| nouveau_dp.c | ||
| nouveau_drm.c | ||
| nouveau_drv.h | ||
| nouveau_encoder.h | ||
| nouveau_fbcon.c | ||
| nouveau_fbcon.h | ||
| nouveau_fence.c | ||
| nouveau_fence.h | ||
| nouveau_gem.c | ||
| nouveau_gem.h | ||
| nouveau_hwmon.c | ||
| nouveau_hwmon.h | ||
| nouveau_ioc32.c | ||
| nouveau_ioctl.h | ||
| nouveau_led.c | ||
| nouveau_led.h | ||
| nouveau_mem.c | ||
| nouveau_mem.h | ||
| nouveau_nvif.c | ||
| nouveau_platform.c | ||
| nouveau_platform.h | ||
| nouveau_prime.c | ||
| nouveau_reg.h | ||
| nouveau_sgdma.c | ||
| nouveau_svm.c | ||
| nouveau_svm.h | ||
| nouveau_ttm.c | ||
| nouveau_ttm.h | ||
| nouveau_usif.c | ||
| nouveau_usif.h | ||
| nouveau_vga.c | ||
| nouveau_vga.h | ||
| nouveau_vmm.c | ||
| nouveau_vmm.h | ||
| nv04_fbcon.c | ||
| nv04_fence.c | ||
| nv10_fence.c | ||
| nv10_fence.h | ||
| nv17_fence.c | ||
| nv50_display.h | ||
| nv50_fbcon.c | ||
| nv50_fence.c | ||
| nv84_fence.c | ||
| nvc0_fbcon.c | ||
| nvc0_fence.c | ||