linux-kernel - linux-next: manual merge of the trivial tree with the powerpc 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]

Message-Id: <20120906132302.030566cf4f8ee90cc1191f46@canb.auug.org.au>
Date:	Thu, 6 Sep 2012 13:23:02 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Jiri Kosina <jkosina@...e.cz>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Kleber Sacilotto de Souza <klebers@...ux.vnet.ibm.com>,
	Michael Ellerman <michael@...erman.id.au>,
	Benjamin Herrenschmidt <benh@...nel.crashing.org>,
	Paul Mackerras <paulus@...ba.org>,
	<linuxppc-dev@...ts.ozlabs.org>
Subject: linux-next: manual merge of the trivial tree with the powerpc tree

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@...b.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;
  		}
  	}

Content of type "application/pgp-signature" skipped