Re: linux-next: manual merge of the slab tree with the mm tree

[Yosry Ahmed]

On Tue, Apr 4, 2023 at 9:08 PM Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> Hi all,
>
> Today's linux-next merge of the slab tree got a conflict in:
>
>   mm/slob.c
>
> between commit:
>
>   3fb083757df1 ("mm: vmscan: refactor updating reclaimed pages in reclaim_state")
>
> from the mm tree and commit:
>
>   6630e950d532 ("mm/slob: remove slob.c")
>
> 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

Sounds good to me, thanks! Let me know if anything else needs to be done here.


> 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.


>
> --
> Cheers,
> Stephen Rothwell