linux-kernel - Re: linux-next: manual merge of the cgroup tree with the mm 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 for Android: free password hash cracker in your pocket

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

Message-Id: <20230711100346.0805ead2e7e65be56ce2911c@linux-foundation.org>
Date:   Tue, 11 Jul 2023 10:03:46 -0700
From:   Andrew Morton <akpm@...ux-foundation.org>
To:     Michal Koutný <mkoutny@...e.com>
Cc:     Stephen Rothwell <sfr@...b.auug.org.au>, Tejun Heo <tj@...nel.org>,
        Domenico Cerasuolo <cerasuolodomenico@...il.com>,
        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 cgroup tree with the mm tree

On Tue, 11 Jul 2023 14:41:18 +0200 Michal Koutný <mkoutny@...e.com> wrote:

> Hello.
> 
> On Tue, Jul 11, 2023 at 11:07:34AM +1000, Stephen Rothwell <sfr@...b.auug.org.au> wrote:
> > You may also want to consider cooperating with the maintainer of the
> > conflicting tree to minimise any particularly complex conflicts.
> 
> Would alphabetical sorting of entries be helpful? (Lower conflict
> probability than the single end for appending.)

I think so.  People tend to put new entries at the end of lists, which
is the ideal way to cause patch collisions :(