All of lore.kernel.org
 help / color / mirror / Atom feed
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>,
	Peter Zijlstra <peterz@infradead.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Daniel Hellstrom <daniel@gaisler.com>,
	"David S. Miller" <davem@davemloft.net>
Subject: linux-next: manual merge of the tip tree with the sparc tree
Date: Tue, 17 May 2011 13:14:35 +1000	[thread overview]
Message-ID: <20110517131435.aceca54e.sfr@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 568 bytes --]

Hi all,

Today's linux-next merge of the tip tree got a 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()") from the tip tree.

I fixed it up (I am pretty sure that the sparc tree patch supercedes the
tip tree one) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

             reply	other threads:[~2011-05-17  3:14 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-05-17  3:14 Stephen Rothwell [this message]
2011-05-19 13:37 ` linux-next: manual merge of the tip tree with the sparc tree Daniel Hellstrom
2011-05-19 15:35   ` Peter Zijlstra
2011-05-20  6:07     ` Daniel Hellstrom
2011-05-20  8:11       ` Peter Zijlstra
2011-05-20 12:48         ` Daniel Hellstrom
2011-05-20 13:24           ` Peter Zijlstra
2011-05-20  2:18   ` Stephen Rothwell
2015-05-28  6:38 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=20110517131435.aceca54e.sfr@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=daniel@gaisler.com \
    --cc=davem@davemloft.net \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=peterz@infradead.org \
    --cc=tglx@linutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.