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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 133CAC433EF for ; Wed, 8 Jun 2022 01:18:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235119AbiFHBSh (ORCPT ); Tue, 7 Jun 2022 21:18:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50884 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1840559AbiFHAFY (ORCPT ); Tue, 7 Jun 2022 20:05:24 -0400 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3102C2FFD8; Tue, 7 Jun 2022 16:53: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 4LHnHt1kmlz4xD0; Wed, 8 Jun 2022 09:53:45 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1654646027; bh=CMoIYQyB2XCl8XOq/AHSIFF64iEb3UrjYX3oNA8db2g=; h=Date:From:To:Cc:Subject:From; b=q3L3251TRZfjSMWWSxhL3d3KStRWQsN0+2GHtWdbGiuLe8vd6AY9tRyqIHtPDWjsM wdsDgu5TUQpanKc5oFqt+zOnmk+nV8FZs1Df/iJtyHFddzaMfy6VD6FvvjRrD8pjQS WK0Vy1Hd6XGhfiCT0m5XYb0zjJkgE75cUOXeBPKj4VPjjQNGN+L5YOYqWMqngagYwL HSU+frgduNoDCdaY8Dtf5hKTL+1r/FfkJmprfLAdjfUNNGIi/EbJkwkxNsUxRn+9MG mqMJ1+/fQZThvVFHkm4MSIUyYPm5w3GJaHHB5AD0VmoXQkwb8WwzbdeGBNz4APSiW+ 7Ll313gochhkA== Date: Wed, 8 Jun 2022 09:53:43 +1000 From: Stephen Rothwell To: Daniel Vetter , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi Cc: Intel Graphics , DRI , Anusha Srivatsa , Linus Torvalds , Linux Kernel Mailing List , Linux Next Mailing List , Lucas De Marchi Subject: linux-next: manual merge of the drm-intel tree with Linus' tree Message-ID: <20220608095343.7196dedf@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/G6Mo72/2g.zbh2P=VlJh1mA"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org --Sig_/G6Mo72/2g.zbh2P=VlJh1mA Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/i915/display/intel_dmc_regs.h between commit: 2518f226c60d ("Merge tag 'drm-next-2022-05-25' of git://anongit.freedeskt= op.org/drm/drm") from Linus' tree and commit: 21c47196aec3 ("drm/i915/dmc: Add MMIO range restrictions") from the drm-intel tree. I fixed it up (these were only white space differences, so I just used the version from Linus' tree) 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_/G6Mo72/2g.zbh2P=VlJh1mA Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmKf5QcACgkQAVBC80lX 0Gye+ggAjx6eChYTEh0PeTJ+FoHjOkUp57S6hFI5UMhIStDBHq7bzjz9FYM7KUb9 btdnRs2IQAdr53YBtKSHxV7PWQmAEAKn5fH/UQSD5ahP836KsEm/gZvxhu/Ntz72 YEw8eA34NvycenM3EaUSUf2k2onmqzZNh1YgmPC9j+vRyH6fvOEwyZIq1oAn95ES pgt+5CcFWswo5qkYpPHeHx7rRK+A/TZvMjGxYiyccQOkj9XebeH4vjomelrrB5sU CCOPyEIsy45pdC7EO2Az1wXiWrWKuVRbU+QqTBAvOGcfhju1JrCMJt0qFvFt/jeB 7EV200qI6Kkzrl4o852GyvXMHnQNtA== =l25w -----END PGP SIGNATURE----- --Sig_/G6Mo72/2g.zbh2P=VlJh1mA--