Re: linux-next: duplicate patches in the slab tree

[Stephen Rothwell]

Hi Vlastimil,

On Mon, 9 Sep 2024 10:32:06 +0200 Vlastimil Babka <vbabka@xxxxxxx> wrote:
>
> I'm confused how did that help if slab tree didn't change since 20240906 and
> the commit ids meanwhile changed on the vfs side?

$ git grep slab next-20240906:Next/SHA1snext-20240906:Next/SHA1s:slab           2e0abb33823cd3885e6d9118fccf2a027db9b490
$ git diff --stat 2e0abb33823cd3885e6d9118fccf2a027db9b490...slab/slab/for-next 
warning: 2e0abb33823cd3885e6d9118fccf2a027db9b490...slab/slab/for-next: multiple merge bases, using e02147cb703412fa13dd31908c734d7fb2314f55
 drivers/net/tun.c               |   6 +
 drivers/tty/tty_io.c            |   6 +
 fs/fcntl.c                      | 166 +++++++++++++++++-----
 fs/file_table.c                 |  14 +-
 fs/internal.h                   |   1 +
 fs/locks.c                      |   6 +-
 fs/notify/dnotify/dnotify.c     |   6 +-
 include/linux/fs.h              | 102 ++++++++------
 include/linux/kasan.h           |  65 ++++++++-
 include/linux/rcutiny.h         |   5 +
 include/linux/rcutree.h         |   1 +
 include/linux/slab.h            | 163 +++++++++++++++++++---
 io_uring/io_uring.c             |  14 +-
 kernel/rcu/tree.c               | 109 +++++++++++++--
 lib/slub_kunit.c                |  31 +++++
 mm/Kconfig.debug                |  32 +++++
 mm/kasan/common.c               |  64 +++++----
 mm/kasan/kasan_test.c           |  46 +++++++
 mm/slab.h                       |  11 +-
 mm/slab_common.c                | 260 ++++++++++++----------------------
 mm/slub.c                       | 299 ++++++++++++++++++++++++++++------------
 net/core/sock.c                 |   2 +-
 net/ipv4/inet_connection_sock.c |   5 +-
 security/selinux/hooks.c        |   2 +-
 security/smack/smack_lsm.c      |   2 +-
 25 files changed, 1005 insertions(+), 413 deletions(-)
$ git log --oneline 2e0abb33823cd3885e6d9118fccf2a027db9b490..slab/slab/for-next 
66dcd51a4503 (slab/slab/for-next) Merge branch 'slab/for-6.12/kmem_cache_args' into slab/for-next
fa9057f66dc8 Merge branch 'slab/for-6.12/rcu_barriers' into slab/for-next
8f88d16ae7c4 io_uring: port to struct kmem_cache_args
0745de59907f slab: make __kmem_cache_create() static inline
c97f071a3e39 slab: make kmem_cache_create_usercopy() static inline
6d5110520e00 slab: remove kmem_cache_create_rcu()
212a84da3190 file: port to struct kmem_cache_args
272d25721a77 slab: create kmem_cache_create() compatibility layer
7b8e2fe0c4b3 slab: port KMEM_CACHE_USERCOPY() to struct kmem_cache_args
1f4fcd6cfa1c slab: port KMEM_CACHE() to struct kmem_cache_args
dda9e30e63eb slab: remove rcu_freeptr_offset from struct kmem_cache
45bbb06b3ace slab: pass struct kmem_cache_args to do_kmem_cache_create()
d2ac7d61ed73 slab: pull kmem_cache_open() into do_kmem_cache_create()
2b7491007d1f slab: pass struct kmem_cache_args to create_cache()
be9b2ec72e53 slab: port kmem_cache_create_usercopy() to struct kmem_cache_args
f6ee8439fdad slab: port kmem_cache_create_rcu() to struct kmem_cache_args
e8ccc4307bb0 slab: port kmem_cache_create() to struct kmem_cache_args
95c65689ce1f slab: add struct kmem_cache_args
2a51e14ca2cc memcg: add charging of already allocated slab objects
432e6080ec7d slab: s/__kmem_cache_create/do_kmem_cache_create/g
01cc2238ba4a Merge branch 'vfs.file' of gitolite.kernel.org:pub/scm/linux/kernel/git/vfs/vfs into slab/for-6.12/kmem_cache_args
0f389adb4b80 mm: Removed @freeptr_offset to prevent doc warning
dfdc8d2565e8 Merge patch series "fs,mm: add kmem_cache_create_rcu()"
ea566e18b4de fs: use kmem_cache_create_rcu()
d345bd2e9834 mm: add kmem_cache_create_rcu()
e446f18e98e8 mm: remove unused argument from create_cache()
c0390d541128 fs: pack struct file

-- 
Cheers,
Stephen Rothwell

Attachment: pgp6N2hA1nn5F.pgp
Description: OpenPGP digital signature