Merge branch 'slab/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git (3af9960d) · Commits · CodeLinaro / la / kernel / msm · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

M

msm
- Activity
- Members
- Wiki
- Terraform modules

Snippets Groups Projects

3af9960d

Commit 3af9960d authored 2 weeks ago by Stephen Rothwell

Downloads
- Plain Diff

Merge branch 'slab/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git

# Conflicts:
#	kernel/rcu/tiny.c

parents d4165748 541702a6

No related branches found

No related tags found

No related merge requests found

Changes 14

Hide whitespace changes

Inline Side-by-side

Showing

include/linux/page-flags.h 10 additions, 8 deletions

include/linux/page-flags.h
include/linux/rcupdate.h 18 additions, 15 deletions

include/linux/rcupdate.h
include/linux/rcutiny.h 0 additions, 36 deletions

include/linux/rcutiny.h
include/linux/rcutree.h 0 additions, 3 deletions

include/linux/rcutree.h
include/linux/slab.h 14 additions, 2 deletions

include/linux/slab.h
include/trace/events/rcu.h 0 additions, 34 deletions

include/trace/events/rcu.h
kernel/rcu/tiny.c 0 additions, 25 deletions

kernel/rcu/tiny.c
kernel/rcu/tree.c 2 additions, 7 deletions

kernel/rcu/tree.c
lib/slub_kunit.c 59 additions, 0 deletions

lib/slub_kunit.c
mm/Kconfig 4 additions, 0 deletions

mm/Kconfig
mm/slab.h 7 additions, 27 deletions

mm/slab.h
mm/slab_common.c 29 additions, 15 deletions

mm/slab_common.c
mm/slub.c 287 additions, 49 deletions

mm/slub.c
mm/util.c 0 additions, 162 deletions

mm/util.c

with 430 additions and 383 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment