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>] [day] [month] [year] [list]
Date:	Mon, 10 Nov 2014 15:34:26 +1100
From:	Stephen Rothwell <>
To:	Greg KH <>,
	"John W. Linville" <>
	Wolfram Sang <>,
	Alexander Aring <>,
	Marcel Holtmann <>
Subject: linux-next: manual merge of the driver-core tree with the
 wireless-next tree

Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in
drivers/net/ieee802154/fakehard.c between commit 36426484fcac
("ieee802154: remove fakehard driver") from the wireless-next tree and
commit bb1f1107858c ("net: ieee802154: drop owner assignment from
platform_drivers") from the driver-core tree.

I fixed it up (I just removed the file) and can carry the fix as
necessary (no action is required).

Stephen Rothwell          

Content of type "application/pgp-signature" skipped

Powered by blists - more mailing lists