linux-kernel - Re: linux-next: manual merge of the net tree with the wireless-current 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: Windows password security audit tool. GUI, reports in PDF.

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

Message-ID: <20090722140351.GC5276@tuxdriver.com>
Date:	Wed, 22 Jul 2009 10:03:51 -0400
From:	"John W. Linville" <linville@...driver.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	David Miller <davem@...emloft.net>, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org,
	Johannes Berg <johannes@...solutions.net>,
	Christian Lamparter <chunkeey@....de>
Subject: Re: linux-next: manual merge of the net tree with the
	wireless-current tree

On Wed, Jul 22, 2009 at 12:00:00PM +1000, Stephen Rothwell wrote:
> Hi David,
> 
> Today's linux-next merge of the net tree got a conflict in
> net/wireless/scan.c between commit
> 9e81eccf199d910e5ea8db377a43478e4eccd033 ("cfg80211: double free in
> __cfg80211_scan_done") from the wireless-current tree and commit
> 667503ddcb96f3b10211f997fe55907fa7509841 ("cfg80211: fix locking") from
> the net tree.
> 
> Overlapping additions.  I fixed it up (I think - see below) and can carry
> the fix as ncessary.

Looks fine, thanks!

-- 
John W. Linville		Someday the world will need a hero, and you
linville@...driver.com			might be all we have.  Be ready.
			¡Viva Honduras Libre!
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/