From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751114AbcEIB2c (ORCPT ); Sun, 8 May 2016 21:28:32 -0400 Received: from ozlabs.org ([103.22.144.67]:53927 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750872AbcEIB2a (ORCPT ); Sun, 8 May 2016 21:28:30 -0400 Date: Mon, 9 May 2016 11:28:28 +1000 From: Stephen Rothwell To: Dave Airlie Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Flora Cui , Alex Deucher , Christian =?UTF-8?B?S8O2bmln?= Subject: linux-next: manual merge of the drm tree with Linus' tree Message-ID: <20160509112828.1fd4f68e@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/ttm/ttm_bo.c between commit: 56fc350224f1 ("drm/ttm: fix kref count mess in ttm_bo_move_to_lru_tail") from Linus' tree and commits: c3ea576e0583 ("drm/ttm: add optional LRU removal callback v2") 98c2872ae99b ("drm/ttm: implement LRU add callbacks v2") from the drm tree. I fixed it up (I have no idea how to fix merge these changes, so I just used the latter ones) 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