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:	Fri, 25 Jul 2014 14:38:15 +1000
From:	Stephen Rothwell <>
To:	Thomas Gleixner <>, Ingo Molnar <>,
	"H. Peter Anvin" <>,
	Peter Zijlstra <>,
	David Miller <>, <>,
	QCA ath9k Development <>
	"John W. Linville" <>,
	Felix Fietkau <>,
	Rajkumar Manoharan <>,
	John Stultz <>
Subject: linux-next: manual merge of the tip tree with the net-next tree

Hi all,

Today's linux-next merge of the tip tree got a conflict in
drivers/net/wireless/ath/ath9k/hw.c between commit 8d7e09dda821
("ath9k: save tsf in channel context") from the net-next tree and
commit 6438e0ddc870 ("wireless: ath9k: Get rid of timespec
conversions") from the tip tree.

The former changes made the latter conversions much harder, so I
effectively dropped the tip tree commit.  Please discuss with the
wireless maintainer ...

Stephen Rothwell          

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

Powered by blists - more mailing lists