From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753495AbcIED6w (ORCPT ); Sun, 4 Sep 2016 23:58:52 -0400 Received: from ozlabs.org ([103.22.144.67]:36504 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751873AbcIED6u (ORCPT ); Sun, 4 Sep 2016 23:58:50 -0400 Date: Mon, 5 Sep 2016 13:58:48 +1000 From: Stephen Rothwell To: Dave Airlie Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Christian =?UTF-8?B?S8O2bmln?= , Alex Deucher Subject: linux-next: manual merge of the drm tree with Linus' tree Message-ID: <20160905135848.01f88965@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/amd/amdgpu/amdgpu.h between commit: 566153874951 ("drm/amdgpu: fix lru size grouping v2") from Linus' tree and commit: c632d7994360 ("amdgpu: move ttm stuff to amdgpu_ttm.h") from the drm tree. I fixed it up (the code move was fixed up in another commit, so I just removed the former change to this file) 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