diff mbox series

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

Message ID 20230711110734.7009339b@canb.auug.org.au
State New
Headers
Series linux-next: manual merge of the cgroup tree with the mm tree |

Commit Message

Stephen Rothwell July 11, 2023, 1:07 a.m. UTC 
  Hi all,

Today's linux-next merge of the cgroup tree got conflicts in:

  tools/testing/selftests/cgroup/.gitignore
  tools/testing/selftests/cgroup/Makefile

between commit:

  479a748978d2 ("selftests: cgroup: add test_zswap program")

from the mm tree and commit:

  cd3c6f682df4 ("selftests: cgroup: Add cpuset migrations testcase")

from the cgroup tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

Comments

Michal Koutný July 11, 2023, 12:41 p.m. UTC | #1 
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
Andrew Morton July 11, 2023, 5:03 p.m. UTC | #2 
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 :(
Michal Koutný July 12, 2023, 12:35 p.m. UTC | #3 
On Tue, Jul 11, 2023 at 10:03:46AM -0700, Andrew Morton <akpm@linux-foundation.org> wrote:
> I think so.  People tend to put new entries at the end of lists, which
> is the ideal way to cause patch collisions :(

OK, next time when someone adds a new test, let's ask for re-sorting
too.
(I missed it with cd3c6f682df4 ("selftests: cgroup: Add cpuset
migrations testcase").)

Regards,
Michal
diff mbox series

Patch

diff --cc tools/testing/selftests/cgroup/.gitignore
index 4d556df4f77b,8443a8d46a1c..000000000000
--- a/tools/testing/selftests/cgroup/.gitignore
diff --cc tools/testing/selftests/cgroup/Makefile
index 27dbdd7bb4bb,dee0f013c7f4..000000000000
--- a/tools/testing/selftests/cgroup/Makefile