Messages in this thread | | | Date | Mon, 4 Feb 2008 14:30:53 -0800 | From | Andrew Morton <> | Subject | Re: [git pull] SLUB updates for 2.6.25 |
| |
On Mon, 4 Feb 2008 14:28:45 -0800 Andrew Morton <akpm@linux-foundation.org> wrote:
> > root (1): > > SLUB: Do not upset lockdep > > > > err, what? I though I was going to merge these: > > slub-move-count_partial.patch > slub-rename-numa-defrag_ratio-to-remote_node_defrag_ratio.patch > slub-consolidate-add_partial-and-add_partial_tail-to-one-function.patch > slub-use-non-atomic-bit-unlock.patch > slub-fix-coding-style-violations.patch > slub-noinline-some-functions-to-avoid-them-being-folded-into-alloc-free.patch > slub-move-kmem_cache_node-determination-into-add_full-and-add_partial.patch > slub-avoid-checking-for-a-valid-object-before-zeroing-on-the-fast-path.patch > slub-__slab_alloc-exit-path-consolidation.patch > slub-provide-unique-end-marker-for-each-slab.patch > slub-avoid-referencing-kmem_cache-structure-in-__slab_alloc.patch > slub-optional-fast-path-using-cmpxchg_local.patch > slub-do-our-own-locking-via-slab_lock-and-slab_unlock.patch > slub-restructure-slab-alloc.patch > slub-comment-kmem_cache_cpu-structure.patch > slub-fix-sysfs-refcounting.patch > > before you went and changed things under my feet.
erk, sorry, I misremembered. I was about to merge all the patches we weren't going to merge. oops.
Linus, please proceed with this merge.
| |