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

[Stephen Rothwell]

Hi all,

On Fri, 6 Jan 2023 12:59:15 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> 
> Today's linux-next merge of the mm tree got a conflict in:
> 
>   Documentation/admin-guide/cgroup-v1/memory.rst
> 
> between commit:
> 
>   da3ad2e14f63 ("docs: cgroup-v1: add internal cross-references")
> 
> from the cgroup tree and commits:
> 
>   6cd7ad27c60f ("mm: memcontrol: deprecate charge moving")
>   9bf9f4ba8bd5 ("mm-memcontrol-deprecate-charge-moving-fix")

These have been combined into commit

  da34a8484d16 ("mm: memcontrol: deprecate charge moving")

in the mm-stable tree.

-- 
Cheers,
Stephen Rothwell

Attachment: pgp_6_wJmujua.pgp
Description: OpenPGP digital signature