From mboxrd@z Thu Jan 1 00:00:00 1970 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753536AbeAOBIz (ORCPT + 1 other); Sun, 14 Jan 2018 20:08:55 -0500 Received: from ozlabs.org ([103.22.144.67]:47715 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753128AbeAOBIx (ORCPT ); Sun, 14 Jan 2018 20:08:53 -0500 Date: Mon, 15 Jan 2018 12:08:51 +1100 From: Stephen Rothwell To: Dave Airlie , DRI Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Thierry Reding Subject: linux-next: manual merge of the drm tree with Linus' tree Message-ID: <20180115120851.52621958@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return-Path: Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/tegra/sor.c between commit: d780537f9b49 ("drm/tegra: sor: Fix hang on Tegra124 eDP") from Linus' tree and commit: 1087fac18b8e ("drm/tegra: dc: Use direct offset to plane registers") from the drm tree. I fixed it up (I just included the comment from the former) 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. -- Cheers, Stephen Rothwell