Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752102AbZJHDij (ORCPT ); Wed, 7 Oct 2009 23:38:39 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751109AbZJHDii (ORCPT ); Wed, 7 Oct 2009 23:38:38 -0400 Received: from gir.skynet.ie ([193.1.99.77]:32785 "EHLO gir.skynet.ie" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750831AbZJHDii (ORCPT ); Wed, 7 Oct 2009 23:38:38 -0400 Date: Thu, 8 Oct 2009 04:38:04 +0100 (IST) From: Dave Airlie X-X-Sender: airlied@skynet.skynet.ie To: Stephen Rothwell cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Jerome Glisse Subject: Re: linux-next: manual merge of the drm tree with Linus' tree In-Reply-To: <20091008133529.eda6d568.sfr@canb.auug.org.au> Message-ID: References: <20091006132857.5bd1cc3a.sfr@canb.auug.org.au> <20091008133529.eda6d568.sfr@canb.auug.org.au> User-Agent: Alpine 2.00 (DEB 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 464 Lines: 15 > > Got similar conflicts today ... any way you can sort this out, please? I'm testing the result of a merge at the moment, but I don't want to be premature with pushing it out. hopefully be there tomorrow. Dave. -- 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/