linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jeremy Fitzhardinge <jeremy@goop.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
	"H. Peter Anvin" <hpa@zytor.com>,
	linux-next@vger.kernel.org, Steven Rostedt <srostedt@redhat.com>
Subject: Re: linux-next: manual merge of the x86 tree
Date: Mon, 07 Jul 2008 20:22:10 -0700	[thread overview]
Message-ID: <4872DD62.1060708@goop.org> (raw)
In-Reply-To: <20080708105658.1a9deedc.sfr@canb.auug.org.au>

Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the x86 tree got a conflict in
> include/asm-x86/irqflags.h between commit
> 81d68a96a39844853b37f20cc8282d9b65b78ef3 ("ftrace: trace irq disabled
> critical timings") from the ftrace tree and commits
> f56c208ae2a6705a40c0f7d43bfc4ede7eb20a83 ("x86, 64-bit: swapgs pvop with
> a user-stack can never be called") and
> 6d2a6e57be1582b017a39f52385adf49d7cc4b0f ("x86_64: fix non-paravirt
> compilation") from the x86 tree.
>   

I must be missing something.  Don't all those already come from tip.git 
pre-merged?  Or are you merging various tip.git topic branches 
yourself?  Or are some of these coming from elsewhere?

> Just contextual remove/move of code.  I can carry the fixup.
>   

Thanks,
    J

  reply	other threads:[~2008-07-08  3:22 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-07-08  0:56 linux-next: manual merge of the x86 tree Stephen Rothwell
2008-07-08  3:22 ` Jeremy Fitzhardinge [this message]
2008-07-08  5:01   ` Stephen Rothwell
2008-07-08  5:28     ` Jeremy Fitzhardinge
2008-07-08  5:39     ` Ingo Molnar
  -- strict thread matches above, loose matches on Subject: below --
2008-10-14  2:23 Stephen Rothwell
2008-09-11 23:37 Stephen Rothwell
2008-09-14 15:16 ` Ingo Molnar
2008-09-14 18:11   ` Stephen Rothwell
2008-09-11 23:34 Stephen Rothwell
2008-09-14 15:18 ` Ingo Molnar
2008-09-14 18:13   ` Stephen Rothwell
2008-09-03  0:57 Stephen Rothwell
2008-09-05 16:00 ` Ingo Molnar
2008-09-02  1:32 Stephen Rothwell
2008-09-05 18:22 ` Ingo Molnar
2008-08-15  3:58 Stephen Rothwell
2008-07-31  2:59 Stephen Rothwell
2008-07-23  2:51 Stephen Rothwell
2008-07-18  2:29 Stephen Rothwell
2008-07-17  1:43 Stephen Rothwell
2008-07-15  2:26 Stephen Rothwell
2008-07-14  1:30 Stephen Rothwell
2008-07-11  1:48 Stephen Rothwell
2008-07-11  1:47 Stephen Rothwell
2008-07-08  0:52 Stephen Rothwell
2008-07-04  3:50 Stephen Rothwell
2008-07-04  3:41 Stephen Rothwell
2008-07-04  9:41 ` Ingo Molnar
2008-06-25  2:28 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=4872DD62.1060708@goop.org \
    --to=jeremy@goop.org \
    --cc=hpa@zytor.com \
    --cc=linux-next@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=sfr@canb.auug.org.au \
    --cc=srostedt@redhat.com \
    --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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).