From patchwork Wed Nov 13 01:13:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 11240627 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 1A9F013BD for ; Wed, 13 Nov 2019 01:13:59 +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 B03AF2245C for ; Wed, 13 Nov 2019 01:13:58 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B03AF2245C 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=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2AC436EC42; Wed, 13 Nov 2019 01:13:58 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from ozlabs.org (bilbo.ozlabs.org [203.11.71.1]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1179A6EC42 for ; Wed, 13 Nov 2019 01:13:56 +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 47CRTG1wJQz9s7T; Wed, 13 Nov 2019 12:13:54 +1100 (AEDT) Date: Wed, 13 Nov 2019 12:13:52 +1100 From: Stephen Rothwell To: Dave Airlie , DRI Subject: linux-next: manual merge of the drm tree with Linus' tree Message-ID: <20191113121352.3b1e85bd@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=1573607635; bh=g15OSr6tjmM8WcvHvyRJcU3qjqAKy7LsnWP62p1/2ec=; h=Date:From:To:Cc:Subject:From; b=TPjuu9KEwIeDO+zaUMiErTaMyUTqkvrU8tWgyvZ6HUhV3w0H4ZFzbD7zDAcsTmaXW puBRd7LOmkdn+y4V9GIimnDqsQf37It7u/2wG2owFmpuULsYMJgknkndMN9R55xmOH s/ZwVoLEpmR1Kr1O5jV+EJLOdQLLiGZP5SfYdCm1g99/IYbULBLeO+PLNFixShk0+m aKlxYgLYaoIDU1FWrVKcFO7LwjvICb5AKTxP6JVGLsZ6PprqASuKzbmKQD7W66QhKT HrsfTRF2SSv+a+nZq/d/JNH2uFtqxfxbjQ/ZFwGx1s+52h0orAMeLD37lU1YVe8HiM YLZs+BaxjJ7UQ== X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Anshuman Gupta , Linux Kernel Mailing List , Linux Next Mailing List , Jon Bloomfield , Uma Shankar Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/i915/i915_reg.h between commit: 1d85a299c4db ("drm/i915: Lower RM timeout to avoid DSI hard hangs") from Linus' tree and commit: 41286861b4c9 ("drm/i915/tgl: Add DC3CO counter in i915_dmc_info") from the drm 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/i915_reg.h index f8ee9aba3955,53c280c4e741..000000000000 --- a/drivers/gpu/drm/i915/i915_reg.h