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@xxxxxxxxxxxxxxxx http://www.canb.auug.org.au/~sfr/
Attachment:
pgpKoje4adNwC.pgp
Description: PGP signature