From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751673AbdA3CrR (ORCPT ); Sun, 29 Jan 2017 21:47:17 -0500 Received: from ozlabs.org ([103.22.144.67]:52597 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751020AbdA3CrE (ORCPT ); Sun, 29 Jan 2017 21:47:04 -0500 Date: Mon, 30 Jan 2017 13:22:39 +1100 From: Stephen Rothwell To: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , Daniel Vetter , Intel Graphics , DRI Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Michel =?UTF-8?B?RMOkbnplcg==?= , Christian =?UTF-8?B?S8O2bmln?= Subject: linux-next: manual merge of the tip tree with the drm-misc-fixes tree Message-ID: <20170130132239.6cb67529@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 tip tree got a conflict in: drivers/gpu/drm/ttm/ttm_bo.c between commit: 7c6d639d465e ("drm/ttm: Make sure BOs being swapped out are cacheable") from the drm-misc-fixes tree and commit: bdfafc4ffdd2 ("locking/atomic, kref: Kill kref_sub()") from the tip 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/ttm/ttm_bo.c index 86e3b233b722,ffc6cb55c78c..000000000000 --- a/drivers/gpu/drm/ttm/ttm_bo.c +++ b/drivers/gpu/drm/ttm/ttm_bo.c @@@ -1669,7 -1645,7 +1645,6 @@@ static int ttm_bo_swapout(struct ttm_me container_of(shrink, struct ttm_bo_global, shrink); struct ttm_buffer_object *bo; int ret = -EBUSY; - int put_count; - uint32_t swap_placement = (TTM_PL_FLAG_CACHED | TTM_PL_FLAG_SYSTEM); spin_lock(&glob->lru_lock); list_for_each_entry(bo, &glob->swap_lru, swap) {