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,
	John Stultz <johnstul@us.ibm.com>,
	Paul Mackerras <paulus@samba.org>
Subject: linux-next: manual merge of the tip tree with the powerpc tree
Date: Wed, 28 Jul 2010 14:38:56 +1000	[thread overview]
Message-ID: <20100728143856.45d20338.sfr@canb.auug.org.au> (raw)

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

Hi all,

Today's linux-next merge of the tip tree got some complex a conflicts in
arch/powerpc/kernel/time.c between a couple of commits from the powerpc
tree and a set of commits from the tip tree.

Since John has posted a new revision of the patches that are in the tip
tree that will resolve these conflicts. I just used the tip tree from
next-20100727 for today (and hope this will be better tomorrow).
-- 
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:[~2010-07-28  4:39 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-07-28  4:38 Stephen Rothwell [this message]
2010-10-19  4:48 linux-next: manual merge of the tip tree with the powerpc tree Stephen Rothwell
2010-10-19  4:48 ` Stephen Rothwell
2010-10-19  4:48 ` Stephen Rothwell
2010-10-19  4:56 ` Stephen Rothwell
2010-10-19  4:56   ` Stephen Rothwell
2010-10-19  4:56   ` Stephen Rothwell
2011-05-20  4:14 Stephen Rothwell
2011-05-20  4:14 ` Stephen Rothwell
2011-05-20  4:14 ` Stephen Rothwell
2011-05-20  5:38 ` Benjamin Herrenschmidt
2011-05-20  5:38   ` Benjamin Herrenschmidt
2012-03-09  4:40 Stephen Rothwell
2012-03-09  4:40 ` Stephen Rothwell
2012-03-09  4:40 ` Stephen Rothwell
2017-02-17  1:48 Stephen Rothwell
2017-02-21 22:15 ` Stephen Rothwell
2017-04-26  4:01 Stephen Rothwell
2017-11-01  5:53 Stephen Rothwell
2017-11-01 18:12 ` Kees Cook
2022-03-15  2:08 Stephen Rothwell
2022-03-15  2:08 ` 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=20100728143856.45d20338.sfr@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=hpa@zytor.com \
    --cc=johnstul@us.ibm.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=paulus@samba.org \
    --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.