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 Koutný" <mkoutny@suse•com>
Subject: linux-next: manual merge of the cgroup tree with the mm tree
Date: Tue, 11 Jul 2023 11:07:34 +1000 [thread overview]
Message-ID: <20230711110734.7009339b@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1855 bytes --]
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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2023-07-11 1:07 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-11 1:07 Stephen Rothwell [this message]
2023-07-11 12:41 ` linux-next: manual merge of the cgroup tree with the mm tree Michal Koutný
2023-07-11 17:03 ` Andrew Morton
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=20230711110734.7009339b@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=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=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