[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <xn7nv52qio4aq2ioquuglnfoe6hn2l7newjf53enyxxthy6opd@ztktowlsjub3>
Date: Tue, 11 Jul 2023 14:41:18 +0200
From: Michal Koutný <mkoutny@...e.com>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Tejun Heo <tj@...nel.org>,
Andrew Morton <akpm@...ux-foundation.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
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.)
Thanks,
Michal
Download attachment "signature.asc" of type "application/pgp-signature" (229 bytes)
Powered by blists - more mailing lists