From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Thomas Gleixner <tglx@linutronix•de>, Ingo Molnar <mingo@elte•hu>,
"H. Peter Anvin" <hpa@zytor•com>
Cc: linux-next@vger•kernel.org, Jens Axboe <jens.axboe@oracle•com>,
Mike Travis <travis@sgi•com>
Subject: linux-next: manual merge of the cpus4096 tree
Date: Wed, 16 Jul 2008 12:47:32 +1000 [thread overview]
Message-ID: <20080716124732.9fedc3dd.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1287 bytes --]
Hi all,
Today's linux-next merge of the cpus4096 tree got a conflict in
net/iucv/iucv.c between commit 8691e5a8f691cc2a4fda0651e8d307aaba0e7d68
("smp_call_function: get rid of the unused nonatomic/retry argument")
from Linus' tree and commit 0e12f848b337fc034ceb3c0d03d75f8de1b8cc96
("net: use performance variant for_each_cpu_mask_nr") from the cpus4096
tree.
This conflict (see below) used to be against generic-ipi tree, but that
has now been merged into Linus' tree. Simple fixup.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --cc net/iucv/iucv.c
index cc34ac7,8de5110..0000000
--- a/net/iucv/iucv.c
+++ b/net/iucv/iucv.c
@@@ -497,8 -497,8 +497,13 @@@ static void iucv_setmask_up(void
/* Disable all cpu but the first in cpu_irq_cpumask. */
cpumask = iucv_irq_cpumask;
cpu_clear(first_cpu(iucv_irq_cpumask), cpumask);
++<<<<<<< HEAD:net/iucv/iucv.c
+ for_each_cpu_mask(cpu, cpumask)
+ smp_call_function_single(cpu, iucv_block_cpu, NULL, 1);
++=======
+ for_each_cpu_mask_nr(cpu, cpumask)
+ smp_call_function_single(cpu, iucv_block_cpu, NULL, 0, 1);
++>>>>>>> cpus4096/auto-cpus4096-next:net/iucv/iucv.c
}
/**
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
next reply other threads:[~2008-07-16 2:47 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-16 2:47 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2009-01-19 1:08 linux-next: manual merge of the cpus4096 tree Stephen Rothwell
2008-09-12 5:18 Stephen Rothwell
2008-07-07 6:20 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080716124732.9fedc3dd.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=hpa@zytor$(echo .)com \
--cc=jens.axboe@oracle$(echo .)com \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=tglx@linutronix$(echo .)de \
--cc=travis@sgi$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox