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

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1223 bytes --]

Hi all,

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.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc net/mac80211/tx.c
index 2e816dd67be7,3655aae96df1..000000000000
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@@ -3221,7 -3219,7 +3219,8 @@@ static bool ieee80211_amsdu_aggregate(s
  	u8 max_subframes = sta->sta.max_amsdu_subframes;
  	int max_frags = local->hw.max_tx_fragments;
  	int max_amsdu_len = sta->sta.max_amsdu_len;
 +	int orig_truesize;
+ 	u32 flow_idx;
  	__be16 len;
  	void *data;
  	bool ret = false;

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[Johannes Berg]

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

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 358 bytes --]

Hi Johannes,

On Tue, 09 Apr 2019 09:27:35 +0200 Johannes Berg <johannes@sipsolutions.net> 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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]