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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-Id: <20120502.213532.2065398707446945634.davem@davemloft.net>
Date:	Wed, 02 May 2012 21:35:32 -0400 (EDT)
From:	David Miller <davem@...emloft.net>
To:	sfr@...b.auug.org.au
Cc:	linville@...driver.com, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org, ashok@...ybit.com,
	netdev@...r.kernel.org
Subject: Re: linux-next: manual merge of the wireless-next tree with the
 net-next tree

From: Stephen Rothwell <sfr@...b.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.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html