From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752037AbdGXAEY (ORCPT ); Sun, 23 Jul 2017 20:04:24 -0400 Received: from ozlabs.org ([103.22.144.67]:55851 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751546AbdGXADn (ORCPT ); Sun, 23 Jul 2017 20:03:43 -0400 Date: Mon, 24 Jul 2017 10:03:41 +1000 From: Stephen Rothwell To: Daniel Vetter Cc: Dave Airlie , Intel Graphics , DRI , Greg KH , Linux-Next Mailing List , Linux Kernel Mailing List , Hans de Goede Subject: Re: linux-next: build failure after merge of the drm-misc tree Message-ID: <20170724100341.7c4c5e33@canb.auug.org.au> In-Reply-To: References: <20170719114657.245537cd@canb.auug.org.au> <20170721100833.48c8fa9d@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 Daniel, On Fri, 21 Jul 2017 09:24:49 +0200 Daniel Vetter wrote: > > How are we going to handle this now? The refactor is deeply burried in > drm-misc, I guess you could cherry-pick the relevant patches over. But > that'll probably lead to more conflicts because git will get confused. I'll just keep applying the merge resolution patch and will remind Dave and Greg about it during the week before the merge window opens so that they can let Linus know that the fix up is needed. -- Cheers, Stephen Rothwell