linux-kernel - linux-next: manual merge of the akpm tree with the openrisc 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-next>] [day] [month] [year] [list]

Date:	Mon, 18 Jul 2011 18:56:08 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Andrew Morton <akpm@...ux-foundation.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Jonas Bonn <jonas@...thpole.se>
Subject: linux-next: manual merge of the akpm tree with the openrisc tree

Hi Andrew,

Today's linux-next merge of the scsi-post-merge tree got a conflict in
arch/x86/include/asm/delay.h between commit 10f53642f115 ("asm-generic:
move archictures to common delay.h") from the openrisc tree and commit
"With a non-constant 8-bit argument, a call to udelay() generates a
warning:" from the akpm tree.

I just dropped this patch from the akpm tree as the former commit
consolidated this code into asm-generic/delay.h (which doesn't solve the
problem).
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped