* linux-next: manual merge of the generic-ipi tree
@ 2008-07-16 9:45 Stephen Rothwell
2008-07-16 10:19 ` Ingo Molnar
0 siblings, 1 reply; 12+ messages in thread
From: Stephen Rothwell @ 2008-07-16 9:45 UTC (permalink / raw)
To: Ingo Molnar, Jens Axboe; +Cc: linux-next
[-- Attachment #1: Type: text/plain, Size: 725 bytes --]
Hi Jens, Ingo,
Today's linux-next merge of the generic-ipi tree got a conflict in
arch/powerpc/Kconfig between commit
3affedc4e1ce837033b6c5e9289d2ce2f5a62d31 ("powerpc/dma: implement new
dma_*map*_attrs() interfaces") and
7ff86b0317bc40c665aab62f3b7669713ade07c5 ("powerpc: Fix a build problem
on ppc32 with new DMA_ATTRs") from the powerpc tree and commit
07d55acad88f25177559f81aec42179e00c50360 ("manual merge of generic-ipi")
from the generic-ipi tree.
Some mixture of those and other commits. I took a superset. I guess
this will disappear tomorrow when things are more merged in Linus' tree.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: linux-next: manual merge of the generic-ipi tree
2008-07-16 9:45 linux-next: manual merge of the generic-ipi tree Stephen Rothwell
@ 2008-07-16 10:19 ` Ingo Molnar
2008-07-16 10:25 ` Stephen Rothwell
0 siblings, 1 reply; 12+ messages in thread
From: Ingo Molnar @ 2008-07-16 10:19 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Jens Axboe, linux-next
* Stephen Rothwell <sfr@canb•auug.org.au> wrote:
> Hi Jens, Ingo,
>
> Today's linux-next merge of the generic-ipi tree got a conflict in
> arch/powerpc/Kconfig between commit
> 3affedc4e1ce837033b6c5e9289d2ce2f5a62d31 ("powerpc/dma: implement new
> dma_*map*_attrs() interfaces") and
> 7ff86b0317bc40c665aab62f3b7669713ade07c5 ("powerpc: Fix a build problem
> on ppc32 with new DMA_ATTRs") from the powerpc tree and commit
> 07d55acad88f25177559f81aec42179e00c50360 ("manual merge of generic-ipi")
> from the generic-ipi tree.
>
> Some mixture of those and other commits. I took a superset. I guess
> this will disappear tomorrow when things are more merged in Linus'
> tree.
hm, generic-ipi is already in Linus's tree:
commit 59190f4213462f191fc0d22d39b1cf18ea39ca39
Merge: 64fd52a... f6f88e9...
Author: Linus Torvalds <torvalds@linux-foundation•org>
Date: Tue Jul 15 14:02:33 2008 -0700
Merge branch 'generic-ipi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'generic-ipi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (22 commits)
[...]
i hope i'll be able to update the auto-*-next branches soon - a lot of
them got very empty ;-)
Ingo
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: linux-next: manual merge of the generic-ipi tree
2008-07-16 10:19 ` Ingo Molnar
@ 2008-07-16 10:25 ` Stephen Rothwell
2008-07-16 10:40 ` Ingo Molnar
0 siblings, 1 reply; 12+ messages in thread
From: Stephen Rothwell @ 2008-07-16 10:25 UTC (permalink / raw)
To: Ingo Molnar; +Cc: Jens Axboe, linux-next
[-- Attachment #1: Type: text/plain, Size: 438 bytes --]
Hi Ingo,
On Wed, 16 Jul 2008 12:19:21 +0200 Ingo Molnar <mingo@elte•hu> wrote:
>
> hm, generic-ipi is already in Linus's tree:
Yeah, but powerpc wasn't when I started this morning (and now is).
> i hope i'll be able to update the auto-*-next branches soon - a lot of
> them got very empty ;-)
As I am hoping ...
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: linux-next: manual merge of the generic-ipi tree
2008-07-16 10:25 ` Stephen Rothwell
@ 2008-07-16 10:40 ` Ingo Molnar
2008-07-16 10:56 ` Stephen Rothwell
2008-07-16 11:14 ` Ingo Molnar
0 siblings, 2 replies; 12+ messages in thread
From: Ingo Molnar @ 2008-07-16 10:40 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Jens Axboe, linux-next
* Stephen Rothwell <sfr@canb•auug.org.au> wrote:
> Hi Ingo,
>
> On Wed, 16 Jul 2008 12:19:21 +0200 Ingo Molnar <mingo@elte•hu> wrote:
> >
> > hm, generic-ipi is already in Linus's tree:
>
> Yeah, but powerpc wasn't when I started this morning (and now is).
>
> > i hope i'll be able to update the auto-*-next branches soon - a lot of
> > them got very empty ;-)
>
> As I am hoping ...
hm, so them being stale over the merge window is a problem for you, even
thought the sha1's didnt change? Ok - i'll do a full integration run
right away to update them all to linus-very-latest. There's been quite a
number of nontrivial interactions.
Ingo
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: linux-next: manual merge of the generic-ipi tree
2008-07-16 10:40 ` Ingo Molnar
@ 2008-07-16 10:56 ` Stephen Rothwell
2008-07-16 11:44 ` Ingo Molnar
2008-07-16 11:14 ` Ingo Molnar
1 sibling, 1 reply; 12+ messages in thread
From: Stephen Rothwell @ 2008-07-16 10:56 UTC (permalink / raw)
To: Ingo Molnar; +Cc: Jens Axboe, linux-next
[-- Attachment #1: Type: text/plain, Size: 879 bytes --]
Hi Ingo,
On Wed, 16 Jul 2008 12:40:12 +0200 Ingo Molnar <mingo@elte•hu> wrote:
>
> hm, so them being stale over the merge window is a problem for you, even
> thought the sha1's didnt change? Ok - i'll do a full integration run
> right away to update them all to linus-very-latest. There's been quite a
> number of nontrivial interactions.
Its not to bad except where what gets merged to Linus is not exactly what
is in linux-next. This can be because they are sent to Linus as patches,
or the just the merge commits are are different.
However, once a tree is merged to Linus, just resetting resetting it to
be (a subset of) his tree (for some a fast forward for others not) makes
sense anyway. (And makes my life easier :-))
So thanks for that.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: linux-next: manual merge of the generic-ipi tree
2008-07-16 10:56 ` Stephen Rothwell
@ 2008-07-16 11:44 ` Ingo Molnar
0 siblings, 0 replies; 12+ messages in thread
From: Ingo Molnar @ 2008-07-16 11:44 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Jens Axboe, linux-next
* Stephen Rothwell <sfr@canb•auug.org.au> wrote:
> Hi Ingo,
>
> On Wed, 16 Jul 2008 12:40:12 +0200 Ingo Molnar <mingo@elte•hu> wrote:
> >
> > hm, so them being stale over the merge window is a problem for you,
> > even thought the sha1's didnt change? Ok - i'll do a full
> > integration run right away to update them all to linus-very-latest.
> > There's been quite a number of nontrivial interactions.
>
> Its not to bad except where what gets merged to Linus is not exactly
> what is in linux-next. This can be because they are sent to Linus as
> patches, or the just the merge commits are are different.
Hm. Sometimes i collapse merge fixlets into the conflict resolution
commit to reduce the bisection breakage window. If the difference is
material (and for the worse ;-) then please let us know about it.
> However, once a tree is merged to Linus, just resetting resetting it
> to be (a subset of) his tree (for some a fast forward for others not)
> makes sense anyway. (And makes my life easier :-))
>
> So thanks for that.
Instead of a reset i did an integration run. That automatically gets rid
of everything that Linus has merged - plus it adds whatever got merged
meanwhile in various topic branches. (because life doesnt stop :)
For many topics that means auto-topic-next == linus, but it's inherently
safer than an explicit reset, because it cannot result in the loss of
commits :-)
Ingo
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: linux-next: manual merge of the generic-ipi tree
2008-07-16 10:40 ` Ingo Molnar
2008-07-16 10:56 ` Stephen Rothwell
@ 2008-07-16 11:14 ` Ingo Molnar
2008-07-16 13:14 ` Stephen Rothwell
1 sibling, 1 reply; 12+ messages in thread
From: Ingo Molnar @ 2008-07-16 11:14 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Jens Axboe, linux-next
* Ingo Molnar <mingo@elte•hu> wrote:
> > > i hope i'll be able to update the auto-*-next branches soon - a
> > > lot of them got very empty ;-)
> >
> > As I am hoping ...
>
> hm, so them being stale over the merge window is a problem for you,
> even thought the sha1's didnt change? Ok - i'll do a full integration
> run right away to update them all to linus-very-latest. There's been
> quite a number of nontrivial interactions.
ok, i've done the integration run of all of tip's auto-*-next branches
and pushed out the result.
note, you might run into a conflict in arch/x86/kernel/Makefile, the
correct final resolution is:
ifdef CONFIG_FTRACE
# Do not profile debug and lowlevel utilities
CFLAGS_REMOVE_tsc.o = -pg
CFLAGS_REMOVE_rtc.o = -pg
CFLAGS_REMOVE_paravirt.o = -pg
endif
Ingo
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: linux-next: manual merge of the generic-ipi tree
2008-07-16 11:14 ` Ingo Molnar
@ 2008-07-16 13:14 ` Stephen Rothwell
0 siblings, 0 replies; 12+ messages in thread
From: Stephen Rothwell @ 2008-07-16 13:14 UTC (permalink / raw)
To: Ingo Molnar; +Cc: Jens Axboe, linux-next
[-- Attachment #1: Type: text/plain, Size: 629 bytes --]
Hi Ingo,
On Wed, 16 Jul 2008 13:14:42 +0200 Ingo Molnar <mingo@elte•hu> wrote:
>
> ok, i've done the integration run of all of tip's auto-*-next branches
> and pushed out the result.
>
> note, you might run into a conflict in arch/x86/kernel/Makefile, the
> correct final resolution is:
>
> ifdef CONFIG_FTRACE
> # Do not profile debug and lowlevel utilities
> CFLAGS_REMOVE_tsc.o = -pg
> CFLAGS_REMOVE_rtc.o = -pg
> CFLAGS_REMOVE_paravirt.o = -pg
> endif
Thanks, I will keep my eyes open.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
* linux-next: manual merge of the generic-ipi tree
@ 2008-07-07 16:46 Stephen Rothwell
0 siblings, 0 replies; 12+ messages in thread
From: Stephen Rothwell @ 2008-07-07 16:46 UTC (permalink / raw)
To: Ingo Molnar, Jens Axboe; +Cc: linux-next, Yinghai Lu
[-- Attachment #1: Type: text/plain, Size: 532 bytes --]
Hi Ingo,
Today's linux-next merge of the generic-ipi tree got a conflict in
arch/x86/kernel/setup.c between commit
f31174007a74d6866968a37520c40e7d0e11cb5a ("Merge commit
'pci/linux-next'") from the merge of the pci tree and commit
a37ec98ac0a44bd0314c20ce866a33091055a6b6 ("x86: move reserve_setup_data
to setup.c") from the generic-ipi tree.
Just a contextual conflict. I fixed it up and will carry the fix.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread* linux-next: manual merge of the generic-ipi tree
@ 2008-07-03 6:56 Stephen Rothwell
0 siblings, 0 replies; 12+ messages in thread
From: Stephen Rothwell @ 2008-07-03 6:56 UTC (permalink / raw)
To: Ingo Molnar, Jens Axboe; +Cc: linux-next, Heiko Carstens, David Miller
[-- Attachment #1: Type: text/plain, Size: 617 bytes --]
Hi Ingo, Jens,
Today's linux-next merge of the generic-ipi tree got conflicts in
net/iucv/iucv.c between commit 7b9d1b22a382aa221018c19880ee22c44467feec
("iucv: prevent cpu hotplug when walking cpu_online_map") from the net
tree and commits 8691e5a8f691cc2a4fda0651e8d307aaba0e7d68
("smp_call_function: get rid of the unused nonatomic/retry argument") and
15c8b6c1aaaf1c4edd67e2f02e4d8e1bd1a51c0d ("on_each_cpu(): kill unused
'retry' parameter") from the generic-ipi tree.
Just context conflicts.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread* linux-next: manual merge of the generic-ipi tree
@ 2008-07-03 6:44 Stephen Rothwell
0 siblings, 0 replies; 12+ messages in thread
From: Stephen Rothwell @ 2008-07-03 6:44 UTC (permalink / raw)
To: Ingo Molnar, Jens Axboe; +Cc: linux-next, Vegard Nossum, Pekka Enberg
[-- Attachment #1: Type: text/plain, Size: 489 bytes --]
Hi Ingo, Jens,
Today's linux-next merge of the generic-ipi tree got a conflict in
init/main.c between commit 385e31b9eae0528bada07d16a189f3f40df23961
("kmemcheck: add the kmemcheck core") from the kmemcheck tree and commit
3d4422332711ef48ef0f132f1fcbfcbd56c7f3d1 ("Add generic helpers for arch
IPI function calls") from the generic-ipi tree.
Just overlapping additions.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread* linux-next: manual merge of the generic-ipi tree
@ 2008-07-03 6:40 Stephen Rothwell
0 siblings, 0 replies; 12+ messages in thread
From: Stephen Rothwell @ 2008-07-03 6:40 UTC (permalink / raw)
To: Ingo Molnar, Jens Axboe
Cc: linux-next, Paul Mackerras, Benjamin Herrenschmidt
[-- Attachment #1: Type: text/plain, Size: 554 bytes --]
Hi Ingo, Jens,
Today's linux-next merge of the generic-ipi tree got a conflict in
arch/powerpc/mm/slice.c between commit
3a8247cc2c856930f34eafce33f6a039227ee175 ("powerpc: Only demote
individual slices rather than whole process") from the powerpc tree and
commit 15c8b6c1aaaf1c4edd67e2f02e4d8e1bd1a51c0d ("on_each_cpu(): kill
unused 'retry' parameter") from the generic-ipi tree.
The former removes the code that the latter modifies.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2008-07-16 13:14 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-07-16 9:45 linux-next: manual merge of the generic-ipi tree Stephen Rothwell
2008-07-16 10:19 ` Ingo Molnar
2008-07-16 10:25 ` Stephen Rothwell
2008-07-16 10:40 ` Ingo Molnar
2008-07-16 10:56 ` Stephen Rothwell
2008-07-16 11:44 ` Ingo Molnar
2008-07-16 11:14 ` Ingo Molnar
2008-07-16 13:14 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2008-07-07 16:46 Stephen Rothwell
2008-07-03 6:56 Stephen Rothwell
2008-07-03 6:44 Stephen Rothwell
2008-07-03 6:40 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox