From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1755940AbdJJL6K (ORCPT <rfc822;w@1wt.eu>);
        Tue, 10 Oct 2017 07:58:10 -0400
Received: from mga02.intel.com ([134.134.136.20]:41096 "EHLO mga02.intel.com"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1755144AbdJJL6I (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
        Tue, 10 Oct 2017 07:58:08 -0400
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.42,504,1500966000"; 
   d="scan'208";a="908501813"
Date: Tue, 10 Oct 2017 14:49:20 +0300
From: Mika Westerberg <mika.westerberg@linux.intel.com>
To: Darren Hart <dvhart@infradead.org>
Cc: Mark Brown <broonie@kernel.org>,
        Mario Limonciello <mario.limonciello@dell.com>,
        Yehezkel Bernat <yehezkel.bernat@intel.com>,
        Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
        Amir Levy <amir.jer.levy@intel.com>,
        Michael Jamet <michael.jamet@intel.com>,
        "David S. Miller" <davem@davemloft.net>, netdev@vger.kernel.org,
        Linux-Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: manual merge of the drivers-x86 tree with the
 net-next tree
Message-ID: <20171010114920.GY2761@lahna.fi.intel.com>
References: <20171009175633.dm7hjmgoxusspue5@sirena.co.uk>
 <20171009194301.GP2761@lahna.fi.intel.com>
 <20171009195634.gzxwcqn7xklumqyr@sirena.co.uk>
 <20171009231810.GI12321@fury>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20171009231810.GI12321@fury>
Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo
User-Agent: Mutt/1.9.0 (2017-09-02)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Mon, Oct 09, 2017 at 04:18:10PM -0700, Darren Hart wrote:

> I'm not sure how we would deal with it in the trees. Best to note this during
> the merge window - whichever goes in second. Test merge will identify the merge
> conflict, and we can include a note to Linus on the preference.

That sounds good, thanks!