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 3788F54652; Fri, 18 Jul 2025 04:41:45 +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=1752813712; cv=none; b=hgQn/X+1lS33oy65laUR3G/rvk2tYN9VXkRWrliUQB0Oelvu9xcE6kLsgs3IDm4RggHFWFHQ93c7+n9SyHYGPDLVdZG4+bnGXtJMXnnbp1dZv8tYj0Zy8/mjd5wlvRFw4UoLKmaTC3DZJQ5rHW/xwYP/04KzG7eZXrMIaeBz8eQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752813712; c=relaxed/simple; bh=B9wQutUeG4ktiB7AHxXt2vy1Lm2PiHVygeBeUEhKqJk=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=NUYageAef2JHlC/dQhjJCFp0axG1KPfNjGmvhqnsrrumZi4JxR4eMrfgiRLZywuHM/lcl6EKL2/lVWvGDCj8IszcwbU69zMieS9aSFtXNS6P5g7NWgU0DH6N1eHHIHULCluGWAW+K/rpz1cJPAYmHexlmKjBW9ITm0KKUlnFhv0= 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=BpkmQrQ+; 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="BpkmQrQ+" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=202503; t=1752813574; bh=JeavPSIrkxNZAXoNhH/veRqbvwQUMoU2cFs85kP8w3o=; h=Date:From:To:Cc:Subject:From; b=BpkmQrQ+WRiFI7VEYcQR2Zkyow6MPLgbOQMIlNY3cSPk6k7nNi2XGkvPWAl/hTS+8 8RO1WasNl6Vax83Bd9AGgBsm5h0Ij5cn8MSgDkRp/jCsVoJjRSuv5/2+R0l43y7KfF uemSnWFPqH5BDWK0a/xVkIXcOQapPWC7z7hONXvr5FAnNYYYEMZP+KAaFdpztQKLvj GbNkVMrZEZJsw+zqyOPj2RHkJAV8L5PISOBK0biLEqFdipu7gI410zugsmtKW/quEc sGXB38ftq+PV6TXoz1/sqa3Dl4ecwJXjLxV1OeuV9FAWPoHeCKjj+tbKVyl7aq/jD/ pJQyjWgb8T/gg== 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 4bjxsJ4R9bz4xQN; Fri, 18 Jul 2025 14:39:32 +1000 (AEST) Date: Fri, 18 Jul 2025 14:41:40 +1000 From: Stephen Rothwell To: Dave Airlie , Simona Vetter Cc: Intel Graphics , DRI , Dmitry Osipenko , Linux Kernel Mailing List , Linux Next Mailing List , Thomas Zimmermann , Vivek Kasireddy Subject: linux-next: manual merge of the drm tree with the drm-misc-fixes tree Message-ID: <20250718144140.202fcca5@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_/sr6znU7d7YfW2jYBh6hCX8n"; protocol="application/pgp-signature"; micalg=pgp-sha256 --Sig_/sr6znU7d7YfW2jYBh6hCX8n Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/virtio/virtgpu_prime.c between commit: 0ecfb8ddb953 ("Revert "drm/virtio: Use dma_buf from GEM object instance"") from the drm-misc-fixes tree and commit: 44b6535d8ace ("drm/virtio: Fix NULL pointer deref in virtgpu_dma_buf_free= _obj()") from the drm tree. I fixed it up (I used the latter version - reverting the former by hand) 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 Cheers, Stephen Rothwell --Sig_/sr6znU7d7YfW2jYBh6hCX8n Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmh50IQACgkQAVBC80lX 0GxGUggAhJGJXYOxtwr9+wnw3DqoCsV8Y+o8O8v5PM0oYFAUiP0/3CYcEbPshFm2 N/vGlPdVD9u4x9Q92iLALsDyPYrgS8OIIZsi3lt4M2WpSsc1oCV/JmgEolUm0oKH IXdS0nzFdsJU7rXvv8ttLpGoG7GaMop3KA6kbW24i0QYLtSwXzq0GlmA/khuC6dK t7Sf7jpUt1SSk2U8xYkimCU8H8Fe7UhPSatoXhU/FY8Og95bVqGkitY0jEzfNIPT c8HHgFNWquCNNzmMZil0BzkX+ZTzjk5aceaEkiIvW8UeLKV8crPCvlFz7aAq9Q2O 7XYKVYAqmV+Re8RHT+rSd+ka4zxaJw== =HD98 -----END PGP SIGNATURE----- --Sig_/sr6znU7d7YfW2jYBh6hCX8n--