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
