Messages in this thread | | | Date | Wed, 02 May 2012 21:35:32 -0400 (EDT) | Subject | Re: linux-next: manual merge of the wireless-next tree with the net-next tree | From | David Miller <> |
| |
From: Stephen Rothwell <sfr@canb.auug.org.au> Date: Thu, 3 May 2012 11:31:10 +1000
> Today's linux-next merge of the wireless-next tree got a conflict in > net/wireless/nl80211.c between commit 9360ffd18597 ("wireless: Stop using > NLA_PUT*()") from the net-next tree and commit 0a9b3782ef40 ("{nl,cfg,mac} > 80211: Allow user to see/configure HT protection mode") from the > wireless-next tree.
John, the NLA_PUT macros were removed from the net-next tree more than a month ago.
There is zero reason why this should still be happening, and this issue is causing a large, unnecessary, burdon upon Stephen.
Please take care of this, thanks.
| |