From patchwork Mon Aug 19 03:18:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 11100199 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 78F6F13B1 for ; Mon, 19 Aug 2019 03:19:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 54BD91FFEB for ; Mon, 19 Aug 2019 03:19:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4862D2624B; Mon, 19 Aug 2019 03:19:09 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B29A2212DB for ; Mon, 19 Aug 2019 03:19:08 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1E6C56E08A; Mon, 19 Aug 2019 03:19:07 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from ozlabs.org (bilbo.ozlabs.org [IPv6:2401:3900:2:1::2]) by gabe.freedesktop.org (Postfix) with ESMTPS id B97526E08A; Mon, 19 Aug 2019 03:19: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 46BfKG0rpHz9sMr; Mon, 19 Aug 2019 13:18:57 +1000 (AEST) Date: Mon, 19 Aug 2019 13:18:56 +1000 From: Stephen Rothwell To: Daniel Vetter , Intel Graphics , DRI , Dave Airlie Message-ID: <20190819131856.68011dc5@canb.auug.org.au> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1566184741; bh=OTrmXf0uOG0N7D6X7l9rKsQkO1sx2kT2BAzJVGYG2wE=; h=Date:From:To:Cc:Subject:From; b=HHrKn+MhkE3vkrpJ7/YEyrwSmN79jYmc6PRcesSlI/yUMawmQTs/o+Rzhy9Yn3adf 7W8vNUCI7leFnsxcqvB3y3q7qoAvHlWcFKs2YBSWZgv+MGznkHrnkg4UmYUluV9AZP 2kpd8ZetSGvVTD+GclIphNbLczS0s0Je0plMdHKRRdYVJYD8X06KIvaTbjO8wJyIxb Gg7ufTnRlcXZ32+7DRIH50Qw/u+uWeQNJVZFsiogew8fKGVhwrWOfGvvPo4td/ijFu qdaXlBXL8urgCoVmiNlPBqIPpQ2fkJqO546S5AWzJP2fLIbaxxHi+v9QMGSdzPWp+N FvK+2ulfJkhzA== Subject: [Intel-gfx] linux-next: manual merge of the drm-misc tree with the drm tree X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Hellstrom , Linux Next Mailing List , Linux Kernel Mailing List , Christian =?utf-8?b?S8O2bmln?= Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/vmwgfx/vmwgfx_resource.c between commit: a0a63940b0c9 ("drm/vmwgfx: Assign eviction priorities to resources") from the drm tree and commit: 52791eeec1d9 ("dma-buf: rename reservation_object to dma_resv") 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/vmwgfx/vmwgfx_resource.c index 2eb3532e3291,0b5472450633..000000000000 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c