linux-next: manual merge of the akpm tree with the scsi tree

From: Stephen Rothwell
Date: Mon Apr 08 2013 - 03:03:07 EST


Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
drivers/scsi/qla2xxx/qla_attr.c between commit 4a9fa41bd404 ("[SCSI]
qla2xxx: Remove debug code that msleeps for random duration") from the
scsi tree and commit "scsi: rename random32() to prandom_u32()" from the
akpm tree.

The former removed the code in this file that was updated by the latter,
so I did that (and dropped the next patch ("scsi: fix the wrong position
of the comment") and can carry the fix as necessary (no action is
required).

--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature