From: Darren Hart <dvhart@infradead.org>
To: Mark Brown <broonie@kernel.org>
Cc: Mika Westerberg <mika.westerberg@linux.intel.com>,
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
Date: Mon, 9 Oct 2017 16:18:10 -0700 [thread overview]
Message-ID: <20171009231810.GI12321@fury> (raw)
In-Reply-To: <20171009195634.gzxwcqn7xklumqyr@sirena.co.uk>
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
next prev parent reply other threads:[~2017-10-09 23:18 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-09 17:56 linux-next: manual merge of the drivers-x86 tree with the net-next tree Mark Brown
2017-10-09 19:43 ` Mika Westerberg
2017-10-09 19:56 ` Mark Brown
2017-10-09 23:18 ` Darren Hart [this message]
2017-10-10 11:49 ` Mika Westerberg
2017-11-13 5:28 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2017-11-08 3:29 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171009231810.GI12321@fury \
--to=dvhart@infradead.org \
--cc=amir.jer.levy@intel.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=broonie@kernel.org \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mario.limonciello@dell.com \
--cc=michael.jamet@intel.com \
--cc=mika.westerberg@linux.intel.com \
--cc=netdev@vger.kernel.org \
--cc=yehezkel.bernat@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.