diff options
| author | Cristian Ciocaltea <cristian.ciocaltea@collabora.com> | 2023-08-07 19:26:47 +0300 |
|---|---|---|
| committer | Cristian Ciocaltea <cristian.ciocaltea@collabora.com> | 2023-08-09 13:34:36 +0300 |
| commit | b4761bb75906e99afba2f3a7b44d2f91e8ba1796 (patch) | |
| tree | 106b56b8ec6b01a9045bffc02edf0fa618575bfa /arch/x86/entry/vdso/vma.c | |
| parent | 095296c0150727de99dacd2981152ec36af25192 (diff) | |
| parent | 52a953d0934b17a88f403b4135eb3cdf83d19f91 (diff) | |
| download | linux-b4761bb75906e99afba2f3a7b44d2f91e8ba1796.tar.gz | |
Merge tag 'v6.1.43' into 6.1/features/merge-fixes
Fix conflicts: drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c drivers/gpu/drm/amd/display/dc/core/dc.c drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c drivers/gpu/drm/amd/display/dc/dc.h drivers/gpu/drm/amd/display/dc/dcn315/dcn315_resource.c drivers/gpu/drm/amd/display/dc/dml/dcn314/dcn314_fpu.c drivers/gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c drivers/gpu/drm/amd/display/dc/inc/dc_link_dp.h drivers/gpu/drm/amd/display/dmub/src/dmub_dcn314.c drivers/gpu/drm/amd/display/dmub/src/dmub_dcn314.h drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c drivers/gpu/drm/drm_fb_helper.c Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
Diffstat (limited to 'arch/x86/entry/vdso/vma.c')
0 files changed, 0 insertions, 0 deletions