lkml.org 
[lkml]   [2022]   [Feb]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: linux-next: manual merge of the wireless-next tree with the origin tree
From
Date
Hi,

> Today's linux-next merge of the wireless-next tree got a conflict in:
>
> net/mac80211/mlme.c
>
> between commit:
>
> a72c01a94f1d2 ("mac80211: mlme: check for null after calling kmemdup")
>
> from the origin tree and commit:
>
> 820acc810fb6e ("mac80211: Add EHT capabilities to association/probe request")
>
> from the wireless-next tree.

Thanks. I think Stephen had also noticed this before.

Maybe I'll just move the new code around so it doesn't conflict anymore
;)

johannes

\
 
 \ /
  Last update: 2022-02-22 17:46    [W:0.033 / U:0.196 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site