On Sun, 19 May 2024 08:32:44 -0700 Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxx> wrote: > On Fri, 17 May 2024 at 19:22, Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> wrote: > > > > include/linux/slab.h > > https://lkml.kernel.org/r/20240429114302.7af809e8@xxxxxxxxxxxxxxxx > > This is not only a merge conflict, your tree is actively buggy. > > You have introduced changes like this: > > -static inline __alloc_size(1, 2) void *kvcalloc(size_t n, size_t > size, gfp_t flags) > -{ > - return kvmalloc_array(n, size, flags | __GFP_ZERO); > -} > +#define kvcalloc(_n, _size, _flags) kvmalloc_array(_n, _size, > _flags|__GFP_ZERO) > > and that's just completely wrong. Note the "_flags|__GFP_ZERO": yes, > the bitwise or is fairly low down in the operator precedence rules, > and it probably work sin practice because most cases will just pass in > a simple expression for the flags, but it's still *horribly* wrong. > > I'm going to take this pull and fix up the cases I find, but I'm not > happy with this kind of trivial C preprocessor misuse. Thanks, I've asked Suren and Kent to check it all over. > I also note that you have *SEVEN* pointless merges that have no > explanation for them. I'm happy that you use git, but that means that > you also need to either > > (a) not do merges at all and treat it as a patch queue > > (b) do merges _properly_ and not throw them around like some madman > > And doing them properly means not only writing good commit messages, > but actually having good reasons for them. As it is, we have > > 5d1bc760583f ("merge mm-hotfixes-stable into mm-nonmm-stable to pick > up needed changes") > 640958fde130 ("Merge branch 'master' into mm-stable") > 4e2e36129225 ("Merge branch 'master' into mm-stable") > 1dd4505cf4c8 ("Merge branch 'master' into mm-stable") > 71919308943d ("Merge branch 'master' into mm-stable") > b228ab57e51b ("Merge branch 'master' into mm-stable") > 5e2806112864 ("Merge branch 'master' into mm-stable") This is me advancing the master branch once per week until we hit -rc4. I don't understand why these merges were visible to this pull. I sent: : The following changes since commit 5d1bc760583f225032f91bd88853f4c26acaf4e0: : : merge mm-hotfixes-stable into mm-nonmm-stable to pick up needed changes (2024-04-25 20:54:12 -0700) : : are available in the Git repository at: : : git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm tags/mm-stable-2024-05-17-19-19 : : for you to fetch changes up to 76edc534cc289308130272a2ac28694fc9b72a03: : : memcg, oom: cleanup unused memcg_oom_gfp_mask and memcg_oom_order (2024-05-11 15:41:37 -0700) : This has worked OK before,
