From patchwork Wed Nov 27 00:18:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 11263155 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A5FF013A4 for ; Wed, 27 Nov 2019 00:18:53 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8C47F2071A for ; Wed, 27 Nov 2019 00:18:53 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8C47F2071A Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id F38FE6E4B3; Wed, 27 Nov 2019 00:18:51 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from ozlabs.org (bilbo.ozlabs.org [203.11.71.1]) by gabe.freedesktop.org (Postfix) with ESMTPS id 906036E4B3 for ; Wed, 27 Nov 2019 00:18:50 +0000 (UTC) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 47N1b45VhLz9sSX; Wed, 27 Nov 2019 11:18:40 +1100 (AEDT) Date: Wed, 27 Nov 2019 11:18:35 +1100 From: Stephen Rothwell To: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , Dave Airlie , DRI Subject: linux-next: manual merge of the tip tree with the drm tree Message-ID: <20191127111835.702b9720@canb.auug.org.au> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1574813927; bh=7/fA7nsrQLmigYdQo0vZuD7DCUXWCaRudMS2rL8v8SE=; h=Date:From:To:Cc:Subject:From; b=ozdDJ/Rww5xE6dTG8AOwTQ3VARtkjI7/+3Oefuvvli5FNYzJ7XGBCeYVdUwLXm7jd 4m+zkTHM6N8jX/9eK9C5RzXbk/PVhEjID+otAPm8gWD1flLRrTAtMtSR4x4V5g9onR KnuHjU3mMsi9AVr7y955N2pmLyxIAjlJI9mZ/9e5Jl+wk80GA6SK6Pwmv9uUQs61Ri /grJ5InUl+NJjwtZ4NUaQjFIBndYlPvweydmW/u5K91rolxXzvSS/02jWm9b6FVC98 v1Baa4Ggn18oXwAj8pc5N37ZQWW0fnWlDy5j/EZW3yccAexd3Z9Zmma2uSzUNI82mD J7dwAZgdmeLLQ== X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jani Nikula , Linux Next Mailing List , Will Deacon , Linux Kernel Mailing List , Krzysztof Kozlowski Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Hi all, Today's linux-next merge of the tip tree got a conflict in: drivers/gpu/drm/i915/Kconfig.debug between commit: d30213e533fa ("drm/i915: Fix Kconfig indentation") from the drm tree and commit: fb041bb7c0a9 ("locking/refcount: Consolidate implementations of refcount_t") 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. diff --cc drivers/gpu/drm/i915/Kconfig.debug index 5571cc73a9ce,1400fce39c58..000000000000 --- a/drivers/gpu/drm/i915/Kconfig.debug