Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Tue, 11 Jul 2023 14:41:18 +0200
From:   Michal =?utf-8?Q?Koutn=C3=BD?= <mkoutny@suse.com>
To:     Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     Tejun Heo <tj@kernel.org>,
        Andrew Morton <akpm@linux-foundation.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
Message-ID: <xn7nv52qio4aq2ioquuglnfoe6hn2l7newjf53enyxxthy6opd@ztktowlsjub3>
References: <20230711110734.7009339b@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
        protocol="application/pgp-signature"; boundary="624tujepdzi6sdtb"
Content-Disposition: inline
In-Reply-To: <20230711110734.7009339b@canb.auug.org.au>
Precedence: bulk


--624tujepdzi6sdtb
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

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.)

Thanks,
Michal

--624tujepdzi6sdtb
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iHUEABYKAB0WIQQpEWyjXuwGT2dDBqAGvrMr/1gcjgUCZK1N7AAKCRAGvrMr/1gc
jlFLAP47B14jQYzwELF9vZsjK1/SuujT3qR3i4tFcnp++ipnfwEA3YlUsUVOpDCE
XGJK/eTUn8ReFUylhASijiS7lmmohAU=
=HX7y
-----END PGP SIGNATURE-----

--624tujepdzi6sdtb--