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=-0.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=unavailable 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 DC6FFC31E44 for ; Wed, 12 Jun 2019 01:46:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 83385206BB for ; Wed, 12 Jun 2019 01:46:22 +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="B6QwwN/M" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727493AbfFLBqW (ORCPT ); Tue, 11 Jun 2019 21:46:22 -0400 Received: from ozlabs.org ([203.11.71.1]:56537 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726352AbfFLBqV (ORCPT ); Tue, 11 Jun 2019 21:46:21 -0400 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 45NqTj2JQyz9s3l; Wed, 12 Jun 2019 11:46:16 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1560303979; bh=45fFLXH707RuVC+r3D6MLgxoOcS6lkh37RpWxE6pCG0=; h=Date:From:To:Cc:Subject:From; b=B6QwwN/MyJhRc5MMmVS5hkIY9b39wOmRJadZWnU5zcqPPAPA4hHEloUCMAWYBViPQ jcZpSLvRzM3ER0McWYKxgj6wbQbhuUkr3v28xFMyVwIah3gPZap9nl3NoM9FyWWq5S QpTdngwyezRCRmX2vrkycFA6oa0ERop0npao5FLouZ+VhcZEuHaTjZVm23OuKjVzLO e5uIJQoJpVGJK0miUSdMuGf3iuu1zpHBUb6BOPMt8lF/V7tONYwYTGx1ImlU4TaHzp wd8vWYUvTVcKkGq3PeN5LhH8xwkPVt9nqE2EUQHEWDipuccgdkhPgQGaeWWgmvtE2T Lk+lojGVFEzVw== Date: Wed, 12 Jun 2019 11:46:15 +1000 From: Stephen Rothwell To: Daniel Vetter , Intel Graphics , DRI , Alex Deucher Cc: Linux Next Mailing List , Linux Kernel Mailing List , Charlene Liu , Sam Ravnborg , Dave Airlie Subject: linux-next: manual merge of the drm-misc tree with the amdgpu tree Message-ID: <20190612114615.69a78655@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/4P5AwUEph_+1clfAOt0GSyc"; protocol="application/pgp-signature" Sender: linux-next-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org --Sig_/4P5AwUEph_+1clfAOt0GSyc Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/amd/display/dc/dce/dce_audio.c between commit: c7c7192c56d2 ("drm/amd/display: add audio related regs") from the amdgpu tree and commit: 4fc4dca8320e ("drm/amd: drop use of drmp.h in os_types.h") from the drm-misc tree. I fixed it up (see below) 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 diff --cc drivers/gpu/drm/amd/display/dc/dce/dce_audio.c index d43d5d924c19,9b078a71de2e..000000000000 --- a/drivers/gpu/drm/amd/display/dc/dce/dce_audio.c +++ b/drivers/gpu/drm/amd/display/dc/dce/dce_audio.c @@@ -22,7 -22,9 +22,10 @@@ * Authors: AMD * */ +=20 + #include +=20 +#include "../dc.h" #include "reg_helper.h" #include "dce_audio.h" #include "dce/dce_11_0_d.h" --Sig_/4P5AwUEph_+1clfAOt0GSyc Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl0AWWgACgkQAVBC80lX 0GyInAf9EkndAclA4v6jGiJ3ikxT3HRWH+0v8pKJ0AH0Q2+KPoLfPRfVMdOWEAbb 2L6jAiiPL2a2RCFSnsFMbxP6Ki48DQiJM2lhw/VA54Y8Db1XGXmN+0pmGCE1dvbc 0Bksmtcn/Hek8uE7GmM4ZfTLW8vnca7aey+KqC8bFt3oYntotcA2wYq5k0b8zuXV vFZzj12lS5+N+f41zoYVBLwaHKB7h9mdwcQlPFRAl5YTySnXXieR2TL4h3Vzs16E vtohgcJWUqiJSkAFwahAyW43Zt18BdD3kmgZqSpv0JgkWxXhrcTbUvSnbSTiRUmX YaxywF9MrIjMLwZzCG3GT1Knbeph/w== =dUfW -----END PGP SIGNATURE----- --Sig_/4P5AwUEph_+1clfAOt0GSyc--