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 11:07:34 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Tejun Heo <tj@kernel.org>,
        Andrew Morton <akpm@linux-foundation.org>
Cc:     Domenico Cerasuolo <cerasuolodomenico@gmail.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Michal =?UTF-8?B?S291dG7DvQ==?= <mkoutny@suse.com>
Subject: linux-next: manual merge of the cgroup tree with the mm tree
Message-ID: <20230711110734.7009339b@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/OdjcXm3YrOaxU=NDyxRACBr";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/OdjcXm3YrOaxU=NDyxRACBr
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

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.

--=20
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 +=3D test_cor
  TEST_GEN_PROGS +=3D test_freezer
  TEST_GEN_PROGS +=3D test_kill
  TEST_GEN_PROGS +=3D test_cpu
+ TEST_GEN_PROGS +=3D test_cpuset
 +TEST_GEN_PROGS +=3D test_zswap
 =20
  LOCAL_HDRS +=3D $(selfdir)/clone3/clone3_selftests.h $(selfdir)/pidfd/pid=
fd.h
 =20
@@@ -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

--Sig_/OdjcXm3YrOaxU=NDyxRACBr
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmSsq1YACgkQAVBC80lX
0GyS3Af+IRyDtLhR07zFX/qV3NddyMqWJQVnLbBIUXF0P3lkNurEvErQLgNkx08R
YQnMPhhBSpTPn3ipZ15BCObQcyDpmMUTm2C+WXkuAeUTcqMh3MOCmBrn4nza4QmU
Kgj1bqu2LiflxaXxTmlX4h1t47NYHaJM1yiO+OQfsgx/323xIA/Mo1zBYEFQK3Td
SxWHLF860QpM/dNSwji57lPpZLcoxNbfs6NX5qctkdokVsDv27g3qcFmRc2FdCKt
e4VM23EmRYBUjvX20o81yF5igsfNmbDeULaB9Mv4Gv+YqateAE2NQTHYNFokqVPL
D5NAXqTQOH4C8tmcXHNmJThrt34g+g==
=fAxk
-----END PGP SIGNATURE-----

--Sig_/OdjcXm3YrOaxU=NDyxRACBr--