Re: pull-request: mac80211-next 2016-09-30

From: Johannes Berg <redacted>
Date: Mon, 03 Oct 2016 12:07:00 +0200

On Mon, 2016-10-03 at 01:54 -0400, David Miller wrote:

quoted

Could you please look into this and send me a new pull request with
the conflicts resolved?

Sure, will do (tomorrow, we have a holiday today).

Would you prefer I send you the merge resolution for your tree, or just
pull in net for a new pull request?

Resolve it using net-next since that is what I will pull it into.