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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20230119155809.33625b3a@canb.auug.org.au>
Date:   Thu, 19 Jan 2023 15:58:09 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Andrew Morton <akpm@...ux-foundation.org>,
        Tejun Heo <tj@...nel.org>
Cc:     Bagas Sanjaya <bagasdotme@...il.com>,
        Johannes Weiner <hannes@...xchg.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: 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@...b.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

Content of type "application/pgp-signature" skipped