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=-3.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED autolearn=no 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 495C3C433DB for ; Sun, 14 Feb 2021 22:39:18 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id AD76F64DFF for ; Sun, 14 Feb 2021 22:39:17 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AD76F64DFF Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CA1A66E104; Sun, 14 Feb 2021 22:39:16 +0000 (UTC) Received: from ozlabs.org (bilbo.ozlabs.org [203.11.71.1]) by gabe.freedesktop.org (Postfix) with ESMTPS id 71C146E103; Sun, 14 Feb 2021 22:39:15 +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 4Df2GP3p41z9rx8; Mon, 15 Feb 2021 09:39:09 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1613342353; bh=VMHVI12n/sYnj/11+gz6BWBErWtIiDEN9XaqwRspFDg=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=Q5UFaagv1VaKmBvQCvXt+ry3l6YMuxH1CffIWUubOAutw4CXE2ZhJdZpDWx0EGEb5 Texqy0X+K0clqEwC2oDzsCuLGHLiBcxrnaYDzWam7Q0zbg5OJgH4haeQG0Y1l/BnJC TOpI0T5NxkLYYaOBSGhXMjMDu4Pxh6ah8JJit2SoIHVOvmLnkXEt/Q5ytuRIhPOLRK qZ86Uk9l7Yu8iut7dxfHmp6Vx3uTM5e7+mpBrQlL3d8PIloxLA0N9DhUERpjz9DVH3 ak6nxqeZGLgiH5Pp9DPWP1K+NY5uedchMD9ahmdr+u09FSA3oHIfeT8vhWxT+AHaTg Y2qJ0/FyXk0DQ== Date: Mon, 15 Feb 2021 09:39:08 +1100 From: Stephen Rothwell To: Hans de Goede , Mark Gross , Daniel Vetter , Intel Graphics , DRI , "Rafael J. Wysocki" Subject: Re: linux-next: manual merge of the drivers-x86 tree with the drm-misc tree Message-ID: <20210215093908.06e349bf@canb.auug.org.au> In-Reply-To: <20210204155846.5aef94a8@canb.auug.org.au> References: <20210204155846.5aef94a8@canb.auug.org.au> MIME-Version: 1.0 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: Linux Next Mailing List , Andy Shevchenko , Linux Kernel Mailing List , Thomas Zimmermann Content-Type: multipart/mixed; boundary="===============1054593303==" Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" --===============1054593303== Content-Type: multipart/signed; boundary="Sig_/fcEgAKpFpYpY8sFQopChY8R"; protocol="application/pgp-signature"; micalg=pgp-sha256 --Sig_/fcEgAKpFpYpY8sFQopChY8R Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, On Thu, 4 Feb 2021 15:58:46 +1100 Stephen Rothwell w= rote: >=20 > Today's linux-next merge of the drivers-x86 tree got a conflict in: >=20 > drivers/gpu/drm/gma500/Kconfig > drivers/gpu/drm/gma500/mdfld_device.c > drivers/gpu/drm/gma500/mdfld_dsi_output.c > drivers/gpu/drm/gma500/mdfld_output.c > drivers/gpu/drm/gma500/tc35876x-dsi-lvds.c >=20 > between commits: >=20 > b51035c200bd ("drm/gma500: Remove Medfield support") Now e1da811218d2 ("drm/gma500: Remove Medfield support") > 837f23bb4b60 ("drm/gma500: Drop DRM_GMA3600 config option") Now 26499e0518a7 ("drm/gma500: Drop DRM_GMA3600 config option") >=20 > from the drm-misc tree and commit: >=20 > bfc838f8598e ("drm/gma500: Convert to use new SCU IPC API") > 25ded39ad064 ("drm/gma500: Get rid of duplicate NULL checks") >=20 > from the drivers-x86 tree. >=20 > I fixed it up (the former removed the text that was updated by the > latter and removed the last 4 files) 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. With the merge window about to open, this is a reminder that this conflict still exists. The two drivers-x86 tree commits have also been merged into the pm tree. --=20 Cheers, Stephen Rothwell --Sig_/fcEgAKpFpYpY8sFQopChY8R Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmAppowACgkQAVBC80lX 0Gxl3wgAhhEyvRY4qiXMEtT4FpGLU1UyQNXQFRtdXb/dKQVXzZZCuqH3Gx5V18i/ mcXC55FKpS2uPSBUdk37HTQTdrhtolvI2CN52jB3afpcVQgIt+g13WkPl1oYil9v NxvZsMn8RV1Hdy/9ROGxb5I3ASENJsCEpTwzByMU19C3udFB/PGTBSkanYoxuES+ fsrBPbGw9/s6GQWsrC4opfCDE+gUdehkRambSJhWjbAS0MeWdOD6oaqLJp5bZm3A 55AO0txPTZLKfbcW5l/sXCHJz3OUulfLNnih0LlZtvxtPJ8TDwzWmpP2uAeV0ZX0 I/gYSyPFNwwlMmXbToELUic6I6BStA== =wY4n -----END PGP SIGNATURE----- --Sig_/fcEgAKpFpYpY8sFQopChY8R-- --===============1054593303== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel --===============1054593303==--