Hi all,
On Thu, 13 Mar 2025 14:12:53 +1100 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> drivers/gpu/drm/i915/i915_pmu.c
>
> between commit:
>
> 87b593d79864 ("drm/i915/pmu: Drop custom hotplug code")
>
> from the drm tree and commit:
>
>
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
drivers/gpu/drm/i915/i915_pmu.c
between commit:
87b593d79864 ("drm/i915/pmu: Drop custom hotplug code")
from the drm tree and commit:
82ad584eed8b ("drm/i915/pmu: Switch to use hrtimer_setup()")
from the tip tree.
I f
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
drivers/gpu/drm/i915/gt/intel_rc6.c
between commit:
3735040978a4 ("drm/i915/mtl: Synchronize i915/BIOS on C6 enabling")
from the drm tree and commit:
f7faedffa92c ("drm/i915/gt: use __xchg instead of internal helper")
Hi all,
On Thu, 10 Oct 2019 12:51:06 +1100 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> drivers/gpu/drm/i915/gem/i915_gem_shrinker.c
>
> between commit:
>
> 2850748ef876 ("drm/i915: Pull i915_vma_pin under the vm->mutex")
>
> from the drm tr
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
drivers/gpu/drm/i915/Kconfig.debug
between commit:
d30213e533fa ("drm/i915: Fix Kconfig indentation")
from the drm tree and commit:
fb041bb7c0a9 ("locking/refcount: Consolidate implementations of refcount_t")
from the
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
drivers/gpu/drm/i915/gem/i915_gem_shrinker.c
between commit:
2850748ef876 ("drm/i915: Pull i915_vma_pin under the vm->mutex")
from the drm tree and commit:
5facae4f3549 ("locking/lockdep: Remove unused @nested argument
