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  PHC 
Open Source and information security mailing list archives
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date:	Thu, 26 Nov 2009 10:33:09 +0100
From:	Johannes Berg <>
To:	Stephen Rothwell <>
Cc:	David Miller <>,,,,
	Jean Tourrilhes <>,
	"John W. Linville" <>
Subject: Re: linux-next: manual merge of the net tree with the
 wireless-current tree

On Thu, 2009-11-26 at 14:10 +1100, Stephen Rothwell wrote:
> Hi all,
> Today's linux-next merge of the net tree got a conflict in
> net/wireless/wext.c between commit
> 9fed059667d35fca9288460106e92dbb8ba35ea1 ("WE: Fix set events not
> propagated") from the  tree and commit
> 3d23e349d807177eaf519d444677cee86b1a04cf ("wext: refactor") from the net
> tree.
> The latter deleted the file that the former modified.  I just ignored the
> wireless-current change and removed the file (which seems to have been
> done in the latter change anyway).

The fix should probably have gone to wext-core.c instead?


Download attachment "signature.asc" of type "application/pgp-signature" (802 bytes)

Powered by blists - more mailing lists