On Mon, 1 Oct 2007, Linus Torvalds wrote:
quoted text
> 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.

Thanks,

	Thomas, Ingo
-
unsubscribe notice
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/