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

From: Stephen Rothwell <[email-masked]>
Date: Tue, 11 Jul 2023 11:07:34 +1000

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.

-- 
Cheers,
Stephen Rothwell

diff --cc tools/testing/selftests/cgroup/.gitignore
index 4d556df4f77b,8443a8d46a1c..000000000000
--- a/tools/testing/selftests/cgroup/.gitignore
+++ b/tools/testing/selftests/cgroup/.gitignore
@@@ -5,5 -5,5 +5,6 @@@ test_freeze
  test_kmem
  test_kill
  test_cpu
+ test_cpuset
 +test_zswap
  wait_inotify
diff --cc tools/testing/selftests/cgroup/Makefile
index 27dbdd7bb4bb,dee0f013c7f4..000000000000
--- a/tools/testing/selftests/cgroup/Makefile
+++ b/tools/testing/selftests/cgroup/Makefile
@@@ -12,7 -12,7 +12,8 @@@ TEST_GEN_PROGS += test_cor
  TEST_GEN_PROGS += test_freezer
  TEST_GEN_PROGS += test_kill
  TEST_GEN_PROGS += test_cpu
+ TEST_GEN_PROGS += test_cpuset
 +TEST_GEN_PROGS += test_zswap
  
  LOCAL_HDRS += $(selfdir)/clone3/clone3_selftests.h $(selfdir)/pidfd/pidfd.h
  
@@@ -24,4 -24,4 +25,5 @@@ $(OUTPUT)/test_core: cgroup_util.
  $(OUTPUT)/test_freezer: cgroup_util.c
  $(OUTPUT)/test_kill: cgroup_util.c
  $(OUTPUT)/test_cpu: cgroup_util.c
+ $(OUTPUT)/test_cpuset: cgroup_util.c
 +$(OUTPUT)/test_zswap: cgroup_util.c