From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751864AbdH1Ccm (ORCPT ); Sun, 27 Aug 2017 22:32:42 -0400 Received: from ozlabs.org ([103.22.144.67]:39997 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751799AbdH1Cck (ORCPT ); Sun, 27 Aug 2017 22:32:40 -0400 Date: Mon, 28 Aug 2017 12:32:38 +1000 From: Stephen Rothwell To: Dave Airlie Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Philipp Zabel Subject: linux-next: manual merge of the drm tree with Linus' tree Message-ID: <20170828123238.410885a1@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 Hi Dave, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/imx/ipuv3-plane.c between commit: 5be5dd38d462 ("drm/imx: ipuv3-plane: fix YUV framebuffer scanout on the base plane") from Linus' tree and commit: 58dff39904c0 ("drm/imx: ipuv3-plane: use fb local variable instead of state->fb") from the drm tree. I fixed it up (the former included the latter change) 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