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 X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0D2D8C4338F for ; Tue, 27 Jul 2021 12:01:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E640361A38 for ; Tue, 27 Jul 2021 12:01:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231845AbhG0MBe (ORCPT ); Tue, 27 Jul 2021 08:01:34 -0400 Received: from mail.kernel.org ([198.145.29.99]:56136 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231863AbhG0MBb (ORCPT ); Tue, 27 Jul 2021 08:01:31 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 7116661A38; Tue, 27 Jul 2021 12:01:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1627387292; bh=H6GBvjIm6gs/iLbLE96kn/VqKHUusHV0IfYP8LTdKuc=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=anIocG4OWAwzmllx6ZRPVFzCiFPqZzRXWMI8tjJGgbGhWa1ObkMmscUx6T1ORakn8 cQRKCsQ032g5Iw7F/t3V9TuBudHnysG4NPSNkG80hA0/rVy8scMpMofQIz8Gy/+/Ua O54CC2fWELD3+m2hETwm2vGztpZXlHMmnFgkP8CROD9PkXrvCXCKY+7jNgiB2y/li/ 4iPxXXADcVdBDq+1NANnmkO+Vj+ur/AUKXgaINkjp2Qf6juZG6aYlh4QgM87qx5v37 Sz0OJDgOSNYPpXnm4mby2Sbl+MO2iYMhXa1rdvu71mGh0/FfxzFYr7D7RbrXzkEm3R ZxVaSpt4epHUg== Date: Tue, 27 Jul 2021 13:01:22 +0100 From: Mark Brown To: Daniel Vetter Cc: Intel Graphics , DRI , Linux Kernel Mailing List , Linux Next Mailing List , Zack Rusin Subject: Re: linux-next: manual merge of the drm-misc tree with the drm-next tree Message-ID: <20210727120122.GR4670@sirena.org.uk> References: <20210727111448.1443-1-broonie@kernel.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="RpDyejMaDGJhP2PU" Content-Disposition: inline In-Reply-To: X-Cookie: Vini, vidi, Linux! User-Agent: Mutt/1.10.1 (2018-07-13) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --RpDyejMaDGJhP2PU Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Tue, Jul 27, 2021 at 01:41:30PM +0200, Daniel Vetter wrote: > On Tue, Jul 27, 2021 at 1:15 PM Mark Brown wrote: > > Today's linux-next merge of the drm-misc tree got a conflict in: > > drivers/gpu/drm/vmwgfx/vmwgfx_drv.h > > between commit: > > ebc9ac7c3dfe ("drm/vmwgfx: Update device headers") > > from the drm-next tree and commit: > > be4f77ac6884 ("drm/vmwgfx: Cleanup fifo mmio handling") > > from the drm-misc tree. > I got confused for a bit how we managed a conflict here because vmwgfx > flows drm-misc.git -> drm.git -> linus. The 2nd patch is in > drm-misc-fixes, which makes sense, not in drm-misc-next like I assumed > at first drm-misc means. I probably misidentified the tree when I was reporting things TBH - there's so many DRM trees and they're constantly generating conflicts that I sometimes rush through it a bit, especially for the simpler ones like this. --RpDyejMaDGJhP2PU Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAmD/9ZEACgkQJNaLcl1U h9By1Af+JO44Ehk6vlvcgLV8W9uQiouHcojGdJQaD4MHuFGlDy46R3h/TuTDrb0M nj5AC8yfcJx4joEF9hVYXQEWXP9LKut4afpJjpeSy/vpFsV1xmlHkKo8AtAO8Urb osfKHwSQwwljQ+chkXP6v2zEX3DrzoscSXgJO/F9WqPLlXnWpTR4v3FVaiiIt2ob FLb5367epKV1dSre54YYba4BDCz0EyOL5FpL/v3RQsQ3MUfPUqFVIMPF22fVJYTS M2m0EKEPhFPR1Gu/mYGNKPfBXygQeIwBmg6voBj9WHoHBegcZzBe2yWzWsPe5Xh5 9VBig7YPnN3wLDpIQelbXU33OSnY4w== =L+/4 -----END PGP SIGNATURE----- --RpDyejMaDGJhP2PU--