From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754041AbbIXLwZ (ORCPT ); Thu, 24 Sep 2015 07:52:25 -0400 Received: from ozlabs.org ([103.22.144.67]:59946 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752318AbbIXLwY (ORCPT ); Thu, 24 Sep 2015 07:52:24 -0400 Date: Thu, 24 Sep 2015 21:52:22 +1000 From: Stephen Rothwell To: Jani Nikula Cc: Daniel Vetter , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree Message-ID: <20150924215222.3f0ecc40@canb.auug.org.au> In-Reply-To: <876130dwke.fsf@intel.com> References: <20150924112516.1dc9d5d3@canb.auug.org.au> <876130dwke.fsf@intel.com> X-Mailer: Claws Mail 3.12.0 (GTK+ 2.24.28; x86_64-pc-linux-gnu) 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 Jani, On Thu, 24 Sep 2015 11:57:05 +0300 Jani Nikula wrote: > > That was the right thing to do. > > The former commit is headed for v4.3, and there will have to be another > version of it for -next. This will cause you another conflict, and you > should resolve it with the same approach. OK, thanks. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au