* linux-next: manual merge of the drm-intel tree with the mm tree
@ 2025-01-06 2:03 Stephen Rothwell
2025-01-08 1:16 ` Stephen Rothwell
0 siblings, 1 reply; 5+ messages in thread
From: Stephen Rothwell @ 2025-01-06 2:03 UTC (permalink / raw)
To: Simona Vetter, Jani Nikula, Joonas Lahtinen, Rodrigo Vivi,
Andrew Morton
Cc: Intel Graphics, DRI, Jani Nikula, Linux Kernel Mailing List,
Linux Next Mailing List, Yafang Shao
[-- Attachment #1: Type: text/plain, Size: 2311 bytes --]
Hi all,
Today's linux-next merge of the drm-intel tree got a conflict in:
drivers/gpu/drm/i915/display/intel_display_driver.c
between commit:
4fc0cee83590 ("drivers: remove get_task_comm() and print task comm directly")
from the mm-nonmm-unstable branch of the mm tree and commit:
f5d38d4fa884 ("drm/i915/display: convert intel_display_driver.[ch] to struct intel_display")
from the drm-intel tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/gpu/drm/i915/display/intel_display_driver.c
index 62596424a9aa,497b4a1f045f..000000000000
--- a/drivers/gpu/drm/i915/display/intel_display_driver.c
+++ b/drivers/gpu/drm/i915/display/intel_display_driver.c
@@@ -389,8 -397,9 +397,8 @@@ void intel_display_driver_resume_access
* Returns %true if the current thread has display HW access, %false
* otherwise.
*/
- bool intel_display_driver_check_access(struct drm_i915_private *i915)
+ bool intel_display_driver_check_access(struct intel_display *display)
{
- char comm[TASK_COMM_LEN];
char current_task[TASK_COMM_LEN + 16];
char allowed_task[TASK_COMM_LEN + 16] = "none";
@@@ -399,14 -408,15 +407,14 @@@
return true;
snprintf(current_task, sizeof(current_task), "%s[%d]",
- get_task_comm(comm, current),
- task_pid_vnr(current));
+ current->comm, task_pid_vnr(current));
- if (i915->display.access.allowed_task)
+ if (display->access.allowed_task)
snprintf(allowed_task, sizeof(allowed_task), "%s[%d]",
- i915->display.access.allowed_task->comm,
- task_pid_vnr(i915->display.access.allowed_task));
- get_task_comm(comm, display->access.allowed_task),
++ display->access.allowed_task->comm,
+ task_pid_vnr(display->access.allowed_task));
- drm_dbg_kms(&i915->drm,
+ drm_dbg_kms(display->drm,
"Reject display access from task %s (allowed to %s)\n",
current_task, allowed_task);
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: linux-next: manual merge of the drm-intel tree with the mm tree
2025-01-06 2:03 linux-next: manual merge of the drm-intel tree with the mm tree Stephen Rothwell
@ 2025-01-08 1:16 ` Stephen Rothwell
2025-01-08 21:32 ` Rodrigo Vivi
2025-01-22 23:35 ` Stephen Rothwell
0 siblings, 2 replies; 5+ messages in thread
From: Stephen Rothwell @ 2025-01-08 1:16 UTC (permalink / raw)
To: Andrew Morton, Dave Airlie
Cc: Simona Vetter, Jani Nikula, Joonas Lahtinen, Rodrigo Vivi,
Intel Graphics, DRI, Jani Nikula, Linux Kernel Mailing List,
Linux Next Mailing List, Yafang Shao
[-- Attachment #1: Type: text/plain, Size: 2651 bytes --]
Hi All,
On Mon, 6 Jan 2025 13:03:48 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the drm-intel tree got a conflict in:
>
> drivers/gpu/drm/i915/display/intel_display_driver.c
>
> between commit:
>
> 4fc0cee83590 ("drivers: remove get_task_comm() and print task comm directly")
>
> from the mm-nonmm-unstable branch of the mm tree and commit:
>
> f5d38d4fa884 ("drm/i915/display: convert intel_display_driver.[ch] to struct intel_display")
>
> from the drm-intel tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc drivers/gpu/drm/i915/display/intel_display_driver.c
> index 62596424a9aa,497b4a1f045f..000000000000
> --- a/drivers/gpu/drm/i915/display/intel_display_driver.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_driver.c
> @@@ -389,8 -397,9 +397,8 @@@ void intel_display_driver_resume_access
> * Returns %true if the current thread has display HW access, %false
> * otherwise.
> */
> - bool intel_display_driver_check_access(struct drm_i915_private *i915)
> + bool intel_display_driver_check_access(struct intel_display *display)
> {
> - char comm[TASK_COMM_LEN];
> char current_task[TASK_COMM_LEN + 16];
> char allowed_task[TASK_COMM_LEN + 16] = "none";
>
> @@@ -399,14 -408,15 +407,14 @@@
> return true;
>
> snprintf(current_task, sizeof(current_task), "%s[%d]",
> - get_task_comm(comm, current),
> - task_pid_vnr(current));
> + current->comm, task_pid_vnr(current));
>
> - if (i915->display.access.allowed_task)
> + if (display->access.allowed_task)
> snprintf(allowed_task, sizeof(allowed_task), "%s[%d]",
> - i915->display.access.allowed_task->comm,
> - task_pid_vnr(i915->display.access.allowed_task));
> - get_task_comm(comm, display->access.allowed_task),
> ++ display->access.allowed_task->comm,
> + task_pid_vnr(display->access.allowed_task));
>
> - drm_dbg_kms(&i915->drm,
> + drm_dbg_kms(display->drm,
> "Reject display access from task %s (allowed to %s)\n",
> current_task, allowed_task);
>
This is now a conflict between the drm tree and the mm-nonmm-unstable
branch of the mm tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: linux-next: manual merge of the drm-intel tree with the mm tree
2025-01-08 1:16 ` Stephen Rothwell
@ 2025-01-08 21:32 ` Rodrigo Vivi
2025-01-22 23:35 ` Stephen Rothwell
1 sibling, 0 replies; 5+ messages in thread
From: Rodrigo Vivi @ 2025-01-08 21:32 UTC (permalink / raw)
To: Stephen Rothwell, dri-devel
Cc: Andrew Morton, Dave Airlie, Simona Vetter, Jani Nikula,
Joonas Lahtinen, Intel Graphics, DRI, Jani Nikula,
Linux Kernel Mailing List, Linux Next Mailing List, Yafang Shao
On Wed, Jan 08, 2025 at 12:16:50PM +1100, Stephen Rothwell wrote:
> Hi All,
>
> On Mon, 6 Jan 2025 13:03:48 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Today's linux-next merge of the drm-intel tree got a conflict in:
> >
> > drivers/gpu/drm/i915/display/intel_display_driver.c
> >
> > between commit:
> >
> > 4fc0cee83590 ("drivers: remove get_task_comm() and print task comm directly")
I don't believe this patch was acked by us, next time it would be good to get
different patches for different drivers with the proper acks for visibility on
these kind of conflicts.
But if the conflicts are easy to handle right now, let it be...
> >
> > from the mm-nonmm-unstable branch of the mm tree and commit:
> >
> > f5d38d4fa884 ("drm/i915/display: convert intel_display_driver.[ch] to struct intel_display")
> >
> > from the drm-intel tree.
> >
> > I fixed it up (see below) and can carry the fix as necessary. This
> > is now fixed as far as linux-next is concerned, but any non trivial
> > conflicts should be mentioned to your upstream maintainer when your tree
> > is submitted for merging. You may also want to consider cooperating
> > with the maintainer of the conflicting tree to minimise any particularly
> > complex conflicts.
> >
> > --
> > Cheers,
> > Stephen Rothwell
> >
> > diff --cc drivers/gpu/drm/i915/display/intel_display_driver.c
> > index 62596424a9aa,497b4a1f045f..000000000000
> > --- a/drivers/gpu/drm/i915/display/intel_display_driver.c
> > +++ b/drivers/gpu/drm/i915/display/intel_display_driver.c
> > @@@ -389,8 -397,9 +397,8 @@@ void intel_display_driver_resume_access
> > * Returns %true if the current thread has display HW access, %false
> > * otherwise.
> > */
> > - bool intel_display_driver_check_access(struct drm_i915_private *i915)
> > + bool intel_display_driver_check_access(struct intel_display *display)
> > {
> > - char comm[TASK_COMM_LEN];
> > char current_task[TASK_COMM_LEN + 16];
> > char allowed_task[TASK_COMM_LEN + 16] = "none";
> >
> > @@@ -399,14 -408,15 +407,14 @@@
> > return true;
> >
> > snprintf(current_task, sizeof(current_task), "%s[%d]",
> > - get_task_comm(comm, current),
> > - task_pid_vnr(current));
> > + current->comm, task_pid_vnr(current));
> >
> > - if (i915->display.access.allowed_task)
> > + if (display->access.allowed_task)
> > snprintf(allowed_task, sizeof(allowed_task), "%s[%d]",
> > - i915->display.access.allowed_task->comm,
> > - task_pid_vnr(i915->display.access.allowed_task));
> > - get_task_comm(comm, display->access.allowed_task),
> > ++ display->access.allowed_task->comm,
> > + task_pid_vnr(display->access.allowed_task));
> >
> > - drm_dbg_kms(&i915->drm,
> > + drm_dbg_kms(display->drm,
> > "Reject display access from task %s (allowed to %s)\n",
> > current_task, allowed_task);
> >
>
> This is now a conflict between the drm tree and the mm-nonmm-unstable
> branch of the mm tree.
>
> --
> Cheers,
> Stephen Rothwell
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: linux-next: manual merge of the drm-intel tree with the mm tree
2025-01-08 1:16 ` Stephen Rothwell
2025-01-08 21:32 ` Rodrigo Vivi
@ 2025-01-22 23:35 ` Stephen Rothwell
2025-01-23 8:24 ` Jani Nikula
1 sibling, 1 reply; 5+ messages in thread
From: Stephen Rothwell @ 2025-01-22 23:35 UTC (permalink / raw)
To: Andrew Morton
Cc: Dave Airlie, Simona Vetter, Jani Nikula, Joonas Lahtinen,
Rodrigo Vivi, Intel Graphics, DRI, Jani Nikula,
Linux Kernel Mailing List, Linux Next Mailing List, Yafang Shao
[-- Attachment #1: Type: text/plain, Size: 2944 bytes --]
Hi all,
On Wed, 8 Jan 2025 12:16:50 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Mon, 6 Jan 2025 13:03:48 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Today's linux-next merge of the drm-intel tree got a conflict in:
> >
> > drivers/gpu/drm/i915/display/intel_display_driver.c
> >
> > between commit:
> >
> > 4fc0cee83590 ("drivers: remove get_task_comm() and print task comm directly")
> >
> > from the mm-nonmm-unstable branch of the mm tree and commit:
> >
> > f5d38d4fa884 ("drm/i915/display: convert intel_display_driver.[ch] to struct intel_display")
> >
> > from the drm-intel tree.
> >
> > I fixed it up (see below) and can carry the fix as necessary. This
> > is now fixed as far as linux-next is concerned, but any non trivial
> > conflicts should be mentioned to your upstream maintainer when your tree
> > is submitted for merging. You may also want to consider cooperating
> > with the maintainer of the conflicting tree to minimise any particularly
> > complex conflicts.
> >
> > --
> > Cheers,
> > Stephen Rothwell
> >
> > diff --cc drivers/gpu/drm/i915/display/intel_display_driver.c
> > index 62596424a9aa,497b4a1f045f..000000000000
> > --- a/drivers/gpu/drm/i915/display/intel_display_driver.c
> > +++ b/drivers/gpu/drm/i915/display/intel_display_driver.c
> > @@@ -389,8 -397,9 +397,8 @@@ void intel_display_driver_resume_access
> > * Returns %true if the current thread has display HW access, %false
> > * otherwise.
> > */
> > - bool intel_display_driver_check_access(struct drm_i915_private *i915)
> > + bool intel_display_driver_check_access(struct intel_display *display)
> > {
> > - char comm[TASK_COMM_LEN];
> > char current_task[TASK_COMM_LEN + 16];
> > char allowed_task[TASK_COMM_LEN + 16] = "none";
> >
> > @@@ -399,14 -408,15 +407,14 @@@
> > return true;
> >
> > snprintf(current_task, sizeof(current_task), "%s[%d]",
> > - get_task_comm(comm, current),
> > - task_pid_vnr(current));
> > + current->comm, task_pid_vnr(current));
> >
> > - if (i915->display.access.allowed_task)
> > + if (display->access.allowed_task)
> > snprintf(allowed_task, sizeof(allowed_task), "%s[%d]",
> > - i915->display.access.allowed_task->comm,
> > - task_pid_vnr(i915->display.access.allowed_task));
> > - get_task_comm(comm, display->access.allowed_task),
> > ++ display->access.allowed_task->comm,
> > + task_pid_vnr(display->access.allowed_task));
> >
> > - drm_dbg_kms(&i915->drm,
> > + drm_dbg_kms(display->drm,
> > "Reject display access from task %s (allowed to %s)\n",
> > current_task, allowed_task);
> >
>
> This is now a conflict between the drm tree and the mm-nonmm-unstable
> branch of the mm tree.
And now a conflict between Linus' tree and the mm-nonmm-stable tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: linux-next: manual merge of the drm-intel tree with the mm tree
2025-01-22 23:35 ` Stephen Rothwell
@ 2025-01-23 8:24 ` Jani Nikula
0 siblings, 0 replies; 5+ messages in thread
From: Jani Nikula @ 2025-01-23 8:24 UTC (permalink / raw)
To: Stephen Rothwell, Andrew Morton
Cc: Dave Airlie, Simona Vetter, Joonas Lahtinen, Rodrigo Vivi,
Intel Graphics, DRI, Linux Kernel Mailing List,
Linux Next Mailing List, Yafang Shao
On Thu, 23 Jan 2025, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> On Wed, 8 Jan 2025 12:16:50 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> On Mon, 6 Jan 2025 13:03:48 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>> >
>> > Today's linux-next merge of the drm-intel tree got a conflict in:
>> >
>> > drivers/gpu/drm/i915/display/intel_display_driver.c
>> >
>> > between commit:
>> >
>> > 4fc0cee83590 ("drivers: remove get_task_comm() and print task comm directly")
>> >
>> > from the mm-nonmm-unstable branch of the mm tree and commit:
>> >
>> > f5d38d4fa884 ("drm/i915/display: convert intel_display_driver.[ch] to struct intel_display")
>> >
>> > from the drm-intel tree.
>> >
>> > I fixed it up (see below) and can carry the fix as necessary. This
>> > is now fixed as far as linux-next is concerned, but any non trivial
>> > conflicts should be mentioned to your upstream maintainer when your tree
>> > is submitted for merging. You may also want to consider cooperating
>> > with the maintainer of the conflicting tree to minimise any particularly
>> > complex conflicts.
>> >
>> > --
>> > Cheers,
>> > Stephen Rothwell
>> >
>> > diff --cc drivers/gpu/drm/i915/display/intel_display_driver.c
>> > index 62596424a9aa,497b4a1f045f..000000000000
>> > --- a/drivers/gpu/drm/i915/display/intel_display_driver.c
>> > +++ b/drivers/gpu/drm/i915/display/intel_display_driver.c
>> > @@@ -389,8 -397,9 +397,8 @@@ void intel_display_driver_resume_access
>> > * Returns %true if the current thread has display HW access, %false
>> > * otherwise.
>> > */
>> > - bool intel_display_driver_check_access(struct drm_i915_private *i915)
>> > + bool intel_display_driver_check_access(struct intel_display *display)
>> > {
>> > - char comm[TASK_COMM_LEN];
>> > char current_task[TASK_COMM_LEN + 16];
>> > char allowed_task[TASK_COMM_LEN + 16] = "none";
>> >
>> > @@@ -399,14 -408,15 +407,14 @@@
>> > return true;
>> >
>> > snprintf(current_task, sizeof(current_task), "%s[%d]",
>> > - get_task_comm(comm, current),
>> > - task_pid_vnr(current));
>> > + current->comm, task_pid_vnr(current));
>> >
>> > - if (i915->display.access.allowed_task)
>> > + if (display->access.allowed_task)
>> > snprintf(allowed_task, sizeof(allowed_task), "%s[%d]",
>> > - i915->display.access.allowed_task->comm,
>> > - task_pid_vnr(i915->display.access.allowed_task));
>> > - get_task_comm(comm, display->access.allowed_task),
>> > ++ display->access.allowed_task->comm,
>> > + task_pid_vnr(display->access.allowed_task));
>> >
>> > - drm_dbg_kms(&i915->drm,
>> > + drm_dbg_kms(display->drm,
>> > "Reject display access from task %s (allowed to %s)\n",
>> > current_task, allowed_task);
>> >
>>
>> This is now a conflict between the drm tree and the mm-nonmm-unstable
>> branch of the mm tree.
>
> And now a conflict between Linus' tree and the mm-nonmm-stable tree.
Will be taken care of with backmerges after -rc1.
BR,
Jani.
--
Jani Nikula, Intel
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2025-01-23 8:24 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-01-06 2:03 linux-next: manual merge of the drm-intel tree with the mm tree Stephen Rothwell
2025-01-08 1:16 ` Stephen Rothwell
2025-01-08 21:32 ` Rodrigo Vivi
2025-01-22 23:35 ` Stephen Rothwell
2025-01-23 8:24 ` Jani Nikula
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).