From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH 0/9] make struct drm_mm_node embeddable Date: Sun, 14 Nov 2010 17:13:46 +0100 Message-ID: <20101114161346.GA4497@viiv.ffwll.ch> References: <0d30dc$k5v4jf@orsmga001.jf.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail.ffwll.ch (cable-static-49-187.intergga.ch [157.161.49.187]) by gabe.freedesktop.org (Postfix) with ESMTP id 8C54D9EE9C for ; Sun, 14 Nov 2010 08:10:44 -0800 (PST) Content-Disposition: inline In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org Errors-To: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org To: sedat.dilek@gmail.com Cc: daniel.vetter@ffwll.ch, DRI List-Id: dri-devel@lists.freedesktop.org On Sun, Nov 14, 2010 at 04:52:43PM +0100, Sedat Dilek wrote: > Pulling/Merging Daniel's GIT branch into drm-next (or linux-next) or > Linus-tree is causing conflicts. I've just retested merging with drm-core-next / drm-next and the core drm_mm parts merge without conflict. The i915 parts fail all over due to conflicts with other ongoing stuff. As I've said, these patches are just proof-of-concept, I need to redo them (and coordinate merging with Chris Wilson). So either test my embed-gtt-space branch to also enjoy the i915 patches. Or only test the drm core changes. -Daniel > [1] http://cgit.freedesktop.org/~danvet/drm/log/?h=embed-gtt-space -- Daniel Vetter Mail: daniel@ffwll.ch Mobile: +41 (0)79 365 57 48