Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755362Ab3I3Lcm (ORCPT ); Mon, 30 Sep 2013 07:32:42 -0400 Received: from mail-ie0-f174.google.com ([209.85.223.174]:53974 "EHLO mail-ie0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754453Ab3I3Lcj (ORCPT ); Mon, 30 Sep 2013 07:32:39 -0400 MIME-Version: 1.0 X-Originating-IP: [178.83.130.250] In-Reply-To: <1380540373-25352-4-git-send-email-treding@nvidia.com> References: <1380540373-25352-1-git-send-email-treding@nvidia.com> <1380540373-25352-4-git-send-email-treding@nvidia.com> Date: Mon, 30 Sep 2013 13:32:38 +0200 Message-ID: Subject: Re: linux-next: manual merge of the drm-intel tree From: Daniel Vetter To: Thierry Reding Cc: intel-gfx , linux-next , Linux Kernel Mailing List , dri-devel Content-Type: text/plain; charset=ISO-8859-1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 639 Lines: 19 On Mon, Sep 30, 2013 at 1:26 PM, Thierry Reding wrote: > Today's linux-next merge of the drm-intel tree got conflicts in > > drivers/gpu/drm/i915/intel_display.c > > I fixed it up (see below). Please check if the resolution looks correct. Looks good. -Daniel -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/