public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed

From: Mark Brown <broonie@kernel•org>
To: Tejun Heo <tj@kernel•org>
Cc: Andrew Morton <akpm@linux-foundation•org>,
	Hongfu Li <lihongfu@kylinos•cn>,
	Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
	Linux Next Mailing List <linux-next@vger•kernel.org>,
	Li Wang <li.wang@linux•dev>, Waiman Long <longman@redhat•com>
Subject: linux-next: manual merge of the cgroup tree with the mm-unstable tree
Date: Mon, 18 May 2026 17:10:45 +0100	[thread overview]
Message-ID: <ags6BawOir3IQHIZ@sirena.org.uk> (raw)

[-- Attachment #1: Type: text/plain, Size: 1580 bytes --]

Hi all,

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

  tools/testing/selftests/cgroup/test_memcontrol.c

between commit:

  186fdfd222a15 ("selftests/cgroup: rename PAGE_SIZE to BUF_SIZE in cgroup_util")

from the mm-unstable tree and commit:

  2a7d34eba5f5a ("selftests/cgroup: check malloc return value in alloc_anon functions")

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.

diff --cc tools/testing/selftests/cgroup/test_memcontrol.c
index 44338dbaee819,21aedb35cc122..0000000000000
--- a/tools/testing/selftests/cgroup/test_memcontrol.c
+++ b/tools/testing/selftests/cgroup/test_memcontrol.c
@@@ -61,10 -60,26 +61,26 @@@ static char *alloc_and_populate_anon(si
  	char *buf, *ptr;
  
  	buf = malloc(size);
+ 	if (buf == NULL) {
+ 		fprintf(stderr, "malloc() failed\n");
+ 		return NULL;
+ 	}
+ 
 -	for (ptr = buf; ptr < buf + size; ptr += PAGE_SIZE)
 +	for (ptr = buf; ptr < buf + size; ptr += page_size)
  		*ptr = 0;
  
+ 	return buf;
+ }
+ 
+ int alloc_anon(const char *cgroup, void *arg)
+ {
+ 	size_t size = (unsigned long)arg;
+ 	char *buf;
+ 
+ 	buf = alloc_and_populate_anon(size);
+ 	if (!buf)
+ 		return -1;
+ 
  	free(buf);
  	return 0;
  }

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

                 reply	other threads:[~2026-05-18 16:10 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=ags6BawOir3IQHIZ@sirena.org.uk \
    --to=broonie@kernel$(echo .)org \
    --cc=akpm@linux-foundation$(echo .)org \
    --cc=li.wang@linux$(echo .)dev \
    --cc=lihongfu@kylinos$(echo .)cn \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=longman@redhat$(echo .)com \
    --cc=tj@kernel$(echo .)org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox