diff options
| author | Daniel Vetter <[email protected]> | 2023-01-31 10:22:15 +0000 |
|---|---|---|
| committer | Daniel Vetter <[email protected]> | 2023-01-31 11:23:23 +0000 |
| commit | aebd8f0c6f8280ba35bc989f4a9ea47469d3589a (patch) | |
| tree | a7c0f61c1827bb2904f453cc055dda138366c438 /drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | |
| parent | Merge tag 'amd-drm-next-6.3-2023-01-27' of https://gitlab.freedesktop.org/agd... (diff) | |
| parent | Linux 6.2-rc6 (diff) | |
| download | kernel-aebd8f0c6f8280ba35bc989f4a9ea47469d3589a.tar.gz kernel-aebd8f0c6f8280ba35bc989f4a9ea47469d3589a.zip | |
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 <[email protected]>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c')
0 files changed, 0 insertions, 0 deletions