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 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: Re: linux-next: build failure after merge of the drm-misc tree Date: Mon, 24 Jul 2017 10:03:41 +1000 Message-ID: <20170724100341.7c4c5e33@canb.auug.org.au> References: <20170719114657.245537cd@canb.auug.org.au> <20170721100833.48c8fa9d@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Daniel Vetter Cc: Dave Airlie , Greg KH , Intel Graphics , Linux Kernel Mailing List , DRI , Hans de Goede , Linux-Next Mailing List List-Id: linux-next.vger.kernel.org SGkgRGFuaWVsLAoKT24gRnJpLCAyMSBKdWwgMjAxNyAwOToyNDo0OSArMDIwMCBEYW5pZWwgVmV0 dGVyIDxkYW5pZWwudmV0dGVyQGZmd2xsLmNoPiB3cm90ZToKPgo+IEhvdyBhcmUgd2UgZ29pbmcg dG8gaGFuZGxlIHRoaXMgbm93PyBUaGUgcmVmYWN0b3IgaXMgZGVlcGx5IGJ1cnJpZWQgaW4KPiBk cm0tbWlzYywgSSBndWVzcyB5b3UgY291bGQgY2hlcnJ5LXBpY2sgdGhlIHJlbGV2YW50IHBhdGNo ZXMgb3Zlci4gQnV0Cj4gdGhhdCdsbCBwcm9iYWJseSBsZWFkIHRvIG1vcmUgY29uZmxpY3RzIGJl Y2F1c2UgZ2l0IHdpbGwgZ2V0IGNvbmZ1c2VkLgoKSSdsbCBqdXN0IGtlZXAgYXBwbHlpbmcgdGhl IG1lcmdlIHJlc29sdXRpb24gcGF0Y2ggYW5kIHdpbGwgcmVtaW5kIERhdmUKYW5kIEdyZWcgYWJv dXQgaXQgZHVyaW5nIHRoZSB3ZWVrIGJlZm9yZSB0aGUgbWVyZ2Ugd2luZG93IG9wZW5zIHNvIHRo YXQKdGhleSBjYW4gbGV0IExpbnVzIGtub3cgdGhhdCB0aGUgZml4IHVwIGlzIG5lZWRlZC4KCi0t IApDaGVlcnMsClN0ZXBoZW4gUm90aHdlbGwKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMu ZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlz dGluZm8vaW50ZWwtZ2Z4Cg==