From: Ingo Molnar <mingo@elte•hu>
To: Roland McGrath <roland@redhat•com>
Cc: Stephen Rothwell <sfr@canb•auug.org.au>,
linux-next@vger•kernel.org,
Markus Metzger <markus.t.metzger@intel•com>,
Thomas Gleixner <tglx@linutronix•de>
Subject: Re: linux-next: manual merge of the sparseirq tree
Date: Wed, 17 Sep 2008 12:20:45 +0200 [thread overview]
Message-ID: <20080917102045.GA18764@elte.hu> (raw)
In-Reply-To: <20080915183511.1B510640A3@pipsqueak.localdomain>
* Roland McGrath <roland@redhat•com> wrote:
> The ioperm patch (tip/x86/ptrace) adds the new ioperm_* functions,
> which could go anywhere in the file (before the *_regsets[] decls).
> It might be simplest to just change the patch to put them earlier or
> later where the patch text is not near the lines touched by BTS
> patches.
yeah - but these are old commits, we better not upset them.
I've carried that conflict fixup for a long time and made it visible
because i updated sparseirq tree to propagate a fix but the x86 tree for
linux-next was at an older version (with PEBS topic not integrated yet)
- so Stephen got to see this conflict.
It should disappear on the next integration run this week. (the
frequency of integration runs is weekly - the frequency of bugfix/hotfix
propagation is daily/hourly)
Thanks Stephen for taking care of it.
Ingo
next prev parent reply other threads:[~2008-09-17 10:21 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-15 15:19 linux-next: manual merge of the sparseirq tree Stephen Rothwell
2008-09-15 18:35 ` Roland McGrath
2008-09-17 10:20 ` Ingo Molnar [this message]
-- strict thread matches above, loose matches on Subject: below --
2008-10-16 8:08 Stephen Rothwell
2008-10-16 8:13 ` Ingo Molnar
2008-10-16 8:30 ` Stephen Rothwell
2008-09-15 14:58 Stephen Rothwell
2008-08-25 9:32 Stephen Rothwell
2008-08-25 19:37 ` Jeremy Fitzhardinge
2008-08-25 23:48 ` 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=20080917102045.GA18764@elte.hu \
--to=mingo@elte$(echo .)hu \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=markus.t.metzger@intel$(echo .)com \
--cc=roland@redhat$(echo .)com \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=tglx@linutronix$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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