Skip to content
Snippets Groups Projects
Commit 08afe22c authored by Pekka Enberg's avatar Pekka Enberg
Browse files

Merge branch 'slab/next' into slab/for-linus 


Fix up a trivial merge conflict with commit baaf1dd4 ("mm/slob: use
min_t() to compare ARCH_SLAB_MINALIGN") that did not go through the slab
tree.

Conflicts:
	mm/slob.c

Signed-off-by: default avatarPekka Enberg <penberg@kernel.org>
parents a304f836 45906855
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment