From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B4719C7EE22 for ; Mon, 15 May 2023 01:14:21 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BF86610E115; Mon, 15 May 2023 01:14:20 +0000 (UTC) Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4291210E10B for ; Mon, 15 May 2023 01:14:17 +0000 (UTC) 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 ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4QKLxF4vC7z4x4D; Mon, 15 May 2023 11:14:09 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1684113251; bh=5eO6hmlEDHMYvF+MD1uVdqvOY9u8sSGqBFatZrLOT/I=; h=Date:From:To:Cc:Subject:From; b=U3YG/GL2kYoW7PtMdnzmvyWMHrkmHl7/GfL+3dR8fuO0kVU7UfNi+ipxpJVQddVNO RSv7x97vJ4sSugE5uecZUSKRVfVCZ1NNm2Md9lLh4Ihb4aGO7xyozI15ldIUIQq/2i ZxH3QPvQHkYjFcRnprsRiOc+2dtg7j+tq6o8ioWXHgjX3ro6lBmZzz2m+W1TkJO1Fk Pya5WHkh+mXEepvLujwrN5jB07StbpHGjNRUUIazGkJLs9qKELWYDkcTFRFknoBRVR lL2n7scQAmIMUx5b36oYXCTHXaalLpQtWZPU6anOv7w1fYNDzVD7m0N7u2yg/7nTLI mUTrOZZJtvNaw== Date: Mon, 15 May 2023 11:14:07 +1000 From: Stephen Rothwell To: Daniel Vetter , Intel Graphics , DRI Subject: linux-next: manual merge of the drm-misc tree with Linus' tree Message-ID: <20230515111407.493674b3@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/lUWi8Sea6sAsGuu5Z9aCWoO"; protocol="application/pgp-signature"; micalg=pgp-sha256 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Helge Deller , Linux Next Mailing List , Linux Kernel Mailing List , Thomas Zimmermann Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" --Sig_/lUWi8Sea6sAsGuu5Z9aCWoO Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/video/fbdev/stifb.c between commit: 8000425739dc ("fbdev: stifb: Remove trailing whitespaces") from Linus' tree and commit: 0d556f1f0e01 ("video: Remove trailing whitespaces") from the drm-misc tree. I fixed it up (the changes in the latter included those in the former) 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_/lUWi8Sea6sAsGuu5Z9aCWoO Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmRhh18ACgkQAVBC80lX 0Gwq3wf9EygXdY6GTEMIzQT76/h5OODPwyMnZzJfF3+QBvLFLQWNRgCTskigN9K4 l9grkvFxM8tCZJ9W9VgFuTPnRiNLg7r2o6Yzo774RQh0yVB/VFK/Mo2jbDTWSaNu vBDryZ1t+uyDM6+Rj/tL/CgQ+nu+H5a0K+BCGWi6RvaysLUDIm3XvLar2aVz1gmw M9N9jh7LPh3mHFmhb1FZjXiuq8r/q9NOMDD2M5zf9ly9sSU5wbaR6fJgc+5H8fr2 Dhg++vlLv0P5k38y8QjM6+lTmLdDANuzqUk1Fh6ONocy1kM9iA3DnePDkXgGR3Wi T7OQOCp8AtjZ+2raGIwPXXiETEpoGw== =MPnr -----END PGP SIGNATURE----- --Sig_/lUWi8Sea6sAsGuu5Z9aCWoO--