* linux-next: manual merge of the trivial tree with the powerpc tree
@ 2012-09-06 3:23 Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2012-09-06 3:23 UTC (permalink / raw)
To: Jiri Kosina
Cc: linux-next, linux-kernel, Kleber Sacilotto de Souza,
Michael Ellerman, Benjamin Herrenschmidt, Paul Mackerras,
linuxppc-dev
[-- Attachment #1: Type: text/plain, Size: 1007 bytes --]
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@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;
}
}
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the trivial tree with the powerpc tree
2012-03-16 3:56 Stephen Rothwell
@ 2012-03-16 11:10 ` Jiri Kosina
0 siblings, 0 replies; 3+ messages in thread
From: Jiri Kosina @ 2012-03-16 11:10 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Masanari Iida, Benjamin Herrenschmidt,
Paul Mackerras, linuxppc-dev
On Fri, 16 Mar 2012, Stephen Rothwell wrote:
> Today's linux-next merge of the trivial tree got a conflict in
> drivers/char/viotape.c between commit ba7a4822b48f ("powerpc: Remove some
> of the legacy iSeries specific device drivers") from the powerpc tree and
> commit a7ccf3775219 ("char: Fix typo in viotape.c") from the trivial tree.
Dropped a7ccf3775219 in my tree, thanks for report Stephen.
--
Jiri Kosina
SUSE Labs
^ permalink raw reply [flat|nested] 3+ messages in thread
* linux-next: manual merge of the trivial tree with the powerpc tree
@ 2012-03-16 3:56 Stephen Rothwell
2012-03-16 11:10 ` Jiri Kosina
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2012-03-16 3:56 UTC (permalink / raw)
To: Jiri Kosina
Cc: linux-next, linux-kernel, Masanari Iida, Benjamin Herrenschmidt,
Paul Mackerras, linuxppc-dev
[-- Attachment #1: Type: text/plain, Size: 428 bytes --]
Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in
drivers/char/viotape.c between commit ba7a4822b48f ("powerpc: Remove some
of the legacy iSeries specific device drivers") from the powerpc tree and
commit a7ccf3775219 ("char: Fix typo in viotape.c") from the trivial tree.
The former commit removed the file, so I did that.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-09-06 3:23 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-09-06 3:23 linux-next: manual merge of the trivial tree with the powerpc tree Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2012-03-16 3:56 Stephen Rothwell
2012-03-16 11:10 ` Jiri Kosina
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).