linux-kernel - Re: [PATCH 1/2] Fix merge problem between sparc32 IPI patches and schedule

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>] [<thread-prev] [day] [month] [year] [list]

Message-Id: <20110520.161301.913577691507123777.davem@davemloft.net>
Date:	Fri, 20 May 2011 16:13:01 -0400 (EDT)
From:	David Miller <davem@...emloft.net>
To:	daniel@...sler.com
Cc:	sparclinux@...r.kernel.org, sfr@...b.auug.org.au,
	peterz@...radead.org, tglx@...utronix.de, mingo@...e.hu,
	hpa@...or.com, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org
Subject: Re: [PATCH 1/2] Fix merge problem between sparc32 IPI patches and
 schedule_ipi() callback

From: Daniel Hellstrom <daniel@...sler.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@...sler.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!
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/