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 1F333C433ED for ; Wed, 12 May 2021 00:28:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id EB436616E8 for ; Wed, 12 May 2021 00:28:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229736AbhELA3Q (ORCPT ); Tue, 11 May 2021 20:29:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43524 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229637AbhELA3Q (ORCPT ); Tue, 11 May 2021 20:29:16 -0400 Received: from ozlabs.org (ozlabs.org [IPv6:2401:3900:2:1::2]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0F468C061574; Tue, 11 May 2021 17:28:08 -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 4FfwcM5W45z9sWT; Wed, 12 May 2021 10:28:03 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1620779285; bh=wzxqF8VP57iO8VsSfCS3l59Sht3GWfjqDTx+GVL9UWc=; h=Date:From:To:Cc:Subject:From; b=ABPwpCXB41ws80GgNYcG/dIZOQ8zRz3Lqt+UtC1qWdPALLvnNa5iidHqkkViDsyUH oXV2GlY7lkPG/FWwMpPnnHFOqBb9lNv8fha1WYwWKiomaUoD7M08sK3yf2u5sdbe9Y 0TLJEBfGuDCOZTF1d4WVdj+wh/BOJ1t8Gi2BVpbzFDD8XtjFALRu24+sAgTMhPsp2N NeLY4DLsRQ4f/wxE7ogiR8dNuosk4302Od/nrS4aXG1giLdR+1VVNLn1HVP9/DFYWl KEexmhej7aVwWdmK+ANrekUDPfStyPWK5wzywDwqP7bjqNlLq4UKZjz3NDz/D9JkM1 FhWKeUpuuaHMQ== Date: Wed, 12 May 2021 10:28:02 +1000 From: Stephen Rothwell To: Daniel Vetter , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Intel Graphics , DRI Cc: Jason Ekstrand , Linus Torvalds , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the drm-intel tree with Linus' tree Message-ID: <20210512102802.307861cb@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/aLepwFzyOaaiX.gbf06/EqX"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org --Sig_/aLepwFzyOaaiX.gbf06/EqX 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/intel_pm.c between commit: e7c6e405e171 ("Fix misc new gcc warnings") from Linus' tree and commit: c6deb5e97ded ("drm/i915/pm: Make the wm parameter of print_wm_latency a p= ointer") from the drm-intel tree. I fixed it up (I just used the latter version) 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_/aLepwFzyOaaiX.gbf06/EqX Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmCbIRIACgkQAVBC80lX 0GztkAgAl5z3Cv2n1A/M3BBjk1JNfDaRxhKDrwjiMmHUdNqOMjn31OWYhWS3CjAi 7vlnJpw51ZV+1S9V+XqKo3U52U3s7l4LvelLEBJdCRsyTOQ8vgcme1o1W4NyJXQF MNBUiOhaMBN62i5qU89z1ZJ9tJSCan41b1xGQ+xIOAxlHA8cwQb0AEmxKgVEUvg5 wjm96GaPqFfyO2vXEAT/eMyINZpwRBBmyoxpjE+/G/hRAts7OHYhFjmKPW3MTHQg SyOaFdBLBYqrNFsQJ3gmV9o6H9OMQDPGlq/Q/CX1k7rgf/hSbs3D22A3vVua8x5e 4D3qjumkvyy4XFQL+PziTHVWsI6Keg== =UcGr -----END PGP SIGNATURE----- --Sig_/aLepwFzyOaaiX.gbf06/EqX--