From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EF548259497; Wed, 8 Jan 2025 01:16:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=150.107.74.76 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736299022; cv=none; b=m8A8yDqofQzhmpkWI2kCi1Xv4owZTxaTKWWLk9xV4oXytUPunztpg/D5Izj4+dleXj2ZDPBQLdR/Ag9Qzxs2Acp9LjeE/NCX8+1QTa7nZn+55TjwL3p64WY0hvTeWS90paQt7ak5yukrAYxGit3xjQH4NkgS0gSMoIHbhm8meZQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736299022; c=relaxed/simple; bh=r9gTG3nSCGbX4VN54I+VVH3s20Ta7buTw2yam6mNHh4=; h=Date:From:To:Cc:Subject:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=DfvYlq+6dNgW+3oY6TAVQnolN1lWYJfV+q6ZY2691pEDtJ9eFQxTq/pfO9/GUoIx2jjVFXFRcwnspcWBEuVVnpuIZGdfla3XAEsLOj8hPA+j4HXxc6ltgebH/7ItlhKjovBvU0Lc9AbD3qQp+mPuTkgs+USgKC+0GaajxrlGxCw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au; spf=pass smtp.mailfrom=canb.auug.org.au; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b=ge785g9W; arc=none smtp.client-ip=150.107.74.76 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canb.auug.org.au Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="ge785g9W" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1736299006; bh=jlOkedypRHGL5Jk53l881gZHsBf4esLyhBlHH6Qm2Rc=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=ge785g9Wb2AvCLIGf5uUtsqYLEkao2Y3mfNXrNvTeRzXKH3EwqJmDP9xyOUG6+LIc 7DSLxj34Tv9WyZdBgNr1a+UNvE7n3pEQ7VF7P2XwQZNg5oiadIVYw9lr+NpF06Xk+Q z8aSvn+FC5OImpftl387EYlBh1suqFNwq/Q2zmEw2aqzlgG5mKBu/IzxZRqAq+EdK5 KvZK7lvVPh+de2PNsWzMbmBCNfTL0hrvfsru+q6p9LAjd2Fi1kU/3KWbmKFGf1oX4x zE78KZU3SKfxo4ukyaC+g63Z5NlMa62vZmxrlNUB7kbYo0wftkVcBNjVPtT85rl5Os I9dwcWzZWK72A== Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mail.ozlabs.org (Postfix) with ESMTPSA id 4YSVPT5Fsdz4wcw; Wed, 8 Jan 2025 12:16:45 +1100 (AEDT) Date: Wed, 8 Jan 2025 12:16:50 +1100 From: Stephen Rothwell 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 Subject: Re: linux-next: manual merge of the drm-intel tree with the mm tree Message-ID: <20250108121650.09a8e828@canb.auug.org.au> In-Reply-To: <20250106130348.73a5fae6@canb.auug.org.au> References: <20250106130348.73a5fae6@canb.auug.org.au> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/JcddVZ1A/bWQoD+z+uYIICX"; protocol="application/pgp-signature"; micalg=pgp-sha256 --Sig_/JcddVZ1A/bWQoD+z+uYIICX Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi All, On Mon, 6 Jan 2025 13:03:48 +1100 Stephen Rothwell w= rote: > > Today's linux-next merge of the drm-intel tree got a conflict in: >=20 > drivers/gpu/drm/i915/display/intel_display_driver.c >=20 > between commit: >=20 > 4fc0cee83590 ("drivers: remove get_task_comm() and print task comm dire= ctly") >=20 > from the mm-nonmm-unstable branch of the mm tree and commit: >=20 > f5d38d4fa884 ("drm/i915/display: convert intel_display_driver.[ch] to s= truct intel_display") >=20 > from the drm-intel tree. >=20 > 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. >=20 > --=20 > Cheers, > Stephen Rothwell >=20 > 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] =3D "none"; > =20 > @@@ -399,14 -408,15 +407,14 @@@ > return true; > =20 > snprintf(current_task, sizeof(current_task), "%s[%d]", > - get_task_comm(comm, current), > - task_pid_vnr(current)); > + current->comm, task_pid_vnr(current)); > =20 > - 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)); > =20 > - drm_dbg_kms(&i915->drm, > + drm_dbg_kms(display->drm, > "Reject display access from task %s (allowed to %s)\n", > current_task, allowed_task); > =20 This is now a conflict between the drm tree and the mm-nonmm-unstable branch of the mm tree. --=20 Cheers, Stephen Rothwell --Sig_/JcddVZ1A/bWQoD+z+uYIICX Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmd90gMACgkQAVBC80lX 0GxO9gf+IhJy3/u0Fo6qFS/cy158ioGh3HI18q9dV8qeSa776WgQVEppSKm++uAb 3x2mDq1zIjXw1nlUcAHvhWDQQYNamZEQI4P0PY2iutG2WmjC6PmrJp6lctcq3CMw Nkgf75eZ5Tapl0Vu8ae5r+5QC31VIFheWHKxOQiPFxv/LP+9Mpip8QO4Aca9kq/N KPbtSVv4JHb3sOhgzRAlBEOLMoIIccelPvDZB8axpBCD/G3RJmbnB6IGCfcgSZnc CZgtM/bARYxaMXnojRaL/siDtlGL2BwFLh/2fWL0QBH+T9CYJUQP+rYmVVmc/2ip WrZiTvs9o2ZX3QAR+iT3CW8TWWjtaA== =lLfW -----END PGP SIGNATURE----- --Sig_/JcddVZ1A/bWQoD+z+uYIICX--