From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752287AbcGMCgG (ORCPT ); Tue, 12 Jul 2016 22:36:06 -0400 Received: from ozlabs.org ([103.22.144.67]:42767 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750959AbcGMCf4 (ORCPT ); Tue, 12 Jul 2016 22:35:56 -0400 Date: Wed, 13 Jul 2016 12:35:24 +1000 From: Stephen Rothwell To: Daniel Vetter , , , Russell King Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Peter Chen Subject: linux-next: manual merge of the drm-misc tree with the arm tree Message-ID: <20160713123524.09ec2d83@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 all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/rockchip/rockchip_drm_drv.c between commit: 062993b15e8e ("drm: convert DT component matching to component_match_add_release()") from the arm tree and commit: 6d5fa28c13b9 ("gpu: drm: rockchip_drm_drv: add missing of_node_put after calling of_parse_phandle") 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. -- Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/rockchip/rockchip_drm_drv.c index 7fd20c0e1fc8,f0bd1ee8b128..000000000000 --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c @@@ -438,9 -433,8 +438,10 @@@ static int rockchip_drm_platform_probe( is_support_iommu = false; } + of_node_put(iommu); - component_match_add(dev, &match, compare_of, port->parent); + of_node_get(port->parent); + component_match_add_release(dev, &match, release_of, + compare_of, port->parent); of_node_put(port); }