Received: by 2002:ad5:4acb:0:0:0:0:0 with SMTP id n11csp2932419imw; Sun, 10 Jul 2022 20:02:50 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tNNIiPtsdLt+j8me1jKR6ZczLzKz4fjOLJhEnBuzDLQmMjweTGtq6N1ipxBnjjOSeCqUZg X-Received: by 2002:a17:902:7049:b0:16b:bf58:ded2 with SMTP id h9-20020a170902704900b0016bbf58ded2mr16609782plt.98.1657508569515; Sun, 10 Jul 2022 20:02:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657508569; cv=none; d=google.com; s=arc-20160816; b=T1IEj/yFD+FfkaCkj4VaYI3V6IyxvfIg3KtInh/KFY3Fczgb4d2ge4KaKB5jX/1PJq aDUxD8/6tJ1ovNHl8N8tETDaTSL7IHyLMtoB9IVhlUgPJXA+UlNjBPlunh6/uwY+ijXK wSbzPtUc1vVckstfk2Uv1hsu3K4jK18d9iaHAuwas3IetL6oaNYPhXU/KWAT8x7sOg5f At1kSEoBaR4ptgM+hMoquEFnh99dwqSp7z0+GuQrqLRV6KwNuiF7CYOcatMMoQ2j8LCS rC7YDr7Ow8xBZcfNpIOt5wyBsWAZd2DLDvgsS5OxbFFZ6NAwOUq+ZzdgYCXQ+wprwY4g 3MBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:subject:cc:to:from:date :dkim-signature; bh=ImZg73woeRL/6pJYSTs9jApSEo/CdR975e2jvaOLVSk=; b=wNXNhmsoxw2RuWPmUzjlueJ/c+V6c+Gx8JggyAlYh18mtFVQfzjjEpqmJ6CIZtZpiG M10/llk8oBSyG50SW517VWD9Ay86qBPdm5SWNJ0O6voG2e0BTEXpaXnDpT+XN478QRXx eU6HtmoYxFxNXrqKDe5AUVv600eEmlGutlNC/4DD9o2YD5VVv/NZtDu+/Yktko5iA3IL ydyn4hVjR2Z6w6T1saEUTCkg+HimT8v5epAqFelmgTtM/gWCP0l2mfdx16iH76tePnGm 6UUIfNj6/9zdzw4YdhKlxi7/5UfOAztIU2EQvnkQz/8cLyr97MmhtwiLNM4f6pOB8L09 Zkog== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=fVIrA5lf; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j2-20020a632302000000b003fbc1902fe6si7955466pgj.706.2022.07.10.20.02.37; Sun, 10 Jul 2022 20:02:49 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=fVIrA5lf; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229616AbiGKCry (ORCPT + 99 others); Sun, 10 Jul 2022 22:47:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46088 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229476AbiGKCrx (ORCPT ); Sun, 10 Jul 2022 22:47:53 -0400 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2C75917E16; Sun, 10 Jul 2022 19:47:50 -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 4Lh7bM5bY4z4xMW; Mon, 11 Jul 2022 12:47:43 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1657507666; bh=ImZg73woeRL/6pJYSTs9jApSEo/CdR975e2jvaOLVSk=; h=Date:From:To:Cc:Subject:From; b=fVIrA5lf8Jjc0JLHFuXHhWhjplfV6WpoGvpjuY4pR5arVyrV1Nx1O6E9j+Z8VzwZA wxC79xuP7dL1TCYFSNoXWg5BFAnxtaSPt1dIVE5KPvmGWamJJl5m0qsm9btDmSwMq6 mWO2a0zl+dNIhvW/j5ks7ivxsyTYOAEOtt9mMfT0m6ZBtiPK+PuxbuqWWgpLb4TUgz u8kd8K1lIqe/YbBoeLNfqRdsxQl68xJ6TrEAOTOVRPF3TB7Jnp70/iwjRmVJn1uTvP JiqcUz0dzZPJlPESWSwtvMe75epdoJfPS6QAFkY0CObyF70Jg9vA0bONMkREPZMOKD inyAQFaLphd5g== Date: Mon, 11 Jul 2022 12:47:42 +1000 From: Stephen Rothwell To: Dave Airlie , Daniel Vetter Cc: Intel Graphics , DRI , Arunpravin Paneer Selvam , Christian =?UTF-8?B?S8O2bmln?= , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the drm tree with the drm-misc-fixes tree Message-ID: <20220711124742.3b151992@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/smMUJeGZzOH+aH15NIcQmOg"; protocol="application/pgp-signature"; micalg=pgp-sha256 X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_LOW,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/smMUJeGZzOH+aH15NIcQmOg Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c between commit: 925b6e59138c ("Revert "drm/amdgpu: add drm buddy support to amdgpu"") from the drm-misc-fixes tree and commit: 5e3f1e7729ec ("drm/amdgpu: fix start calculation in amdgpu_vram_mgr_new") from the drm tree. This is a mess :-( I have just reverted the above revert before mergin the drm tree for today, please fix it up. --=20 Cheers, Stephen Rothwell --Sig_/smMUJeGZzOH+aH15NIcQmOg Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmLLj04ACgkQAVBC80lX 0GxMzgf/dC6QJfFPofDeEzs9hvc5vhaw+egnc3apm1nrEP7M2pja0U46UZOLvMcA CoLNAKuA7CuJPEBNmxSDvWbKJlIczsEABFo40Kjv3bUFe0vImqctm/tV5gE0ejqp hAW8rswWpcNRNi3Rf2CHLtmkdAxynBX45+kPD63K1hmmWayeNE3tXEjZn4XWbcmb lieyknIODGyMA7LuDm3X9xQIzNo3FoaZ/q6OGlXVjARp/AseSdHnOf4jzoNkRjLo 1jONNlOkgndCvarZhqfrqTli3pRwMwU0ZS0KJdX4JAmB7Qz5ARiBhNDnam6n/get CO9ZX1k1LEA8bMhT03UVigg6Ac5ZHA== =j8bV -----END PGP SIGNATURE----- --Sig_/smMUJeGZzOH+aH15NIcQmOg--