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
Date: Tue, 10 Oct 2017 14:49:20 +0300 [thread overview]
Message-ID: <20171010114920.GY2761@lahna.fi.intel.com> (raw)
In-Reply-To: <20171009231810.GI12321@fury>
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!
next prev parent reply other threads:[~2017-10-10 11:49 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
2017-10-10 11:49 ` Mika Westerberg [this message]
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=20171010114920.GY2761@lahna.fi.intel.com \
--to=mika.westerberg@linux.intel.com \
--cc=amir.jer.levy@intel.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=broonie@kernel.org \
--cc=davem@davemloft.net \
--cc=dvhart@infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mario.limonciello@dell.com \
--cc=michael.jamet@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).