Subject: linux-next: manual merge of the net-next tree with the wireless tree

From: Stephen Rothwell <[email-masked]>
Date: Thu, 16 Feb 2012 12:37:46 +1100

Hi all,

Today's linux-next merge of the net-next tree got a conflict in
net/mac80211/debugfs_sta.c between commit 4b5a433ae534 ("mac80211: call
rate control only after init") from the wireless tree and commit
83d5cc012441 ("mac80211: station state transition error handling") from
the net-next tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    [email-masked]

diff --cc net/mac80211/debugfs_sta.c
index d86217d,c838371..0000000
--- a/net/mac80211/debugfs_sta.c
+++ b/net/mac80211/debugfs_sta.c
@@@ -63,14 -63,15 +63,15 @@@ static ssize_t sta_flags_read(struct fi
  	test_sta_flag(sta, WLAN_STA_##flg) ? #flg "\n" : ""
  
  	int res = scnprintf(buf, sizeof(buf),
- 			    "%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s",
 -			    "%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s",
++			    "%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s",
  			    TEST(AUTH), TEST(ASSOC), TEST(PS_STA),
  			    TEST(PS_DRIVER), TEST(AUTHORIZED),
  			    TEST(SHORT_PREAMBLE),
  			    TEST(WME), TEST(WDS), TEST(CLEAR_PS_FILT),
  			    TEST(MFP), TEST(BLOCK_BA), TEST(PSPOLL),
  			    TEST(UAPSD), TEST(SP), TEST(TDLS_PEER),
- 			    TEST(TDLS_PEER_AUTH), TEST(RATE_CONTROL));
 -			    TEST(TDLS_PEER_AUTH), TEST(4ADDR_EVENT),
 -			    TEST(INSERTED));
++			    TEST(TDLS_PEER_AUTH), TEST(RATE_CONTROL),
++			    TEST(4ADDR_EVENT), TEST(INSERTED));
  #undef TEST
  	return simple_read_from_buffer(userbuf, count, ppos, buf, res);
  }