Subject: Re: linux-next: manual merge of the mac80211-next tree with the mac80211 tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 9 Apr 2019 18:11:14 +1000

Hi Johannes,

On Tue, 09 Apr 2019 09:27:35 +0200 Johannes Berg <[email-masked]> wrote:
>
> But yes, I'm aware. It seemed simple enough though that I decided to
> keep it like that, I didn't really find a better solution.

Yeah, pretty trivial.  I assume both trees will meet in Dave's tree at some point.

-- 
Cheers,
Stephen Rothwell