Messages in this thread | | | Date | Wed, 11 Nov 2009 18:59:19 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the percpu tree with the tip tree |
| |
Hi all,
Today's linux-next merge of the percpu tree got a conflict in arch/powerpc/platforms/pseries/hvCall.S between commit c8cd093a6e9f96ea6b871576fd4e46d7c818bb89 ("powerpc: tracing: Add hypervisor call tracepoints") from the tip tree and commit dd17c8f72993f9461e9c19250e3f155d6d99df22 ("percpu: remove per_cpu__ prefix") from the percpu tree.
The former removed the code changed by the latter, so I just used the tip tree version. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |