netdev - linux-next: manual merge of the tip 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: 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 <sfr@...b.auug.org.au>
To:	Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...e.hu>,
	"H. Peter Anvin" <hpa@...or.com>,
	Peter Zijlstra <peterz@...radead.org>,
	David Miller <davem@...emloft.net>, <netdev@...r.kernel.org>,
	QCA ath9k Development <ath9k-devel@....qualcomm.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	"John W. Linville" <linville@...driver.com>,
	Felix Fietkau <nbd@...nwrt.org>,
	Rajkumar Manoharan <rmanohar@....qualcomm.com>,
	John Stultz <john.stultz@...aro.org>
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 ...

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

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