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.9 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS 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 4F18CC43461 for ; Tue, 8 Sep 2020 11:06:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1E2572087D for ; Tue, 8 Sep 2020 11:06:28 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="CaXld08Y" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729259AbgIHLGV (ORCPT ); Tue, 8 Sep 2020 07:06:21 -0400 Received: from bilbo.ozlabs.org ([203.11.71.1]:37317 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729625AbgIHLGF (ORCPT ); Tue, 8 Sep 2020 07:06:05 -0400 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 4Bm2Nf16mGz9sPB; Tue, 8 Sep 2020 21:04:50 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1599563092; bh=6U+pqYLfxynVW7ZBWg5ewtSebrhAHs8Jw/8Fsgfyq0Q=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=CaXld08YvgRf7d39KaKgHP619xkysrKAzZdRY2sqZ0tQerwYvkE0GwKePLTW5SxDf 1eg/R3asmvc6sRCDO3kb0sV3KSBu/hdBD8ksAueQANLDhT8xJweSXTrA9jRt634/di ewHOLutGWOkiqBAm5qpo+ic/M++ML7+vRoTYkR3YLNuxVcx/6vQ7CGqMvXKZ/z3dkp tACT/u4z05iYE8zAbUz6F24BvjZs0OQhnYwMC7IFqxuNpdXuTH3rFKm/ZDVbizm742 Fij/LE8BI+XdhzcQcAIW+B2rlx3pTEgMWn4PBedj97223donzxhO6brrtrW7iWy4sY kI2KSOrUK6Flw== Date: Tue, 8 Sep 2020 21:04:49 +1000 From: Stephen Rothwell To: Hans de Goede Cc: Daniel Vetter , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Intel Graphics , DRI , Guru Das Srinagesh , Thierry Reding , Linux Next Mailing List , Linux Kernel Mailing List Subject: Re: linux-next: manual merge of the drm-intel tree with Linus' tree Message-ID: <20200908210449.1a4f8e52@canb.auug.org.au> In-Reply-To: References: <20200908140022.67dd3801@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/dGXS.TNI7czMZikC=h9RWLW"; protocol="application/pgp-signature"; micalg=pgp-sha256 Sender: linux-next-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org --Sig_/dGXS.TNI7czMZikC=h9RWLW Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi Hans, On Tue, 8 Sep 2020 10:22:06 +0200 Hans de Goede wrote: > > On 9/8/20 6:00 AM, Stephen Rothwell wrote: > >=20 > > Today's linux-next merge of the drm-intel tree got a conflict in: > >=20 > > drivers/gpu/drm/i915/display/intel_panel.c > >=20 > > between commit: > >=20 > > f8bd54d21904 ("drm/i915: panel: Use atomic PWM API for devs with an = external PWM controller") This should have been 899c537c25f9 ("drm/i915: Use 64-bit division macro") > >=20 > > from Linus' tree and commit: > >=20 > > 6b51e7d23aa8 ("drm/i915: panel: Honor the VBT PWM frequency for devs= with an external PWM controller") =20 >=20 > That doesn't sound correct, those are both commits from the drm-intel tre= e. >=20 > > from the drm-intel tree. > >=20 > > I fixed it up (I just used the latter) =20 >=20 > Just taking the drivers/gpu/drm/i915/display/intel_panel.c contents of: >=20 > f8bd54d21904 ("drm/i915: panel: Use atomic PWM API for devs with an exter= nal PWM controller") >=20 > Is the right thing to do, the problem is a difference in a line which gets > removed in that commit. Which is what I actually did, I guess :-) Sorry about that. --=20 Cheers, Stephen Rothwell --Sig_/dGXS.TNI7czMZikC=h9RWLW Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl9XZVEACgkQAVBC80lX 0Gzlbwf+PPJxV9Q4ttdCmWNOyTMQU/r6ZMUpOfodqyfxbkboiTWSI6NyJshSUujB 46CgTj20eGsf1wxDpfceCBW10RiLoxvTv9RRCn0FKFJ4knjlUmLgd5H/q3nyw7KY I9mymEV1qQR5Bt3qxz1kFzYDyaZVG6QHBSOAwVMkP+WPT9hAFPcJtVg4rqGsW9DS xPBjTxacTcrBVq1hG+L+Uc5Urr4zxyGKibMeSd1YikukIuRquftUqjBpjINUBGvU 6DkZ2Hg5JFvNqbV1BiA9wxOFOUUCJz524+efusX9Fh5dL4YVCV6ex9SJhXboFLMP KAlVyNGP4K23MYWFl+nKhqsvhxrf7Q== =1Pjd -----END PGP SIGNATURE----- --Sig_/dGXS.TNI7czMZikC=h9RWLW--