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 6449BC43465 for ; Mon, 21 Sep 2020 03:03:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C26C120795 for ; Mon, 21 Sep 2020 03:03:45 +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="PwDRI29b" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726228AbgIUDDp (ORCPT ); Sun, 20 Sep 2020 23:03:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48446 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726104AbgIUDDo (ORCPT ); Sun, 20 Sep 2020 23:03:44 -0400 Received: from ozlabs.org (bilbo.ozlabs.org [IPv6:2401:3900:2:1::2]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5B336C061755; Sun, 20 Sep 2020 20:03:44 -0700 (PDT) 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 4Bvq5V1J6Kz9sSW; Mon, 21 Sep 2020 13:03:42 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1600657422; bh=zHRydJ//9CKbgLmjHViNTtc3PsH2IpWFPJatWMiEFAU=; h=Date:From:To:Cc:Subject:From; b=PwDRI29bNEEgM7yJ/oqBKcXD+zYm1RKdoi4c/DSUsLmvrN469JpF3xk0L7naW/9Ij qGI29tyMGbqiidIs2cNyvP2UoENKWItphHHQnCHdK8i420fJgFlpv0kbouOIIDy9Ph Kj/SjnUU4XmlTsmkXXkqa3hyu53Zq1j+i9EGcytlWNfcXxMLICWhbZgSsItjKDv0Rq v/FlRq7msRPqgnog/6KYzeNb/wQlFU9X9HL2ra/Phoq27tStLTdNvNiIHkO93vde7i 4gWEo8EDyc/UzgjuxWpH/r16OjiAcQuRxYkZn/2dBsi+V3syA7aPjuvwSk19jIqhht QOQHiZBuunLrA== Date: Mon, 21 Sep 2020 13:03:41 +1000 From: Stephen Rothwell To: Rob Clark , Sean Paul Cc: Jordan Crouse , "Gustavo A. R. Silva" , Linux Next Mailing List , Linux Kernel Mailing List Subject: linux-next: manual merge of the drm-msm tree with Linus' tree Message-ID: <20200921130341.79c0665f@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/tMGAOwqeS6XRyDd1m0+wMfT"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org --Sig_/tMGAOwqeS6XRyDd1m0+wMfT Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the drm-msm tree got a conflict in: drivers/gpu/drm/msm/adreno/adreno_gpu.c between commit: df561f6688fe ("treewide: Use fallthrough pseudo-keyword") from Linus' tree and commit: 2fb7487aaf71 ("drm/msm: Get rid of the REG_ADRENO offsets") from the drm-msm tree. I fixed it up (I just used 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_/tMGAOwqeS6XRyDd1m0+wMfT Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl9oGA0ACgkQAVBC80lX 0GxsUQf/U0o7jSHqBlSJFhJQrU+SPlnZPBdRr3PVfFqUjixP6q2pgzvgROXXeWCA Im4vjM2WrEQyejIOlo2ek7PqkYuyWjQcMg/ZTBos4dgfjHdKH4JudR75Pn88N1Mv gXUZ73mNOLlIZZY1VDAOWZQnwh/feIKRSpo7em2SqgoF7cLSJo3Lq4BeJyi4sA2N oeUvkDVps7m77VY2SASTibMcRgROjwVulOo4ECq93ytx3ykoGu2GshAjOopfn8jO JcgkXMbC5oQzP/x0xkrOmiJKTtnxgGi4U72LqRbO4oW7Jo4UZF9YQf1+BYRYjZ91 gzIT5VuJANAw87umxSq5HXAk0IaZeg== =Fo8Q -----END PGP SIGNATURE----- --Sig_/tMGAOwqeS6XRyDd1m0+wMfT--