From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andrew Morton <akpm@linux-foundation•org>,
Dave Airlie <airlied@redhat•com>
Cc: Simona Vetter <simona.vetter@ffwll•ch>,
Jani Nikula <jani.nikula@linux•intel.com>,
Joonas Lahtinen <joonas.lahtinen@linux•intel.com>,
Rodrigo Vivi <rodrigo.vivi@intel•com>,
Intel Graphics <intel-gfx@lists•freedesktop.org>,
DRI <dri-devel@lists•freedesktop.org>,
Jani Nikula <jani.nikula@intel•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Yafang Shao <laoar.shao@gmail•com>
Subject: Re: linux-next: manual merge of the drm-intel tree with the mm tree
Date: Wed, 8 Jan 2025 12:16:50 +1100 [thread overview]
Message-ID: <20250108121650.09a8e828@canb.auug.org.au> (raw)
In-Reply-To: <20250106130348.73a5fae6@canb.auug.org.au>
[-- 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 --]
next prev parent reply other threads:[~2025-01-08 1:16 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
2025-01-08 21:32 ` Rodrigo Vivi
2025-01-22 23:35 ` Stephen Rothwell
2025-01-23 8:24 ` Jani Nikula
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250108121650.09a8e828@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=airlied@redhat$(echo .)com \
--cc=akpm@linux-foundation$(echo .)org \
--cc=dri-devel@lists$(echo .)freedesktop.org \
--cc=intel-gfx@lists$(echo .)freedesktop.org \
--cc=jani.nikula@intel$(echo .)com \
--cc=jani.nikula@linux$(echo .)intel.com \
--cc=joonas.lahtinen@linux$(echo .)intel.com \
--cc=laoar.shao@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=rodrigo.vivi@intel$(echo .)com \
--cc=simona.vetter@ffwll$(echo .)ch \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox