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,
On Wed, 8 Jan 2020 12:04:50 +1100 Stephen Rothwell
wrote:
>
> -hw_flags = 0;
> +/* For resource streamer on HSW+ and power context elsewhere */
> +BUILD_BUG_ON(HSW_MI_RS_SAVE_STATE_EN != MI_SAVE_EXT_STATE_EN);
> +BUILD_BUG_ON(HSW_MI_RS_
Hi all,
This is now a conflict between the drm tree and Linus' tree.
On Thu, 31 Oct 2019 11:33:15 +1100 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the drm tree got a conflict in:
>
> drivers/gpu/drm/i915/i915_drv.h
>
> between commit:
>
> 59cd826fb5e7 ("drm/i915: Fix PCH ref
> On Tue, Mar 21, 2017 at 5:00 PM, Stephen Rothwell
wrote:
> Hi Dave,
>
> Today's linux-next merge of the drm tree got a conflict in:
>
> drivers/gpu/drm/i915/i915_gem_shrinker.c
>
> between commit:
>
> 3d3d18f086cd ("drm/i915: Avoid rcu_barrier() from reclaim paths
(shrinker)")
>
> from the d
