From: Andrew Morton <akpm@linux-foundation•org>
To: "Michal Koutný" <mkoutny@suse•com>
Cc: Stephen Rothwell <sfr@canb•auug.org.au>,
Tejun Heo <tj@kernel•org>,
Domenico Cerasuolo <cerasuolodomenico@gmail•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: Re: linux-next: manual merge of the cgroup tree with the mm tree
Date: Tue, 11 Jul 2023 10:03:46 -0700 [thread overview]
Message-ID: <20230711100346.0805ead2e7e65be56ce2911c@linux-foundation.org> (raw)
In-Reply-To: <xn7nv52qio4aq2ioquuglnfoe6hn2l7newjf53enyxxthy6opd@ztktowlsjub3>
On Tue, 11 Jul 2023 14:41:18 +0200 Michal Koutný <mkoutny@suse•com> wrote:
> Hello.
>
> On Tue, Jul 11, 2023 at 11:07:34AM +1000, Stephen Rothwell <sfr@canb•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 :(
next prev parent reply other threads:[~2023-07-11 17:03 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-11 1:07 linux-next: manual merge of the cgroup tree with the mm tree Stephen Rothwell
2023-07-11 12:41 ` Michal Koutný
2023-07-11 17:03 ` Andrew Morton [this message]
2023-07-12 12:35 ` Michal Koutný
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230711100346.0805ead2e7e65be56ce2911c@linux-foundation.org \
--to=akpm@linux-foundation$(echo .)org \
--cc=cerasuolodomenico@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mkoutny@suse$(echo .)com \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=tj@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox