From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PULL] drm-intel-next Date: Tue, 21 Oct 2014 14:43:28 +0200 Message-ID: References: <20141021122752.GA2561@phenom.ffwll.local> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-ie0-f170.google.com (mail-ie0-f170.google.com [209.85.223.170]) by gabe.freedesktop.org (Postfix) with ESMTP id 926BE6E19E for ; Tue, 21 Oct 2014 05:43:29 -0700 (PDT) Received: by mail-ie0-f170.google.com with SMTP id rd18so1104371iec.1 for ; Tue, 21 Oct 2014 05:43:29 -0700 (PDT) In-Reply-To: <20141021122752.GA2561@phenom.ffwll.local> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Dave Airlie Cc: Daniel Vetter , intel-gfx , dri-devel List-Id: dri-devel@lists.freedesktop.org On Tue, Oct 21, 2014 at 2:27 PM, Daniel Vetter wrote: > There's some simple merge conflicts with current upstream but nothing > serious really, I can push out a merge point if you want to. As usual > -nightly has the solution for you to peek at. Sorrry I've lied, there's an annoying conflict that git somehow doesn't spot which results in a function declaration that's no longer used being left behind. I'll prep a new pull with the merge on top. -Daniel -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch