lkml.org 
[lkml]   [2023]   [Jan]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the mm tree with the cgroup tree
Hi all,

On Fri, 6 Jan 2023 12:59:15 +1100 Stephen Rothwell <sfr@canb.auug.org.au> 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
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2023-03-26 23:47    [W:0.044 / U:0.212 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site