linux-next: manual merge of the trivial tree with the powerpc tree

[Stephen Rothwell]

Hi Jiri,

Today's linux-next merge of the trivial tree got a conflict in
drivers/scsi/ipr.c between commit d3dbeef657fd ("powerpc: Rename 64-bit
PVR constants to PVR_foo") from the powerpc tree and commit 203fa3fe9c9d
("ipr: fix small coding style issues") from the trivial tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary (no action required).

-- 
Cheers,
Stephen Rothwell                    sfr at canb.auug.org.au

diff --cc drivers/scsi/ipr.c
index cff6503,1059c99..0000000
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@@ -6398,8 -6330,8 +6398,8 @@@ static int ipr_invalid_adapter(struct i
  	int i;
  
  	if ((ioa_cfg->type == 0x5702) && (ioa_cfg->pdev->revision < 4)) {
- 		for (i = 0; i < ARRAY_SIZE(ipr_blocked_processors); i++){
+ 		for (i = 0; i < ARRAY_SIZE(ipr_blocked_processors); i++) {
 -			if (__is_processor(ipr_blocked_processors[i]))
 +			if (pvr_version_is(ipr_blocked_processors[i]))
  				return 1;
  		}
  	}
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.ozlabs.org/pipermail/linuxppc-dev/attachments/20120906/bab88ec7/attachment.sig>