[prev in list] [next in list] [prev in thread] [next in thread] 

List:       linux-next
Subject:    linux-next: manual merge of the slab tree with the mm tree
From:       Stephen Rothwell <sfr () canb ! auug ! org ! au>
Date:       2023-12-21 6:34:12
Message-ID: 20231221173412.24b78407 () canb ! auug ! org ! au
[Download RAW message or body]


Hi all,

Today's linux-next merge of the slab tree got a conflict in:

  mm/slab.c

between commit:

  3ef36a834801 ("kasan: rename and document kasan_(un)poison_object_data")

from the mm tree and commit:

  16a1d968358a ("mm/slab: remove mm/slab.c and slab_def.h")

from the slab tree.

I fixed it up (I just removed the file) and can carry the fix as
necessary. This is now fixed as far as linux-next is concerned, but any
non trivial conflicts should be mentioned to your upstream maintainer
when your tree is submitted for merging.  You may also want to consider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.

--=20
Cheers,
Stephen Rothwell

[Attachment #3 (application/pgp-signature)]

[prev in list] [next in list] [prev in thread] [next in thread]