Hi all,
On Wed, 6 Nov 2019 13:53:40 +1100 Stephen Rothwell
wrote:
>
> Hi all,
>
> On Thu, 10 Oct 2019 13:14:48 +1100 Stephen Rothwell
> wrote:
> >
> > I added the following merge fix patch for today:
> >
>
> This patch is now just:
>
> From: Stephen Rothwell
> Date: Thu, 10 Oct 2019
On Wed, Nov 20, 2019 at 10:54 PM Stephen Rothwell wrote:
>
> Hi all,
>
> After merging the tip tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
>
> In file included from include/trace/define_trace.h:102,
> from
sure, this is a issue.
but it wiil build succesed on local drm-next branch.
and you can submit this patch to fix this issue.
thanks.
Reviewed-by: Kevin Wang
From: Stephen Rothwell
Sent: Thursday, November 21, 2019 11:54 AM
To: Thomas Gleixner; Ingo Molnar; H.
On Thu, Nov 21, 2019 at 02:54:03PM +1100, Stephen Rothwell wrote:
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h
> b/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h
> index f940526c5889..63e734a125fb 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h
> +++
Hi all,
On Thu, 10 Oct 2019 13:14:48 +1100 Stephen Rothwell
wrote:
>
> I added the following merge fix patch for today:
>
This patch is now just:
From: Stephen Rothwell
Date: Thu, 10 Oct 2019 13:08:43 +1100
Subject: [PATCH] drm/i915: update for mutex_release API change
Signed-off-by:
On Thu, Oct 10, 2019 at 10:23:21PM +1100, Stephen Rothwell wrote:
> Hi Ingo,
>
> On Thu, 10 Oct 2019 10:02:07 +0200 Ingo Molnar wrote:
> >
> > I suspect -next will have to carry this semantic merge conflict
> > resolution until the DRM tree is merged upstream.
>
> Yep, its not a real problem,
Hi Ingo,
On Thu, 10 Oct 2019 10:02:07 +0200 Ingo Molnar wrote:
>
> I suspect -next will have to carry this semantic merge conflict
> resolution until the DRM tree is merged upstream.
Yep, its not a real problem, I get a few like this every cycle.
--
Cheers,
Stephen Rothwell
* Stephen Rothwell wrote:
> Hi all,
>
> After merging the tip tree, today's linux-next build (x86_64 allmodconfig)
> failed like this:
>
> drivers/gpu/drm/i915/gt/intel_gt_pm.c: In function 'intel_gt_resume':
> drivers/gpu/drm/i915/gt/intel_gt_pm.c:183:54: error: macro "mutex_release"
>
