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,
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,
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
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,
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 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'
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 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
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,
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
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
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
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
17 matches
Mail list logo
