From mboxrd@z Thu Jan 1 00:00:00 1970 From: Darren Hart Subject: Re: linux-next: manual merge of the drivers-x86 tree with the net-next tree Date: Mon, 9 Oct 2017 16:18:10 -0700 Message-ID: <20171009231810.GI12321@fury> References: <20171009175633.dm7hjmgoxusspue5@sirena.co.uk> <20171009194301.GP2761@lahna.fi.intel.com> <20171009195634.gzxwcqn7xklumqyr@sirena.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Content-Disposition: inline In-Reply-To: <20171009195634.gzxwcqn7xklumqyr@sirena.co.uk> Sender: netdev-owner@vger.kernel.org To: Mark Brown Cc: Mika Westerberg , Mario Limonciello , Yehezkel Bernat , Andy Shevchenko , Amir Levy , Michael Jamet , "David S. Miller" , netdev@vger.kernel.org, Linux-Next Mailing List , Linux Kernel Mailing List List-Id: linux-next.vger.kernel.org On Mon, Oct 09, 2017 at 08:56:34PM +0100, Mark Brown wrote: > On Mon, Oct 09, 2017 at 10:43:01PM +0300, Mika Westerberg wrote: > > > If possible, I would rather move this chapter to be before "Networking > > over Thunderbolt cable". Reason is that it then follows NVM flashing > > chapter which is typically where you need to force power in the first > > place. > Agreed. > I guess that's something best sorted out either in the relevant trees or > during the merge window? 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. -- Darren Hart VMware Open Source Technology Center