On Wed, 02 Oct 2024, Boris Brezillon <boris.brezillon@xxxxxxxxxxxxx> wrote:
> Queued to drm-misc-next after applying the few modifications I
> mentioned. Also added Steve's ack (given on IRC) on the first patch.
Can we have the drm-tip rebuild conflict resolution too, please?
diff --cc drivers/gpu/drm/panthor/panthor_drv.c
index c520f156e2d7,f9b93f84d611..000000000000
--- a/drivers/gpu/drm/panthor/panthor_drv.c
+++ b/drivers/gpu/drm/panthor/panthor_drv.c
@@@ -1383,7 -1476,7 +1476,11 @@@ static const struct file_operations pan
.read = drm_read,
.llseek = noop_llseek,
.mmap = panthor_mmap,
++<<<<<<< HEAD
+ .fop_flags = FOP_UNSIGNED_OFFSET,
++=======
+ .show_fdinfo = drm_show_fdinfo,
++>>>>>>> drm-misc/drm-misc-next
};
#ifdef CONFIG_DEBUG_FS
>
>>
>> .../testing/sysfs-driver-panthor-profiling | 10 +
>> Documentation/gpu/panthor.rst | 46 +++
>> drivers/gpu/drm/panthor/panthor_devfreq.c | 18 +-
>> drivers/gpu/drm/panthor/panthor_device.h | 36 ++
>> drivers/gpu/drm/panthor/panthor_drv.c | 73 ++++
>> drivers/gpu/drm/panthor/panthor_gem.c | 12 +
>> drivers/gpu/drm/panthor/panthor_sched.c | 384 +++++++++++++++---
>> drivers/gpu/drm/panthor/panthor_sched.h | 2 +
>> 8 files changed, 531 insertions(+), 50 deletions(-)
>> create mode 100644 Documentation/ABI/testing/sysfs-driver-panthor-profiling
>> create mode 100644 Documentation/gpu/panthor.rst
>>
>
--
Jani Nikula, Intel
