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=-0.8 required=3.0 tests=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 560A6C433DF for ; Wed, 17 Jun 2020 00:46:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 127A5208B8 for ; Wed, 17 Jun 2020 00:46:19 +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="pHh4NI1/" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726456AbgFQAqT (ORCPT ); Tue, 16 Jun 2020 20:46:19 -0400 Received: from bilbo.ozlabs.org ([203.11.71.1]:59229 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726134AbgFQAqT (ORCPT ); Tue, 16 Jun 2020 20:46:19 -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 49mmbB5nnlz9sRR; Wed, 17 Jun 2020 10:46:13 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1592354777; bh=T7qDNiqsatPfNcwtP0ZohdxGPF6aYtQjyqHRxGYm7cU=; h=Date:From:To:Cc:Subject:From; b=pHh4NI1/wal/nqwh4V9pAygXci55K+deTqM5K75m44IbyLCOrZ9fmT9b9ila/LY5R cnsDjoePOqcX5jNS6gP8nU5paAMg+/KKs8lCyT1ON/WLz1YPbXTNRhCk9DPb2xbMsT /uPUhMrFvfXHdECDwfC7qSqBiPUKxVRMw4+3hCiGFFWXQ7cfQi2EMdx6rQ7cTE32il QWbZMUkdJSJ845mnOv1R8hC4YPYSwa9wctSUiGH0zAaKmQng43wQso/+hapE0CvIQB 0Cb08FWxF0Z7ggmpBkxuIdhRDjYmHXDD1q5+QGseZIqBZjdVcgwCTy1gEP37XUaSq3 FMZqBfUBNbaJQ== Date: Wed, 17 Jun 2020 10:46:12 +1000 From: Stephen Rothwell To: Daniel Vetter , Intel Graphics , DRI Cc: Linux Next Mailing List , Linux Kernel Mailing List , Thomas Zimmermann , Ben Skeggs , Emil Velikov Subject: linux-next: manual merge of the drm-misc tree with Linus' tree Message-ID: <20200617104612.59695467@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/rikD_NWmqy+j.E+hnL9Xc1Y"; 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_/rikD_NWmqy+j.E+hnL9Xc1Y 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/gpu/drm/nouveau/nouveau_display.c between commit: 183405879255 ("drm/nouveau/kms: Remove field nvbo from struct nouveau_fra= mebuffer") from Linus' tree and commit: cdc194cebd71 ("drm/nouveau: remove _unlocked suffix in drm_gem_object_put= _unlocked") from the drm-misc tree. I fixed it up (the former just removed one of the functions modified by the latter) 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_/rikD_NWmqy+j.E+hnL9Xc1Y Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl7pZ9QACgkQAVBC80lX 0GyMgQf9EC+fyUxPHDxIaHdqW/A/aJmzP80NUP6WRiSVK37CRpUhsZ5vBGn4Nm0E XRMyhHMH6EQe5xa4wyrB/BfNdH1BTw9bwJ0NhnD4kksZxL1eyaPhA2haHhj1NigQ gCE2Ec6EWzXGHfy6Hd/ggpAEfdrYofYnGi53aApJl818U3U+uSdXuZrhqu/mHJEL rEC9xRmmVRkbiS5MaqbTReNivX/N7AH3GB8JZHi1gyfZ3iCOwck3XZtuyDocx3Kd UUG21mz8jn3FaHUmeGLra5+JojgFrToChWIBL32tP2UN6Qaz+etZQWLkSpcw3G3c XG53EMDhYBMrVUH4whMQ3vYp5KR6lQ== =xOTL -----END PGP SIGNATURE----- --Sig_/rikD_NWmqy+j.E+hnL9Xc1Y--