linux-next: manual merge of the drm tree with the drm-intel-fixes tree

2023-04-17 Thread broonie
Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/i915/display/intel_dp_aux.c between commit: e1c71f8f91804 ("drm/i915: Fix fast wake AUX sync len") from the drm-intel-fixes tree and commit: 605f7c7313334 ("drm/i915: Fix fast wake AUX sync len") from

linux-next: manual merge of the drm-misc tree with the mm-stable tree

2023-04-14 Thread broonie
Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/ttm/ttm_pool.c between commit: 23baf831a32c0 ("mm, treewide: redefine MAX_ORDER sanely") from the mm-stable tree and commit: 56e51681246e5 ("drm/ttm: revert "Reduce the number of used allocation

linux-next: manual merge of the drm tree with the drm-fixes tree

2022-09-26 Thread broonie
Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource_helpers.c between commit: 58d97c99c99f4 ("drm/amd/display: Update MBLK calculation for SubVP") from the drm-fixes tree and commits: 41c81dcf59991 ("drm/amd/display:

linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree

2022-02-25 Thread broonie
Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/i915/display/intel_snps_phy.c between commit: 28adef861233c ("drm/i915/dg2: Print PHY name properly on calibration error") from the drm-intel-fixes tree and commits: 84073e568eec7 ("drm/i915/dg2:

linux-next: build failure after merge of the drm tree

2022-02-25 Thread broonie
Hi all, After merging the drm tree, today's linux-next build (x86 allmodconfig) failed like this: lib/strncpy_from_user.o: warning: objtool: strncpy_from_user()+0x10b: call to do_strncpy_from_user() with UACCESS enabled lib/strnlen_user.o: warning: objtool: strnlen_user()+0xbb: call to

linux-next: manual merge of the drm tree with the drm-fixes tree

2022-02-25 Thread broonie
Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/amd/amdgpu/amdgpu_display.c between commit: e2b993302f40c ("drm/amdgpu: bypass tiling flag check in virtual display case (v2)") from the drm-fixes tree and commit: 2af104290da5e ("drm: introduce

linux-next: manual merge of the drm tree with the drm-intel-fixes tree

2022-02-25 Thread broonie
Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/i915/display/intel_snps_phy.c between commit: 28adef861233c ("drm/i915/dg2: Print PHY name properly on calibration error") from the drm-intel-fixes tree and commits: c5274e86da5fe ("drm/i915/snps:

linux-next: manual merge of the drm-intel tree with the drm-intel-gt tree

2022-02-24 Thread broonie
Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c between commit: 721fd84ea1fe9 ("drm/i915/pmu: Use PM timestamp instead of RING TIMESTAMP for reference") from the drm-intel-gt tree and commit: b3f74938d6566

linux-next: manual merge of the drm tree with the drm-fixes tree

2022-02-24 Thread broonie
Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/amd/display/dc/core/dc_resource.c between commit: 3743e7f6fcb93 ("drm/amd/display: Fix stream->link_enc unassigned during stream removal") from the drm-fixes tree and commits: 6d33f0e820bfb

linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree

2022-02-23 Thread broonie
Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/i915/display/intel_bw.c between commit: ec663bca9128f ("drm/i915: Fix bw atomic check when switching between SAGV vs. no SAGV") from the drm-intel-fixes tree and commit: 6d8ebef53c2cc ("drm/i915:

linux-next: manual merge of the drm tree with the drm-intel-fixes tree

2022-02-22 Thread broonie
Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/i915/display/intel_snps_phy.c between commit: 28adef861233c ("drm/i915/dg2: Print PHY name properly on calibration error") from the drm-intel-fixes tree and commit: c5274e86da5fe ("drm/i915/snps:

[PATCH] drm/i915: Fix implicit use of struct pci_dev

2021-12-13 Thread broonie
From: Mark Brown intel_device_info.h references struct pci_dev but does not ensure that the struct has been declared, causing build failures if something in other headers changes so that the implicit dependency it is relying on is no longer satisfied: In file included from