From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752711AbcD0DuX (ORCPT ); Tue, 26 Apr 2016 23:50:23 -0400 Received: from ozlabs.org ([103.22.144.67]:47366 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752274AbcD0DuV (ORCPT ); Tue, 26 Apr 2016 23:50:21 -0400 Date: Wed, 27 Apr 2016 13:50:18 +1000 From: Stephen Rothwell To: Rob Herring , Stephen Warren , Colin Cross , Olof Johansson , Thierry Reding Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Alexandre Courbot Subject: linux-next: manual merge of the dt-rh tree with the tegra tree Message-ID: <20160427135018.2aac12f4@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 Rob, Today's linux-next merge of the dt-rh tree got a conflict in: Documentation/devicetree/bindings/gpu/nvidia,gk20a.txt between commit: 53cafb93da6f ("dt-bindings: Add documentation for GM20B GPU") from the tegra tree and commit: f43521e95211 ("dt-bindings: tegra: Remove 0, prefix from unit-addresses") from the dt-rh tree. I fixed it up (they were very similar) 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