From patchwork Tue Sep 22 03:34:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 11791465 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 50E10112E for ; Tue, 22 Sep 2020 03:34:33 +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 ECC9F23A32 for ; Tue, 22 Sep 2020 03:34:32 +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="fMTLWIDc" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org ECC9F23A32 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 746E489DB8; Tue, 22 Sep 2020 03:34:30 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from ozlabs.org (bilbo.ozlabs.org [203.11.71.1]) by gabe.freedesktop.org (Postfix) with ESMTPS id B17E089DB8; Tue, 22 Sep 2020 03:34:28 +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 4BwRkS1XHyz9sTQ; Tue, 22 Sep 2020 13:34:22 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1600745665; bh=kE/eQIIvejiVNgVuiLPMxkDduOmD4b/H7xjzjTsXLIU=; h=Date:From:To:Cc:Subject:From; b=fMTLWIDcxx7IKUxHM2cILY1eClHKUPacmZhfXtNbmMVddOoHRVln+kL/tDlP4QxVo 9k7q1kgV7N/THWNCKryveGIxZHwjdxq9kIQhaTsCwWvtLie4IKhmIwyOxFAiLbpr3J AcuwsDoPvJuVCf364cSQfowGZ/+evVONvJ3+pnTXGHSCFzU4cvw3HVVHiazRt/mtqC 43VwDxQlC1XtVOTlWPm+bfGHGpFO8d1vN2JFgzHOYJG/3rtmJIa5BjkqBx6qFIp2wr z+bGdgb6QIofKdk3J0yv3eaNXAllgtFIIie7CA08o/tqwCAU0eY2zwRTjiP7fZRMyi x0fQZXi2/lZ9w== Date: Tue, 22 Sep 2020 13:34:20 +1000 From: Stephen Rothwell To: Daniel Vetter , Intel Graphics , DRI , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi Message-ID: <20200922133420.149dcbd0@canb.auug.org.au> MIME-Version: 1.0 Subject: [Intel-gfx] linux-next: manual merge of the drm-misc tree with the drm-intel 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: Linux Next Mailing List , Linux Kernel Mailing List , Chris Wilson Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/i915/selftests/mock_gem_device.c between commit: 9f9f4101fc98 ("drm/i915/selftests: Push the fake iommu device from the stack to data") from the drm-intel tree and commit: cd01269d11a3 ("drm/i915/selftests: align more to real device lifetimes") 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/i915/selftests/mock_gem_device.c index 397c313a8b69,c207d2239791..000000000000 --- a/drivers/gpu/drm/i915/selftests/mock_gem_device.c