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=-5.8 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 7666EC4320A for ; Thu, 12 Aug 2021 01:21:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 52BCD6104F for ; Thu, 12 Aug 2021 01:21:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233235AbhHLBVd (ORCPT ); Wed, 11 Aug 2021 21:21:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38106 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229773AbhHLBVb (ORCPT ); Wed, 11 Aug 2021 21:21:31 -0400 Received: from ozlabs.org (bilbo.ozlabs.org [IPv6:2401:3900:2:1::2]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C0C17C061765; Wed, 11 Aug 2021 18:21:06 -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 4GlTQy70Gbz9t2b; Thu, 12 Aug 2021 11:20:58 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1628731262; bh=NyX7NxhdTqFuLiEuNiYUkkM6Iaiv9G/1RgaK5DhFUTs=; h=Date:From:To:Cc:Subject:From; b=SPIB2sKXPA7HuocgGyGwSxssuZlScSVSuhhalfnrlcWWBFyJY9ZeHIs/nCLoGk9S4 nQBoi69hpR4AUuCThV6wAyGvxtsT85DMIZAgEF1N8VlnWqozpca21s3ajcVNXB7yeF vXo/ffgBb8MFdKFhyHwL5RRH83eaNNy/dAvPJ/jk/eSC+/vx3TpfmyceQ0DC9mnoKj ZjAwInnqe1nPZce018v3YC9vBRsonFm5EfLERhTs0XwJsNapMvj1pmwyNPNCp6ML5w pHp5rU5yKPWcRQL30qoi8PxqDJPF/oKM1qWUfgR+Heuou4xju74U7wmIvCtKsB3Jw2 K5sqHRPu2jZig== Date: Thu, 12 Aug 2021 11:20:56 +1000 From: Stephen Rothwell To: Dave Airlie , DRI Cc: Daniel Vetter , Daniel Vetter , Dave Airlie , Jason Ekstrand , Linux Kernel Mailing List , Linux Next Mailing List , Randy Dunlap , Rodrigo Vivi Subject: linux-next: manual merge of the drm tree with Linus' tree Message-ID: <20210812112056.0e6fa4fd@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/UZR4JNYLxTvVTQMXYhxdip9"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/UZR4JNYLxTvVTQMXYhxdip9 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/i915/i915_globals.c between commits: 1354d830cb8f ("drm/i915: Call i915_globals_exit() if pci_register_device(= ) fails") a07296453bf2 ("drm/i915: fix i915_globals_exit() section mismatch error") from Linus' tree and commit: bb13ea282535 ("drm/i915: Remove i915_globals") from the drm tree. I fixed it up (I just removed the file) 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_/UZR4JNYLxTvVTQMXYhxdip9 Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmEUd3gACgkQAVBC80lX 0Gw9LQgAgv3cYm5Xrt0JvYyyYrFIY9pP5sG6Ifrf32s9YwWcRYyiBcy3tDP/LSTB C7S9v31itFXiBwdpP6JCGLMJWD89Nj97cQ9W5QFv3ynnumB11zzAvM2SJpRIR0PK YtYL83wmkJzQZ8kWMP1oWfpKTjev3UxlYSjGtDcmncymXcEJD5sizaGqlr08LuO4 GacWdeBmzzaPtADs7KjVOj1Am5l4HKwg6MDqcTcB0Tm7FLC9+DJdDL8DFCmvMRWM lhjOV3godDhtYFGkiFS7xxrsmdl1OcBCdqLm3a/63P9Tm6nbUJ3DcWxEFYFGTKi/ XQb3jrFQ44B9NDIcg5uFJBmsMzp4KQ== =ez8E -----END PGP SIGNATURE----- --Sig_/UZR4JNYLxTvVTQMXYhxdip9--