From: David Miller <davem@davemloft•net>
To: daniel@gaisler•com
Cc: sparclinux@vger•kernel.org, sfr@canb•auug.org.au,
peterz@infradead•org, tglx@linutronix•de, mingo@elte•hu,
hpa@zytor•com, linux-next@vger•kernel.org,
linux-kernel@vger•kernel.org
Subject: Re: [PATCH 1/2] Fix merge problem between sparc32 IPI patches and schedule_ipi() callback
Date: Fri, 20 May 2011 16:13:01 -0400 (EDT) [thread overview]
Message-ID: <20110520.161301.913577691507123777.davem@davemloft.net> (raw)
In-Reply-To: <1305900070-23492-1-git-send-email-daniel@gaisler.com>
From: Daniel Hellstrom <daniel@gaisler•com>
Date: Fri, 20 May 2011 16:01:09 +0200
> Fixes a merge conflict in arch/sparc/kernel/smp_32.c between commit
> d6d048192b1d ("sparc32: implement SMP IPIs using the generic functions")
> from the sparc tree and commit 184748cc50b2 ("sched: Provide
> scheduler_ipi() callback in response to smp_send_reschedule()").
>
> The patch adds a call to scheduler_ipi() from the resched IPI handler in
> sparc32.
>
> Signed-off-by: Daniel Hellstrom <daniel@gaisler•com>
What I did to handle this was merge in enough of the upstream commit
by Peter such that both of these patches apply, via:
git merge --no-commit 317f394160e9beb97d19a84c39b7e5eb3d7815a8
then I added patch #1 into the merge commit.
Next, I applied patch #2 afterwards.
So we should be all set when I push this out to Linus, thanks!
prev parent reply other threads:[~2011-05-20 20:15 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-20 14:01 [PATCH 1/2] Fix merge problem between sparc32 IPI patches and schedule_ipi() callback Daniel Hellstrom
2011-05-20 14:01 ` [PATCH 2/2] SCHED_TTWU_QUEUE is not longer needed since sparc32 now implements IPI Daniel Hellstrom
2011-05-20 20:13 ` David Miller [this message]
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=20110520.161301.913577691507123777.davem@davemloft.net \
--to=davem@davemloft$(echo .)net \
--cc=daniel@gaisler$(echo .)com \
--cc=hpa@zytor$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=peterz@infradead$(echo .)org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=sparclinux@vger$(echo .)kernel.org \
--cc=tglx@linutronix$(echo .)de \
/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