lkml.org 
[lkml]   [2019]   [Apr]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: linux-next: manual merge of the mac80211-next tree with the mac80211 tree
From
Date
Hi Stephen,

> Today's linux-next merge of the mac80211-next tree got a conflict in:
>
> net/mac80211/tx.c
>
> between commit:
>
> eb9b64e3a9f8 ("mac80211: fix memory accounting with A-MSDU aggregation")
>
> from the mac80211 tree and commit:
>
> dcec1d9bc8a7 ("mac80211: calculate hash for fq without holding fq->lock in itxq enqueue")
>
> from the mac80211-next tree.

Thanks for the heads-up!

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.

johannes

\
 
 \ /
  Last update: 2019-04-09 09:28    [W:0.048 / U:1.080 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site