On Sat, 15 Mar 2025 10:49:21 -0700 Shakeel Butt <shakeel.butt@xxxxxxxxx> wrote: > > This is a cleanup series which is trying to simplify the memcg per-cpu > stock code, particularly it tries to remove unnecessary dependencies on > local_lock of per-cpu memcg stock. The eight patch from Vlastimil > optimizes the charge path by combining the charging and accounting. > > This series is based on next-20250314 plus two following patches: > > Link: https://lore.kernel.org/all/20250312222552.3284173-1-shakeel.butt@xxxxxxxxx/ > Link: https://lore.kernel.org/all/20250313054812.2185900-1-shakeel.butt@xxxxxxxxx/ Unfortunately the bpf tree has been making changes in the same area of memcontrol.c. 01d37228d331 ("memcg: Use trylock to access memcg stock_lock.") Sigh. We're at -rc7 and I don't think it's worth working around that for a cleanup series. So I'm inclined to just defer this series until the next -rc cycle. If BPF merges reasonably early in the next merge window then please promptly send this along and I should be able to squeak it into 6.15-rc1.
