Messages in this thread | | | Date | Tue, 01 Dec 2009 08:46:03 +0200 | From | Pekka Enberg <> | Subject | Re: linux-next: manual merge of the percpu tree with the slab tree |
| |
Stephen Rothwell kirjoitti: > Hi all, > > Today's linux-next merge of the percpu tree got a conflict in mm/slab.c > between commit ce79ddc8e2376a9a93c7d42daf89bfcbb9187e62 ("SLAB: Fix > lockdep annotations for CPU hotplug") from the slab tree and commit > 1871e52c76dd95895caeb772f845a1718dcbcd75 ("percpu: make percpu symbols > under kernel/ and mm/ unique") from the percpu tree. > > Just context changes. I fixed it up (see below) and can carry the fix as > necessary.
The fixup looks good to me. Thanks, Stephen!
Pekka
| |