From patchwork Mon Jun 29 01:14:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 11630389 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D402D138C for ; Mon, 29 Jun 2020 01:15:09 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A666120720 for ; Mon, 29 Jun 2020 01:15:09 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="Eojb8Pg7" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A666120720 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B2A8789E2B; Mon, 29 Jun 2020 01:15:07 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from ozlabs.org (ozlabs.org [203.11.71.1]) by gabe.freedesktop.org (Postfix) with ESMTPS id 470B489E2B; Mon, 29 Jun 2020 01:15:05 +0000 (UTC) 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 49w8fs1NVHz9sSF; Mon, 29 Jun 2020 11:15:00 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1593393303; bh=/FVAuqzG/l6SWBWuDRhHdwt3AqyH08kGrMNSCgu01RM=; h=Date:From:To:Cc:Subject:From; b=Eojb8Pg7o/JUJ9APyHj7hP9Vmp+wA+XjBCKebmMJFNHwbXAKqDTgi0yUmN4xaoUzM dCQPS37de1yODf6DGMExgiI1NBDGZS46OdU/XcFNr4273TjjWAoYPQx4h7aZEFlAnm q0jWg5wpR8ajQcz3f9lef2WVyx3ca2XwHrW6I9ZQQLMK4OQjW+kmRKANd8lBHYHK+M 6c0r9OtlkM5DMeEludWjszIbJLXsUvYIFM55YA4WQmJBuFFh21sbKsQWOT1HFfAc5F PVe/sjR7kcfJqLjXcU6wyAmY+ccupyX+LOy7A8qrVkfkGGRSJ0tvswziMYVCkb4xTM dAs6G9vG2ZXLQ== Date: Mon, 29 Jun 2020 11:14:58 +1000 From: Stephen Rothwell To: Daniel Vetter , Intel Graphics , DRI Message-ID: <20200629111458.1661446b@canb.auug.org.au> MIME-Version: 1.0 Subject: [Intel-gfx] linux-next: manual merge of the drm-misc tree with Linus' tree X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ralph Campbell , Dave Airlie , James Jones , Linux Kernel Mailing List , Linux Next Mailing List , Ben Skeggs , Thomas Zimmermann , Nirmoy Das Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Hi all, Today's linux-next merge of the drm-misc tree got conflicts in: drivers/gpu/drm/nouveau/dispnv04/crtc.c drivers/gpu/drm/nouveau/dispnv04/overlay.c drivers/gpu/drm/nouveau/dispnv50/base507c.c drivers/gpu/drm/nouveau/dispnv50/wndw.c drivers/gpu/drm/nouveau/nouveau_dmem.c drivers/gpu/drm/nouveau/nouveau_fbcon.c between commits: 183405879255 ("drm/nouveau/kms: Remove field nvbo from struct nouveau_framebuffer") c586f30bf74c ("drm/nouveau/kms: Add format mod prop to base/ovly/nvdisp") 1d7f940c3a16 ("drm/nouveau/nouveau/hmm: fix nouveau_dmem_chunk allocations") from Linus' tree and commit: 0dc9b286b8d2 ("drm/nouveau: don't use ttm bo->offset v3") 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. diff --cc drivers/gpu/drm/nouveau/dispnv04/crtc.c index 640738f3196c,cc6ab3c2eec7..000000000000 --- a/drivers/gpu/drm/nouveau/dispnv04/crtc.c diff --cc drivers/gpu/drm/nouveau/dispnv04/overlay.c index 6248fd1dbc6d,9529bd9053e7..000000000000 --- a/drivers/gpu/drm/nouveau/dispnv04/overlay.c diff --cc drivers/gpu/drm/nouveau/dispnv50/base507c.c index 511258bfbcbc,b60aa987d7b4..000000000000 --- a/drivers/gpu/drm/nouveau/dispnv50/base507c.c diff --cc drivers/gpu/drm/nouveau/dispnv50/wndw.c index 99b9b681736d,ee0fd817185e..000000000000 --- a/drivers/gpu/drm/nouveau/dispnv50/wndw.c diff --cc drivers/gpu/drm/nouveau/nouveau_dmem.c index e5c230d9ae24,f13086a32f0f..000000000000 --- a/drivers/gpu/drm/nouveau/nouveau_dmem.c diff --cc drivers/gpu/drm/nouveau/nouveau_fbcon.c index 3d11b84d4cf9,1341c6fca3ed..000000000000 --- a/drivers/gpu/drm/nouveau/nouveau_fbcon.c