Hi Geert,
On Tue, 30 Mar 2021 09:36:57 +0200 Geert Uytterhoeven
wrote:
>
> On Mon, Mar 29, 2021 at 4:16 AM Stephen Rothwell
> wrote:
> > Today's linux-next merge of the drm tree got a conflict in:
> >
> > drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> >
> > between commits:
> >
> > 9adb125dd
Hi Stephen,
On Mon, Mar 29, 2021 at 4:16 AM Stephen Rothwell wrote:
> Today's linux-next merge of the drm tree got a conflict in:
>
> drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
>
> between commits:
>
> 9adb125dde69 ("drm/amdgpu: re-enable suspend phase 2 for S0ix")
> 4021229e32bd ("drm/amdg
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
between commits:
9adb125dde69 ("drm/amdgpu: re-enable suspend phase 2 for S0ix")
4021229e32bd ("drm/amdgpu/swsmu: skip gfx cgpg on s0ix suspend")
9bb735abcbd8 ("drm/amdgpu: upd
Hi all,
On Mon, 1 Feb 2021 12:30:12 +1100 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the drm tree got a conflict in:
>
> drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h
>
> between commit:
>
> a119f87b86bc ("Revert "drm/amdgpu/swsmu: drop set_fan_speed_percent (v2)"")
>
> from Linu
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h
between commit:
a119f87b86bc ("Revert "drm/amdgpu/swsmu: drop set_fan_speed_percent (v2)"")
from Linus' tree and commit:
d8a0b8dd690b ("drm/amd/pm: add pptable_funcs documentation
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h
between commits:
3c517ca5212f ("Revert "drm/amdgpu/disply: fix documentation warnings in
display manager"")
a7ddd22151fc ("Revert "drm/amd/display: Expose new CRC window
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
between commit:
b19515253623 ("drm/amd/pm: setup APU dpm clock table in SMU HW
initialization")
from the Linus tree and commits:
82cac71c1b64 ("drm/amd/pm: put Navi1X umc cdr w
Hi all,
Today's linux-next merge of the drm tree got conflicts in:
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_init.c
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_init.c
between commit:
31ecebee9c36 ("drm/amd/display: Defer cursor lock until after VUPDATE")
from Linus' tree and commits:
Hi all,
On Thu, 22 Mar 2018 17:37:22 +1100 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the drm tree got conflicts in several amdgpu
> files because there are a set of (mostly identical) patches that appear
> Linus' tree and the drm tree. In each case I just used the version fo
> the
Hi all,
Today's linux-next merge of the drm tree got conflicts in:
drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
between commit:
140bcaa23a1c ("drm/vmwgfx: Fix black screen and device errors when running
without fbdev")
from Linus' tree and commit:
c3b9b1657
Hi all,
Today's linux-next merge of the drm tree got conflicts in several amdgpu
files because there are a set of (mostly identical) patches that appear
Linus' tree and the drm tree. In each case I just used the version fo
the file from the drm tree.
You should do a test merge between your tree
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
between commit:
a0aaa03062be ("drm/amd/powerplay: fix power over limit on Fiji")
from the Linus' and commit:
a5278e511dce ("drm/amd/pp: Revert gfx/compute profile switch
On Mon, Feb 19, 2018 at 10:10:50AM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the drm tree got a conflict in:
>
> drivers/gpu/drm/i915/intel_breadcrumbs.c
>
> between commit:
>
> 117172c8f9d4 ("drm/i915/breadcrumbs: Ignore unsubmitted signalers")
>
> from Linu
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/i915/intel_breadcrumbs.c
between commit:
117172c8f9d4 ("drm/i915/breadcrumbs: Ignore unsubmitted signalers")
from Linus' tree and commit:
b7a3f33bd5ab ("drm/i915/breadcrumbs: Drop request reference for t
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/i915/i915_pmu.h
between commit:
4c83f0a788cc ("drm/i915/pmu: Fix sleep under atomic in RC6 readout")
from Linus' tree and commit:
109ec558370f ("drm/i915/pmu: Only enumerate available counters in sysfs")
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/tegra/sor.c
between commit:
d780537f9b49 ("drm/tegra: sor: Fix hang on Tegra124 eDP")
from Linus' tree and commit:
1087fac18b8e ("drm/tegra: dc: Use direct offset to plane registers")
from the drm tree.
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 a conflict in:
drivers/gpu/drm/tilcdc/tilcdc_slave_compat.c
between commits:
0290c4ca2536 ("of: overlay: rename identifiers to more reflect what they
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/i915/intel_runtime_pm.c
between commit:
2a8408e537250 ("drm/i915/cnl: Reprogram DMC firmware after S3/S4 resume")
from Linus' tree and commit:
57522c4c87de2 ("drm/i915/cnl: Reprogram DMC firmware after
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/amd/scheduler/gpu_scheduler.c
between commit:
c94501279bb191c ("Revert "drm/amdgpu: discard commands of killed processes"")
from Linus' tree (it even made it into -rc6 over a week ago!) and the
fixes it ex
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/imx/ipuv3-plane.c
between commit:
5be5dd38d462 ("drm/imx: ipuv3-plane: fix YUV framebuffer scanout on the base
plane")
from Linus' tree and commit:
58dff39904c0 ("drm/imx: ipuv3-plane: use fb local var
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/nouveau/nv50_display.c
between commit:
4a5431af19bc ("drm/nouveau/kms/nv50: update vblank state in response to
modeset actions")
from Linus' tree and commit:
ca814b25538a ("drm/vblank: Consistent drm_c
Hi all,
On Mon, 24 Jul 2017 12:06:05 +1000 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the drm tree got a conflict in:
>
> MAINTAINERS
>
> between commit:
>
> 82abbea734d6 ("MAINTAINERS: fix alphabetical ordering")
>
> from Linus' tree and commit:
>
> 3589211e9b03 ("drm/ti
Hi all,
Today's linux-next merge of the drm tree got a conflict in:
MAINTAINERS
between commit:
82abbea734d6 ("MAINTAINERS: fix alphabetical ordering")
from Linus' tree and commit:
3589211e9b03 ("drm/tinydrm: Add RePaper e-ink driver")
from the drm tree.
I fixed it up (see below) and
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/i915/intel_dp.c
between commit:
8001b7541aa7 ("drm/i915/dp: rename rate_to_index() to intel_dp_rate_index()
and reuse")
from Linus' tree and commit:
3194102439f6 ("drm/i915/dp: use known correct array
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/vmwgfx/vmwgfx_fence.c
between commit:
f7652afa8ead ("drm/vmwgfx: Type-check lookups of fence objects")
from Linus' tree and commit:
8dfe162ac74f ("gpu: drm: drivers: Convert printk(KERN_ to pr_")
from
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in:
lib/Kconfig
between commit:
44091d29f207 ("lib: Introduce priority array area manager")
from Linus' tree and commit:
cf4a7207b1cb ("lib: Add a simple prime number generator")
from the drm tree.
I fixed it up (see bel
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/drm_crtc.c
between commit:
6f00975c6190 ("drm: Reject page_flip for !DRIVER_MODESET")
from Linus' tree and commit:
43968d7b806d ("drm: Extract drm_plane.[hc]")
from the drm tree.
I fixed it up (the la
Hi Stephen,
Am Dienstag, den 20.09.2016, 12:42 +1000 schrieb Stephen Rothwell:
> Hi Dave,
>
> Today's linux-next merge of the drm tree got a conflict in:
>
> drivers/gpu/drm/imx/ipuv3-crtc.c
>
> between commit:
>
> a474478642d5 ("drm/imx: fix crtc vblank state regression")
>
> from Linus'
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/imx/ipuv3-crtc.c
between commit:
a474478642d5 ("drm/imx: fix crtc vblank state regression")
from Linus' tree and commit:
5f4df0c769a9 ("drm/imx: Use DRM_PLANE_COMMIT_NO_DISABLE_AFTER_MODESET flag")
fro
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/amd/amdgpu/amdgpu.h
between commit:
566153874951 ("drm/amdgpu: fix lru size grouping v2")
from Linus' tree and commit:
c632d7994360 ("amdgpu: move ttm stuff to amdgpu_ttm.h")
from the drm tree.
I fixe
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/drm_crtc.c
between commit:
6f00975c6190 ("drm: Reject page_flip for !DRIVER_MODESET")
from Linus' tree and commit:
f837297ad824 ("drm: Add DRM_MODE_PAGE_FLIP_TARGET_ABSOLUTE/RELATIVE flags v2")
from th
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/i915/i915_debugfs.c
between commit:
194dc870a589 ("Add braces to avoid "ambiguous ‘else’" compiler warnings")
from Linus' tree and commit:
24f1d3cc0997 ("drm/i915: Refactor execlists default context pin
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/ttm/ttm_bo.c
between commit:
56fc350224f1 ("drm/ttm: fix kref count mess in ttm_bo_move_to_lru_tail")
from Linus' tree and commits:
c3ea576e0583 ("drm/ttm: add optional LRU removal callback v2")
98c28
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
between commit:
562e2689baeb ("amdgpu/uvd: add uvd fw version for amdgpu")
from Linus' tree and commit:
c036554170fc ("drm/amdgpu: handle more than 10 UVD sessions (v2)")
from t
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/sti/sti_hqvdp.c
between commit:
f6e45661f9be ("dma, mm/pat: Rename dma_*_writecombine() to dma_*_wc()")
from Linus' tree and commit:
52807ae90e76 ("drm/sti: use u32 to store DMA addresses")
from the dr
Stephen,
thanks a lot for addressing that conflict.
Replying top-style on purpose. In the future such type of conflicts should
be resolvable automatically through a git conflict resolution hook that
would use Coccinelle if present when it detects a patch with Coccinelle SmPL
grammar has been used
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
between commit:
e1d09dc0ccc6 ("drm/amdgpu: Don't hang in amdgpu_flip_work_func on disabled
crtc.")
from Linus' tree and commit:
6bd9e877ce53 ("drm/amdgpu: Move MMIO flip out
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/imx/imx-drm-core.c
between commit:
3f3a7280d4ca ("GPU-DRM-IMX: Delete an unnecessary check before
drm_fbdev_cma_restore_mode()")
from Linus' tree and commit:
c1ff5a7aa3c3 ("drm/imx: Remove local fbdev
Hi Dave,
Today's linux-next merge of the drm tree got conflicts in:
drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
between commit:
f6c7aba47bcc ("drm/amdgpu: Keep the pflip interrupts always enabled v7")
from Linus' t
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in:
drivers/gpu/drm/drm_crtc.c
between commit:
5677d67ae394 ("drm: Stop resetting connector state to unknown")
from Linus' tree and commit:
6295d607ad34 ("drm: Add modeset object iterators")
from the drm tree.
I fixed it
Hi Stephen & Dave,
indeed RADEON_INFO_VA_UNMAP_WORKING was added to 4.1 to indicate that a
certain kernel bug is fixed now and we can remove the user space workaround.
And RADEON_INFO_GPU_RESET_COUNTER was stashed to be merged in 4.2 as new
feature.
Annoying but harmless and Stephen's resol
Hi Dave,
Today's linux-next merge of the drm tree got conflicts in:
drivers/gpu/drm/radeon/radeon_kms.c
include/uapi/drm/radeon_drm.h
between commit:
3bc980bf19bb ("drm/radeon: Add RADEON_INFO_VA_UNMAP_WORKING query")
from Linus' tree and commit:
72b9076b2887 ("drm/radeon: add a GPU r
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/drm_irq.c between commit fdb68e09bbb1 ("drm: Zero out invalid
vblank timestamp in drm_update_vblank_count") from Linus' tree and commit
d66a1e38280c ("drm: Zero out invalid vblank timestamp in
drm_update_vblank
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/i915/intel_sprite.c between commit 840a1cf0cd53
("drm/i915: Reject the colorkey ioctls for primary and cursor planes")
from Linus' tree and commit a8265c59e22a ("drm/i915: Rip out
GET_SPRITE_COLORKEY ioctl") from t
On 01/29/2015 04:17 AM, Stephen Rothwell wrote:
Hi Dave,
Today's linux-next merge of the drm tree got conflicts in
drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c and
drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h between commits
b8cbab042cd6 ("drm/amdkfd: Allow user to limit only
Hi Dave,
Today's linux-next merge of the drm tree got conflicts in
drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c and
drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h between commits
b8cbab042cd6 ("drm/amdkfd: Allow user to limit only queues per device")
and 9fa843e76d90 ("drm/amdkfd:
Hi Dave,
On Thu, 22 Jan 2015 02:31:06 + (GMT) Dave Airlie wrote:
>
> btw I pushed a drm-next with all these fixed in it a little while ago
>
> we must be racing!
Yeah, I tend to collect all the trees first thing in the morning
(around 9 - 10 am my time) and then spend the day merging them.
> Hi Dave,
>
> Today's linux-next merge of the drm tree got a conflict in
> drivers/gpu/drm/radeon/radeon_kfd.c between commit b64b8afcca9d
> ("drm/amd: Fixing typos in kfd<->kgd interface") from Linus' tree and
> commit a84a9903b588 ("drm/radeon: Implement SDMA interface functions")
> from the
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/radeon/radeon_kfd.c between commit b64b8afcca9d
("drm/amd: Fixing typos in kfd<->kgd interface") from Linus' tree and
commit a84a9903b588 ("drm/radeon: Implement SDMA interface functions")
from the drm tree.
I fi
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/amd/include/kgd_kfd_interface.h between commit
b64b8afcca9d ("drm/amd: Fixing typos in kfd<->kgd interface") from
Linus' tree and commit 85ea7d07e1ec ("drm/amd: Add SDMA functions to
kfd-->kgd interface") from the
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/amd/amdkfd/kfd_priv.h between commit 6ee0ad2a7f27
("drm/amdkfd: Drop interrupt SW ring buffer") from Linus' tree and
commit 36b5c08f099a ("drm/amdkfd: Add gtt sa related data to kfd_dev
struct") from the drm tree.
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/radeon/radeon_cs.c between commit 86b276385c6a
("drm/radeon: sync all BOs involved in a CS v2") from Linus' tree and
commit 975700d2cc84 ("drm/radeon: split semaphore and sync object
handling v2") from the drm tree
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/nouveau/nouveau_drm.c between commit 8b62c8c6df08
("nouveau: move the hotplug ignore to correct place") from Linus' tree
and commit 7bb6d4428d3d ("drm/nouveau: move the (far too many...)
different s/r paths to the
On Mon, Nov 17, 2014 at 02:11:58PM +1100, Stephen Rothwell wrote:
> * PGP Signed by an unknown key
>
> Hi Dave,
>
> Today's linux-next merge of the drm tree got a conflict in
> drivers/gpu/drm/tegra/dc.c between commit 8ff64c17f3be ("drm/tegra: dc:
> Add missing call to drm_vblank_on()") from Lin
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/tegra/dc.c between commit 8ff64c17f3be ("drm/tegra: dc:
Add missing call to drm_vblank_on()") from Linus' tree and commits
205d48edee84 ("drm/tegra: dc: Factor out DC, window and cursor commit")
and c7679306a923 ("
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/i915/i915_gem_execbuffer.c between commit d23db88c3ab2
("drm/i915: Prevent negative relocation deltas from wrapping") from
Linus' tree and commit a8ebba75b358 ("drm/i915: Use the coarse
ping-pong mechanism based on
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/drm_crtc_helper.c between commit ba6f58260665
("drm/crtc-helper: skip locking checks in panicking path") from Linus'
tree and commits 6e9f798d91c5 ("drm: Split connection_mutex out of
mode_config.mutex (v3)") and 5
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/i915/i915_gem_gtt.c between commit 8ee661b50561
("drm/i915: Undo gtt scratch pte unmapping again") from Linus' tree and
commit 782f149523d3 ("drm/i915: Make clear/insert vfuncs args absolute")
from the drm tree.
I
On Mon, 24 Mar 2014, Stephen Rothwell wrote:
> Hi Dave,
>
> Today's linux-next merge of the drm tree got conflicts in
> drivers/gpu/drm/i915/intel_ddi.c and
> drivers/gpu/drm/i915/intel_dp.c between commit 825938307f81 ("Revert
> "drm/i915: don't touch the VDD when disabling the panel"") from Linu
Hi Dave,
Today's linux-next merge of the drm tree got conflicts in
drivers/gpu/drm/i915/intel_ddi.c and
drivers/gpu/drm/i915/intel_dp.c between commit 825938307f81 ("Revert
"drm/i915: don't touch the VDD when disabling the panel"") from Linus'
tree and commits 4be7378004a0 ("drm/i915: drop ironlak
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in
drivers/staging/imx-drm/imx-drm-core.c between commit 8007875f0619
("imx-drm: imx-drm-core: fix DRM cleanup paths") from Linus' tree and
commit 9076dccfc532 ("drm/imx: directly call drm_put_dev in ->remove")
from the drm tree.
I
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/drm_stub.c between commit 0f58411d4fd7 ("drm: don't
double-free on driver load error") from Linus' tree and commit
2c695fa04442 ("drm: remove agp_init() bus callback") from the drm tree.
I fixed it up (see below)
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/radeon/radeon_connectors.c between commit 108dc8e8b44a
("drm/radeon: rework audio option") from Linus' tree and commit
ad41550666f8 ("drm/radeon: enable hdmi audio by default") from the drm
tree.
I fixed it up (I
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/radeon/atombios_encoders.c between commit c23632d4e57c
("Alex Deucher ") from Linus' tree and commit
43a340262ad4 ("drm/radeon/atom: don't call [EN|DIS]ABLE_OUTPUT on
DCE3.x") from the drm tree.
I fixed it up (jus
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/i915/intel_drv.h between commit e1264ebe9ff4 ("Revert
"drm/i915: Delay disabling of VGA memory until vgacon->fbcon handoff is
done"") from Linus' tree and commits 5f1aae65cdae ("drm/i915: reorganize
intel_drv.h"),
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/i915/i915_drv.c between commit 828c79087cec ("drm/i915:
Disable GGTT PTEs on GEN6+ suspend") from Linus' tree and commit
9d49c0ef4089 ("drm/i915: move more code to __i915_drm_thaw") from the drm
tree.
I fixed it u
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/i915/i915_dma.c between commit e1264ebe9ff4 ("Revert
"drm/i915: Delay disabling of VGA memory until vgacon->fbcon handoff is
done"") from Linus' tree and commit ce352550327b ("drm/i915: Fix
unclaimed register acces
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/qxl/qxl_release.c between commit 8002db6336dd ("qxl:
convert qxl driver to proper use for reservations") from Linus' tree and
commit 72525b3f333d ("drm/ttm: convert to unified vma offset manager")
from the drm tree
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/i915/i915_dma.c between commit 7dcd2677ea91 ("drm/i915:
fix long-standing SNB regression in power consumption after resume v2")
from Linus' tree and commit 59cdb63d529c ("drm/i915: kill
dev_priv->rps.lock") from th
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/drm_prime.c between commit ebc0bad4a05a ("drm/prime:
Honor requested file flags when exporting a buffer") from Linus' tree and
commit ca793f75d91d ("drm: move pinning/unpinning to buffer attach") from
the drm tree.
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/i915/intel_sdvo.c between commit c3456fb3e471 ("drm/i915:
prefer VBT modes for SVDO-LVDS over EDID") from Linus' tree and commit
41aa344866e3 ("drm/i915: Organize VBT stuff inside drm_i915_private")
from the drm tr
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/radeon/evergreen_cs.c between commit de0babd60d8d
("drm/radeon: enforce use of radeon_get_ib_value when reading user cmd")
from Linus' tree and commit 0fcb6155cb5c ("radeon/kms: cleanup async dma
packet checking")
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/nouveau/core/engine/disp/nv50.c between commit
11d92561c81b ("drm/nvc0/disp: fix regression in vblank semaphore
release") from Linus' tree and commit 370c00f939c5 ("drm/nv50/disp:
initial implementation of the vari
Hi Dave,
Today's linux-next merge of the drm tree got conflicts in
drivers/gpu/drm/i915/intel_dp.c and drivers/gpu/drm/i915/intel_drv.h
between commit 760285e7e7ab ("UAPI: (Scripted) Convert #include "..." to
#include in drivers/gpu/") from Linus' tree and commit 54d63ca6605d
("drm/i915: Move DP
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/gma500/psb_drv.h between commit 760285e7e7ab ("UAPI:
(Scripted) Convert #include "..." to #include in
drivers/gpu/") from Linus' tree and commit 4d46259f00c6 ("drm: gma500:
Kill the GEM glue layer") from the drm t
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/i915/i915_dma.c between commit 99d0b1db6ccd ("drm/i915:
initialize dpio_lock spin lock") from Linus' tree and commit c6a828d3269a
("drm/i915: move all rps state into dev_priv->rps") from the drm tree.
I fixed it u
On Fri, Aug 24, 2012 at 9:12 AM, Dave Airlie wrote:
> On Fri, Aug 24, 2012 at 5:13 PM, Jani Nikula wrote:
>> On Fri, 24 Aug 2012, Stephen Rothwell wrote:
>>> Hi Dave,
>>>
>>> Today's linux-next merge of the drm tree got a conflict in
>>> drivers/gpu/drm/i915/intel_modes.c between commit 4eab8136
On Fri, Aug 24, 2012 at 5:13 PM, Jani Nikula wrote:
> On Fri, 24 Aug 2012, Stephen Rothwell wrote:
>> Hi Dave,
>>
>> Today's linux-next merge of the drm tree got a conflict in
>> drivers/gpu/drm/i915/intel_modes.c between commit 4eab81366465
>> ("drm/i915: extract connector update from intel_ddc_
On Fri, 24 Aug 2012, Stephen Rothwell wrote:
> Hi Dave,
>
> Today's linux-next merge of the drm tree got a conflict in
> drivers/gpu/drm/i915/intel_modes.c between commit 4eab81366465
> ("drm/i915: extract connector update from intel_ddc_get_modes() for
> reuse") from Linus' tree and commit 451023
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/i915/i915_gem.c between commit b6c7488df68a
("drm/i915/contexts: fix list corruption") from Linus' tree and commit
69c2fc891343 ("drm/i915: Remove the per-ring write list") from the drm
tree.
Just context changes.
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/i915/intel_modes.c between commit 4eab81366465
("drm/i915: extract connector update from intel_ddc_get_modes() for
reuse") from Linus' tree and commit 451023dc32d4 ("drm: remove the
raw_edid field from struct drm_d
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/radeon/radeon_gart.c between commit c21b328ea8c7
("drm/radeon: fix VM page table setup on SI") from Linus' tree and commit
c6105f249a63 ("drm/radeon: remove vm_manager start/suspend") from the drm
tree.
I fixed it
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/i915/intel_display.c between commit 7aa1e7f06d6e ("Revert
"drm/i915: allow PCH PWM override on IVB"") from Linus' tree and commit
8090c6b9daa0 ("drm/i915: wrap up gt powersave enabling functions") from
the drm tree
83 matches
Mail list logo
