lkml.org 
[lkml]   [2011]   [May]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
SubjectRe: [PATCH 1/2] Fix merge problem between sparc32 IPI patches and schedule_ipi() callback
From
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!


\
 
 \ /
  Last update: 2011-05-20 22:17    [W:0.034 / U:0.636 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site