Message-Id: <200710022212.15219.rjw@sisk.pl>
Date:	Tue, 2 Oct 2007 22:12:13 +0200
From:	"Rafael J. Wysocki" <rjw@...k.pl>
To:	Thomas Gleixner <tglx@...utronix.de>
Cc:	Linus Torvalds <torvalds@...ux-foundation.org>,
	Ingo Molnar <mingo@...e.hu>, Andi Kleen <ak@...e.de>,
	Greg KH <greg@...ah.com>,
	Rusty Russell <rusty@...tcorp.com.au>,
	Sam Ravnborg <sam@...nborg.org>,
	"H. Peter Anvin" <hpa@...or.com>,
	Peter Zijlstra <peterz@...radead.org>,
	Venkatesch Pallipadi <venkatesh.pallipadi@...el.com>,
	Mike Travis <travis@....com>, Avi Kivity <avi@...ranet.com>,
	Jason Wessel <jason.wessel@...driver.com>,
	Jeremy Fitzhardinge <jeremy@...p.org>,
	Glauber de Oliveira Costa <glommer@...il.com>,
	Chris Wright <chrisw@...s-sol.org>,
	Christoph Lameter <clameter@....com>,
	"Eric W. Biederman" <ebiederm@...ssion.com>,
	Anil S Keshavamurthy <anil.s.keshavamurthy@...el.com>,
	Zachary Amsden <zach@...are.com>,
	Andrew Morton <akpm@...ux-foundation.org>,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: Re: Linux 2.6.23-rc9 and a heads-up for the 2.6.24 series..

On Tuesday, 2 October 2007 11:17, Thomas Gleixner wrote:
> On Mon, 1 Oct 2007, Linus Torvalds wrote:
> > This is also a good time to warn about the fact that we're doing the x86 
> > merge very soon (as in the next day or two) after 2.6.23 is out, so if you 
> > have pending patches for the next series that touch arch/i386 or x86-64, 
> > you should get in touch with Thomas Gleixner and Ingo Molnar, who are the 
> > keepers of the merge scripts, and will help you prepare..
> > 
> > Doing it as early as possible in the 2.6.24-rc4 series (basically I'll do 
> > it first thing) will mean that we'll have the maximum amount of time to 
> > sort out any issues, and the thing is, Thomas and Ingo already have a tree 
> > ready to go, so people can check their work against that, and don't need 
> > to think that they have to do any fixups after it his *my* tree. It would 
> > be much better if everybody was just ready for it, and not taken by 
> > surprise.
> > 
> > In other words, people who know they may be affected and would want to 
> > prepare can look at (for example)
> > 
> > 	git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-x86.git x86
> > 
> > and generally get ready for the switch-over. 
> 
> I have uploaded an update of the arch/x86 tree based on -rc9 to
> 
> 	git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-x86.git x86
> 
> For convenience there is a patch fixup script which helps you to
> convert pending patches against this tree.
> 
> 	http://userweb.kernel.org/~tglx/x86/x86-fixup-patches.py
> 
> It's generated from the merge script and fixes the namespace of
> patches. There will still be some rejects which can not be fixed up
> automatically, but this should be rare.
> 
> I did a test with Andrews -mm series and only ~10 arch/x86 related
> patches had rejects, out of 230+ patches, so the 100%-painless
> conversion ratio is better than 95%. Those patches with rejects were
> trivial to fix.
> 
> Usage: x86-fixup-patches.py sourcepatch destpatch
> 
> source and dest can be the same.
> 
> A helper script to convert complete quilt series is here:
> 	http://userweb.kernel.org/~tglx/x86/fixupseries.sh
> 
> If there is anything we can help with the transition, please do not
> hesitate to ask.

Well, there are several arch-dependent power management patches in -mm queued
up for merging.  Do I need to take care of converting them myself, or will that
be done automatically, or ...?

Greetings,
Rafael
-
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/

Powered by blists - more mailing lists