Hi
Am 18.07.25 um 06:41 schrieb Stephen Rothwell:
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/virtio/virtgpu_prime.c
between commit:
0ecfb8ddb953 ("Revert "drm/virtio: Use dma_buf from GEM object instance"")
from the drm-misc-fixes tree and comm
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/virtio/virtgpu_prime.c
between commit:
0ecfb8ddb953 ("Revert "drm/virtio: Use dma_buf from GEM object instance"")
from the drm-misc-fixes tree and commit:
44b6535d8ace ("drm/virtio: Fix NULL pointer dere
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/display/drm_dp_helper.c
between commit:
d34d6feaf4a7 ("drm/dp: Change AUX DPCD probe address from LANE0_1_STATUS to
TRAINING_PATTERN_SET")
from the drm-intel-fixes tree and commit:
b87ed522b364 ("drm/dp
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/xe/xe_ggtt.c
between commit:
af2b588abe00 ("drm/xe: Process deferred GGTT node removals on device unwind")
from the drm-fixes tree and commit:
b2d6fd7ac598 ("drm/xe: Do not rely on GGTT internals in xe_g
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/xe/xe_lrc.c
between commit:
617d824c5323 ("drm/xe: Add WA BB to capture active context utilization")
from Linus' tree and commit:
2b0a0ce0c20b ("drm/xe: Create LRC BO without VM")
from the drm tree.
I
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/xe/xe_svm.c
between commit:
794f5493f518 ("drm/xe: Strict migration policy for atomic SVM faults")
from Linus' tree and commit:
80bcbdfc8cf5 ("drm/xe/svm: Add stats for SVM page faults")
from the drm tr
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/xe/xe_lrc.c
between commit:
617d824c5323 ("drm/xe: Add WA BB to capture active context utilization")
from Linus' tree and commits:
bac016066536 ("drm/xe: Make PPHWSP size explicit in xe_gt_lrc_size()")
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/xe/xe_bo.h
between commit:
50af7cab7520 ("drm/xe: Fix exporting xe buffers multiple times")
from Linus' tree and commit:
00c8efc3180f ("drm/xe: Add a shrinker for xe bos")
from the drm tree.
I fixed it
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c
between commits:
e7ea88207cef ("drm/amdgpu/gfx: only call mes for enforce isolation if
supported")
748a1f51bb74 ("drm/amdgpu/mes: keep enforce isolation up to date")
from Linus' t
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/display/drm_bridge_connector.c
between commit:
1bd1562d3522 ("drm/bridge-connector: Sync supported_formats with computed
ycbcr_420_allowed")
from the drm-misc-fixes tree and commit:
0beba3f9d366 ("drm/b
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/xe/xe_gt_ccs_mode.c
between commit:
7fd3fa006fa5 ("drm/xe: Set mask bits for CCS_MODE register")
from Linus' tree and commit:
a851edc457ed ("drm/xe/ccs_mode: Convert register access to use xe_mmio")
fro
On Mon, Oct 28, 2024, at 02:34, Stephen Rothwell wrote:
> -} else {
> +} else if (IS_ENABLED(CONFIG_HAS_IOPORT)) {
> ioaddr = VBE_DISPI_IOPORT_INDEX;
> iosize = 2;
> - if (!request_region(ioaddr, iosize, "bochs-drm")) {
> + if (!devm_re
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/xe/xe_guc_ct.c
between commits:
db7f92af6261 ("drm/xe/ct: prevent UAF in send_recv()")
22ef43c78647 ("drm/xe/guc/ct: Flush g2h worker in case of g2h response
timeout")
from Linus' tree and commits:
52
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/qxl/Kconfig
between commit:
65f5bf96750f ("drm: handle HAS_IOPORT dependencies")
from the asm-generic tree and commit:
92c13542e878 ("drm/qxl: Run DRM default client setup")
from the drm tree.
I fixed
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/tiny/bochs.c
between commit:
65f5bf96750f ("drm: handle HAS_IOPORT dependencies")
from the asm-generic tree and commit:
7934a1c25097 ("drm/bochs: Use video aperture helpers")
from the drm tree.
I fixed
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/gma500/Kconfig
between commit:
65f5bf96750f ("drm: handle HAS_IOPORT dependencies")
from the asm-generic tree and commit:
aecdbfe459a0 ("drm/gma500: Run DRM default client setup")
from the drm tree.
I
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/i915/display/intel_dp_mst.c
between commit:
69b3d8721267 ("drm/i915/dp_mst: Handle error during DSC BW overhead/slice
calculation")
from the drm-fixes tree and commit:
f2e2092a979c ("drm/i915/display: U
+ Harry
On Mon, Sep 16, 2024 at 8:58 AM Tobias Jakobi
wrote:
>
> On 9/16/24 06:15, Stephen Rothwell wrote:
>
> > Hi all,
> >
> > Today's linux-next merge of the drm tree got a conflict in:
> >
> >drivers/gpu/drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.c
> >
> > between commit:
> >
> >e835d5
On 9/16/24 06:15, Stephen Rothwell wrote:
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.c
between commit:
e835d5144f5e ("drm/amd/display: Avoid race between dcn35_set_drr() and
dc_state_destruct()")
from Linu
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.c
between commit:
e835d5144f5e ("drm/amd/display: Avoid race between dcn35_set_drr() and
dc_state_destruct()")
from Linus' tree and commit:
be7a6a517164 ("drm/amd/d
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/xe/display/xe_display.c
between commit:
4bfc9c553f5e ("drm/xe/display: Avoid encoder_suspend at runtime suspend")
from Linus' tree and commit:
769b081c18b9 ("drm/i915/opregion: convert to struct intel_di
Hi all,
Today's linux-next merge of the drm tree got conflicts in:
drivers/gpu/drm/i915/display/intel_dp_mst.c
drivers/gpu/drm/i915/display/intel_dp_mst.h
between commit:
a2ccc33b88e2 ("drm/i915/dp_mst: Fix MST state after a sink reset")
from the drm-intel-fixes tree and commit:
e44bc
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
fs/pstore/platform.c
between commit:
1bf8012fc699 ("pstore: replace spinlock_t by raw_spinlock_t")
from the pstore tree and commit:
e1a261ba599e ("printk: Add a short description string to kmsg_dump()")
from the drm tr
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/xe/xe_gt_idle.c
between commit:
2470b141bfae2 ("drm/xe: move disable_c6 call")
from the origin tree and commits:
6800e63cf97ba ("drm/xe: move disable_c6 call")
38e8c4184ea0e ("drm/xe: Enable Coarse Pow
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h
between commit:
c223376b3019a ("drm/amd/swsmu: add MALL init support workaround for
smu_v14_0_1")
from the drm-fixes tree and commit:
ec41bdd82e9b0 ("drm/amd/pm: Update PMFW
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/amd/display/dc/hwss/dcn35/dcn35_init.c
between commit:
c03d770c0b014 ("drm/amd/display: Attempt to avoid empty TUs when endpoint is
DPIA")
from the origin tree and commit:
0127f0445f7c1 ("drm/amd/displa
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c
between commit:
f6f49dda49db7 ("drm/amdgpu/atomfirmware: fix parsing of vram_info")
from the drm-fixes tree and commit:
9a55c77978308 ("drm/amdgpu: fix getting vram info
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/amd/display/dc/hwss/dcn35/dcn35_init.c
between commit:
c03d770c0b014 ("drm/amd/display: Attempt to avoid empty TUs when endpoint is
DPIA")
from the drm-fixes tree and commits:
47745acc5e8dd ("drm/amd/di
Hi all,
Today's linux-next merge of the drm tree got conflicts in:
drivers/gpu/drm/xe/xe_gt_idle.c
drivers/gpu/drm/xe/xe_guc_pc.c
between commits:
2470b141bfae2 ("drm/xe: move disable_c6 call")
7c877115da419 ("drm/xe/xe_gt_idle: use GT forcewake domain assertion")
from the drm-intel-fi
Quoting Stephen Rothwell (2024-03-07 04:10:27)
> Hi all,
>
> Today's linux-next merge of the drm tree got a conflict in:
>
> drivers/gpu/drm/i915/display/intel_dp.c
>
> between commit:
>
> 984318aaf7b6 ("drm/i915/panelreplay: Move out psr_init_dpcd() from
> init_connector()")
>
> from the
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/i915/display/intel_dp.c
between commit:
984318aaf7b6 ("drm/i915/panelreplay: Move out psr_init_dpcd() from
init_connector()")
from the drm-intel-fixes tree and commit:
e60cff453b82 ("drm/i915/dp: Enable
Hi all,
FIXME: Add owner of second tree to To:
Add author(s)/SOB of conflicting commits.
Today's linux-next merge of the drm tree got conflicts in:
drivers/gpu/drm/xe/xe_exec_queue.c
drivers/gpu/drm/xe/xe_exec_queue_types.h
between commit:
eaa367a0317e ("drm/xe/uapi: Remove unused
Hi all,
Today's linux-next merge of the drm tree got conflicts in:
drivers/gpu/drm/xe/xe_bo.c
drivers/gpu/drm/xe/xe_bo.h
between commits:
a09946a9a903 ("drm/xe/xe_bo_move: Enhance xe_bo_move trace")
8188cae3cc3d ("drm/xe/xe_trace: Add move_lacks_source detail to xe_bo_move
trace")
fro
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
between commit:
9cdef4f72037 ("drm/amd/display: pbn_div need be updated for hotplug event")
from Linus' tree and commit:
191dc43935d1 ("drm/dp_mst: Store the MST PBN div
On 1/1/2024 4:52 PM, Stephen Rothwell wrote:
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/accel/qaic/qaic_data.c
between commit:
78f5d33f3dd4 ("mm, treewide: rename MAX_ORDER to MAX_PAGE_ORDER")
from the mm tree and commit:
47fbee5f27ed ("accel/qaic:
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/accel/qaic/qaic_data.c
between commit:
78f5d33f3dd4 ("mm, treewide: rename MAX_ORDER to MAX_PAGE_ORDER")
from the mm tree and commit:
47fbee5f27ed ("accel/qaic: Update MAX_ORDER use to be inclusive")
from the d
Hi Stephen,
On Wed, Nov 22, 2023 at 1:29 AM Stephen Rothwell wrote:
> Today's linux-next merge of the drm tree got a conflict in:
>
> drivers/accel/ivpu/ivpu_hw_37xx.c
>
> between commit:
>
> 3f7c0634926d ("accel/ivpu/37xx: Fix hangs related to MMIO reset")
>
> from the drm-misc-fixes tree an
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/accel/ivpu/ivpu_hw_37xx.c
between commit:
3f7c0634926d ("accel/ivpu/37xx: Fix hangs related to MMIO reset")
from the drm-misc-fixes tree and commits:
3de6d9597892 ("accel/ivpu: Pass D0i3 residency time to the VP
Hi all,
On Tue, 24 Oct 2023 11:52:06 +1100 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the drm tree got a conflict in:
>
> drivers/gpu/drm/msm/msm_drv.c
>
> between commit:
>
> cd61a76c210a ("drm/msm: dynamically allocate the drm-msm_gem shrinker")
>
> from the mm-stable tree
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/msm/msm_drv.c
between commit:
cd61a76c210a ("drm/msm: dynamically allocate the drm-msm_gem shrinker")
from the mm-stable tree and commit:
506efcba3129 ("drm/msm: carve out KMS code from msm_drv.c")
from
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/accel/ivpu/ivpu_fw.c
between commit:
645d694559ca ("accel/ivpu: Use cached buffers for FW loading")
from the drm-misc-fixes tree and commit:
53d98420f5f9 ("accel/ivpu: Move ivpu_fw_load() to ivpu_fw_init()")
fr
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c
between commits:
61319b8e3b58 ("drm/amd/pm: disable the SMU13 OD feature support temporarily")
b6360a5ec31d ("drm/amd/pm: disallow the fan setting if there is no fan on
Hi all,
On Tue, 27 Jun 2023 11:54:32 +1000 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the drm tree got a conflict in:
>
> include/drm/gpu_scheduler.h
>
> between commit:
>
> db8b4968a8d0 ("drm/sched: Call drm_sched_fence_set_parent() from
> drm_sched_fence_scheduled()")
>
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
include/drm/gpu_scheduler.h
between commit:
db8b4968a8d0 ("drm/sched: Call drm_sched_fence_set_parent() from
drm_sched_fence_scheduled()")
from the drm-misc-fixes tree and commit:
539f9ee4b52a ("drm/scheduler: properly
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
between commit:
34e5a54327dc ("Revert "drm/amdgpu: remove TOPDOWN flags when allocating VRAM
in large bar system"")
from Linus' tree and commit:
7f6db89418f9 ("drm/amdgpu: dGP
On Tue, Apr 18, 2023 at 07:25:00PM +0100, Mark Brown wrote:
> On Tue, Apr 18, 2023 at 11:21:45AM -0700, Nathan Chancellor wrote:
> > On Fri, Apr 14, 2023 at 05:55:10PM +0100, Mark Brown wrote:
>
> > > Done.
>
> > Thanks a lot, sorry for not saying it sooner! It looks like this
> > regressed in ne
On Tue, Apr 18, 2023 at 11:21:45AM -0700, Nathan Chancellor wrote:
> On Fri, Apr 14, 2023 at 05:55:10PM +0100, Mark Brown wrote:
> > Done.
> Thanks a lot, sorry for not saying it sooner! It looks like this
> regressed in next-20230417 and next-20230418 though.
Someone sent a mail saying they tho
On Fri, Apr 14, 2023 at 05:55:10PM +0100, Mark Brown wrote:
> On Thu, Apr 13, 2023 at 11:47:25AM -0700, Nathan Chancellor wrote:
> > On Wed, Apr 12, 2023 at 11:22:13AM +1000, Stephen Rothwell wrote:
>
> > select SND_HDA_COMPONENT if SND_HDA_CORE
> > # !CC_IS_CLANG: https://github.com/Clang
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 t
On Thu, Apr 13, 2023 at 11:47:25AM -0700, Nathan Chancellor wrote:
> On Wed, Apr 12, 2023 at 11:22:13AM +1000, Stephen Rothwell wrote:
> select SND_HDA_COMPONENT if SND_HDA_CORE
> # !CC_IS_CLANG: https://github.com/ClangBuiltLinux/linux/issues/1752
> - select DRM_AMD_DC_DCN if (X86
Hi Mark,
On Wed, Apr 12, 2023 at 11:22:13AM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the drm tree got a conflict in:
>
> drivers/gpu/drm/amd/display/Kconfig
>
> between commit:
>
> 78f0929884d4 ("powerpc/64: Always build with 128-bit long double")
>
> from
Stephen Rothwell writes:
> Hi all,
>
> Today's linux-next merge of the drm tree got a conflict in:
>
> drivers/gpu/drm/amd/display/Kconfig
>
> between commit:
>
> 78f0929884d4 ("powerpc/64: Always build with 128-bit long double")
>
> from the powerpc tree and commit:
>
> 4652ae7a51b7 ("drm/a
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/amd/display/Kconfig
between commit:
78f0929884d4 ("powerpc/64: Always build with 128-bit long double")
from the powerpc tree and commit:
4652ae7a51b7 ("drm/amd/display: Rename DCN config to FP")
from th
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/ttm/ttm_pool.c
between commit:
23baf831a32c ("mm, treewide: redefine MAX_ORDER sanely")
from the mm-stable tree and commit:
322458c2bb1a ("drm/ttm: Reduce the number of used allocation orders for TTM
pa
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
between commits:
877f26bf3ca6 ("drm/amd/display: disable S/G display on DCN 2.1.0")
077e9659581a ("drm/amd/display: disable S/G display on DCN 3.1.2/3")
7ece674cd946 ("R
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/i915/gt/intel_gt.c
between commit:
04aa64375f48 ("drm/i915: fix TLB invalidation for Gen12 video and compute
engines")
from Linus' tree and commit:
46c507f03a46 ("drm/i915/gt: Always use MCR functions o
Hi DRm people,
On Mon, Nov 28, 2022 at 1:02 AM Stephen Rothwell wrote:
> Today's linux-next merge of the drm tree got a conflict in:
>
> drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
>
> between commits:
>
> 3cb93f390453 ("drm/amdgpu: fix use-after-free during gpu recovery")
> b09d6acba1d9 ("drm/
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
between commits:
3cb93f390453 ("drm/amdgpu: fix use-after-free during gpu recovery")
b09d6acba1d9 ("drm/amdgpu: handle gang submit before VMID")
from Linus' tree and commits:
1b
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/amd/amdgpu/amdgpu_job.c
between commit:
b09d6acba1d9 ("drm/amdgpu: handle gang submit before VMID")
from the drm-misc-fixes tree and commits:
c5093cddf56b ("drm/amdgpu: drop the fence argument from amdgp
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/rcar-du/Kconfig
between commit:
a830a1567859 ("drm: rcar-du: Fix Kconfig dependency between RCAR_DU and
RCAR_MIPI_DSI")
from Linus' tree and commit:
7a043f978ed1 ("drm: rcar-du: Add RZ/G2L DSI driver")
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: Up
Hi Geert,
On Mon, Sep 19, 2022 at 09:58:01AM +0200, Geert Uytterhoeven wrote:
> Hi Stephen,
>
> On Mon, Sep 19, 2022 at 3:07 AM Stephen Rothwell
> wrote:
> > Today's linux-next merge of the drm tree got a conflict in:
> >
> > drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.c
> >
Hi Stephen,
On Mon, Sep 19, 2022 at 3:07 AM Stephen Rothwell wrote:
> Today's linux-next merge of the drm tree got a conflict in:
>
> drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.c
>
> between commit:
>
> 41012d715d5d ("drm/amd/display: Mark dml30's UseMinimumDCFCLK() as noinl
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.c
between commit:
41012d715d5d ("drm/amd/display: Mark dml30's UseMinimumDCFCLK() as noinline
for stack usage")
from Linus' tree and commit:
a0f7e7f759cf ("d
Hi Dave,
On Wed, 27 Jul 2022 13:24:45 +1000 Dave Airlie wrote:
>
> My assumption is I fix this on sending my -next tree to Linus with a
> resolution I create at that time?
>
> Is there another option, we have this fixed in out drm-tip tree already.
Sounds good, no problem.
--
Cheers,
Stephen
On Wed, 27 Jul 2022 at 12:55, Stephen Rothwell wrote:
>
> Hi all,
>
> On Mon, 18 Jul 2022 09:44:53 +1000 Stephen Rothwell
> wrote:
> >
> > On Mon, 11 Jul 2022 10:05:45 +0200 Christian König
> > wrote:
> > >
> > > Am 11.07.22 um 04:47 schrieb Stephen Rothwell:
> > > >
> > > > Today's linux-next
Hi all,
On Mon, 18 Jul 2022 09:44:53 +1000 Stephen Rothwell
wrote:
>
> On Mon, 11 Jul 2022 10:05:45 +0200 Christian König
> wrote:
> >
> > Am 11.07.22 um 04:47 schrieb Stephen Rothwell:
> > >
> > > Today's linux-next merge of the drm tree got a conflict in:
> > >
> > >drivers/gpu/drm/amd
Hi Stephen,
On Mon, Jul 18, 2022 at 1:49 AM Stephen Rothwell wrote:
> On Mon, 11 Jul 2022 10:05:45 +0200 Christian König
> wrote:
> > Am 11.07.22 um 04:47 schrieb Stephen Rothwell:
> > >
> > > Today's linux-next merge of the drm tree got a conflict in:
> > >
> > >drivers/gpu/drm/amd/amdgpu/
Hi all,
On Mon, 11 Jul 2022 10:05:45 +0200 Christian König
wrote:
>
> Am 11.07.22 um 04:47 schrieb Stephen Rothwell:
> >
> > Today's linux-next merge of the drm tree got a conflict in:
> >
> >drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
> >
> > between commit:
> >
> >925b6e59138c ("Rever
Hi Stephen,
Am 11.07.22 um 04:47 schrieb Stephen Rothwell:
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
between commit:
925b6e59138c ("Revert "drm/amdgpu: add drm buddy support to amdgpu"")
from the drm-misc-fixes tre
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c
between commit:
925b6e59138c ("Revert "drm/amdgpu: add drm buddy support to amdgpu"")
from the drm-misc-fixes tree and commit:
5e3f1e7729ec ("drm/amdgpu: fix start calculatio
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/i915/i915_reg.h
between commit:
54395a33718a ("drm/i915/dmc: Add MMIO range restrictions")
from the drm-intel-fixes tree and commit:
9c67d9e84c7d ("drm/i915/dmc: split out dmc registers to a separate fil
Hi all,
On Fri, 18 Mar 2022 11:55:44 +1100 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the drm tree got a conflict in:
>
> drivers/gpu/drm/bridge/Kconfig
>
> between commit:
>
> 3c3384050d68 ("drm: Don't make DRM_PANEL_BRIDGE dependent on
> DRM_KMS_HELPERS")
>
> from the drm
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/bridge/Kconfig
between commit:
3c3384050d68 ("drm: Don't make DRM_PANEL_BRIDGE dependent on DRM_KMS_HELPERS")
from the drm-misc-fixes tree and commit:
803abfd8dda5 ("drm: bridge: fix unmet dependency on
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt
between commit:
6d0990e6e844 ("media: dt-binding: mediatek: Get rid of mediatek,larb for
multimedia HW")
from the v4l-dvb tree and commit:
4ed545e7d1
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:
e2b993302f40 ("drm/amdgpu: bypass tiling flag check in virtual display case
(v2)")
from Linus' tree and commit:
2af104290da5 ("drm: introduce fb_modifiers_not
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 fb_modi
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: conver
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 ("drm/amd/di
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: convert
Hi Stephen,
Am 22.12.21 um 04:50 schrieb Stephen Rothwell:
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/nouveau/nouveau_fence.c
between commit:
67f74302f45d ("drm/nouveau: wait for the exclusive fence after the shared ones
v2")
from the drm-misc
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/nouveau/nouveau_fence.c
between commit:
67f74302f45d ("drm/nouveau: wait for the exclusive fence after the shared
ones v2")
from the drm-misc-fixes tree and commit:
40298cb45071 ("drm/nouveau: use the n
Hi Maxime,
On Tue, 30 Nov 2021 09:58:31 +0100 Maxime Ripard wrote:
>
> Unfortunately the merge resolution isn't entirely correct :/
>
> There's multiple conflicts between those two branches on that file, but
> things went wrong between 16e101051f32 and 0c980a006d3f
>
> The first one changes the
Hi Stephen,
On Tue, Nov 30, 2021 at 10:33:53AM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the drm tree got a conflict in:
>
> drivers/gpu/drm/vc4/vc4_kms.c
>
> between commits:
>
> f927767978d2 ("drm/vc4: kms: Fix return code check")
> d354699e2292 ("drm/vc4
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/vc4/vc4_kms.c
between commits:
f927767978d2 ("drm/vc4: kms: Fix return code check")
d354699e2292 ("drm/vc4: kms: Don't duplicate pending commit")
from the drm-misc-fixes tree and commit:
16e101051f32 (
Quoting Stephen Rothwell (2021-10-29 03:48:40)
> Hi all,
>
> Today's linux-next merge of the drm tree got a conflict in:
>
> drivers/gpu/drm/i915/i915_trace.h
>
> between commit:
>
> 9a4aa3a2f160 ("drm/i915: Revert 'guc_id' from i915_request tracepoint")
>
> from Linus' tree and commit:
>
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/i915/i915_trace.h
between commit:
9a4aa3a2f160 ("drm/i915: Revert 'guc_id' from i915_request tracepoint")
from Linus' tree and commit:
3cb3e3434b9f ("drm/i915/guc: Move fields protected by guc->contexts_
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/drm_panel_orientation_quirks.c
between commit:
def0c3697287 ("drm: panel-orientation-quirks: Add quirk for Aya Neo 2021")
from the drm-misc-fixes tree and commits:
072e70d52372 ("drm: panel-orientation-q
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/amd/display/include/dal_asic_id.h
between commit:
7ab0965079bb ("drm/amd/display: USB4 bring up set correct address")
from Linus' tree and commit:
13900e6fde3f ("drm/amd/display: Fix for null pointer acc
Hi all,
On Mon, 26 Jul 2021 17:38:14 +0100 Mark Brown wrote:
>
> Today's linux-next merge of the drm tree got a conflict in:
>
> drivers/firmware/Makefile
>
> between commit:
>
> b42000e4b874 ("firmware: qcom_scm: Allow qcom_scm driver to be loadable as
> a permenent module")
>
> from t
Hi all,
[Thanks Guenter for pointing this out]
On Mon, 23 Aug 2021 12:41:22 +1000 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the drm tree got a conflict in:
>
> drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
>
> between commit:
>
> 71ac6f390f6a ("drm/mediatek: Add AAL output si
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
between commit:
71ac6f390f6a ("drm/mediatek: Add AAL output size configuration")
from Linus' tree and commit:
78d1783c3243 ("drm/mediatek: Separate aal sub driver")
from the
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/i915/i915_globals.c
between commits:
1354d830cb8f ("drm/i915: Call i915_globals_exit() if pci_register_device()
fails")
a07296453bf2 ("drm/i915: fix i915_globals_exit() section mismatch error")
from Linu
Hi Geert,
On Tue, 10 Aug 2021 13:56:12 +0200 Geert Uytterhoeven
wrote:
>
> On Fri, Aug 6, 2021 at 6:11 PM Mark Brown wrote:
> > Today's linux-next merge of the drm tree got a conflict in:
> >
> > drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
> >
> > between commit:
> >
> > e00f543d3596 ("drm/amdg
Hi Mark, Stephen,
On Fri, Aug 6, 2021 at 6:11 PM Mark Brown wrote:
> Today's linux-next merge of the drm tree got a conflict in:
>
> drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
>
> between commit:
>
> e00f543d3596 ("drm/amdgpu: add DID for beige goby")
>
> from the drm-fixes tree and commit:
>
>
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
between commit:
e00f543d3596 ("drm/amdgpu: add DID for beige goby")
from the drm-fixes tree and commit:
a8f706966b92 ("drm/amdgpu: add pci device id for cyan_skillfish")
from the
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/firmware/Makefile
between commit:
b42000e4b874 ("firmware: qcom_scm: Allow qcom_scm driver to be loadable as a
permenent module")
from the qcom/for-next tree and commits:
8633ef82f101 ("drivers/firmware: consol
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
between commit:
da68547d3692 ("drm/amdgpu: use vma_lookup() in
amdgpu_ttm_tt_get_user_pages()")
from Linus' tree and commit:
04d8d73dbcbe ("drm/amdgpu: add common HMM get pages f
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/vc4/vc4_hdmi.c
between commit:
9984d6664ce9 ("drm/vc4: hdmi: Make sure the controller is powered in detect")
from the drm-misc-fixes tree and commit:
6800234ceee0 ("drm/vc4: hdmi: Convert to gpiod")
fro
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/vc4/vc4_plane.c
between commit:
35d65ab3fdba ("drm/vc4: plane: Remove redundant assignment")
from the drm-misc-fixes tree and commit:
5ddb0bd4ddc3 ("drm/atomic: Pass the full state to planes async atomic
1 - 100 of 220 matches
Mail list logo
