* linux-next: manual merge of the cgroup tree with the mm tree
@ 2023-07-11 1:07 Stephen Rothwell
2023-07-11 12:41 ` Michal Koutný
0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2023-07-11 1:07 UTC (permalink / raw)
To: Tejun Heo, Andrew Morton
Cc: Domenico Cerasuolo, Linux Kernel Mailing List,
Linux Next Mailing List, Michal Koutný
[-- 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 --]
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: linux-next: manual merge of the cgroup tree with the mm tree
2023-07-11 1:07 linux-next: manual merge of the cgroup tree with the mm tree Stephen Rothwell
@ 2023-07-11 12:41 ` Michal Koutný
2023-07-11 17:03 ` Andrew Morton
0 siblings, 1 reply; 4+ messages in thread
From: Michal Koutný @ 2023-07-11 12:41 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Tejun Heo, Andrew Morton, Domenico Cerasuolo,
Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 366 bytes --]
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
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: linux-next: manual merge of the cgroup tree with the mm tree
2023-07-11 12:41 ` Michal Koutný
@ 2023-07-11 17:03 ` Andrew Morton
2023-07-12 12:35 ` Michal Koutný
0 siblings, 1 reply; 4+ messages in thread
From: Andrew Morton @ 2023-07-11 17:03 UTC (permalink / raw)
To: Michal Koutný
Cc: Stephen Rothwell, Tejun Heo, Domenico Cerasuolo,
Linux Kernel Mailing List, Linux Next Mailing List
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 :(
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: linux-next: manual merge of the cgroup tree with the mm tree
2023-07-11 17:03 ` Andrew Morton
@ 2023-07-12 12:35 ` Michal Koutný
0 siblings, 0 replies; 4+ messages in thread
From: Michal Koutný @ 2023-07-12 12:35 UTC (permalink / raw)
To: Andrew Morton
Cc: Stephen Rothwell, Tejun Heo, Domenico Cerasuolo,
Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 392 bytes --]
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
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-07-12 12:36 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-07-11 1:07 linux-next: manual merge of the cgroup tree with the mm tree Stephen Rothwell
2023-07-11 12:41 ` Michal Koutný
2023-07-11 17:03 ` Andrew Morton
2023-07-12 12:35 ` Michal Koutný
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox