From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Vlastimil Babka <vbabka@suse•cz>, Dennis Zhou <dennis@kernel•org>,
Tejun Heo <tj@kernel•org>,
Christoph Lameter <cl@linux-foundation•org>,
Ingo Molnar <mingo@redhat•com>
Cc: Baoquan He <bhe@redhat•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: manual merge of the slab tree with the percpu tree
Date: Tue, 22 Nov 2022 16:36:34 +1100 [thread overview]
Message-ID: <20221122163634.3b21cf71@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1633 bytes --]
Hi all,
Today's linux-next merge of the slab tree got a conflict in:
include/linux/percpu.h
between commit:
d667c94962c1 ("mm/percpu: remove unused PERCPU_DYNAMIC_EARLY_SLOTS")
from the percpu tree and commit:
e8753e416c7e ("percpu: adjust the value of PERCPU_DYNAMIC_EARLY_SIZE")
from the slab 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 include/linux/percpu.h
index 70bc17db00a6,3dbb6fb70658..000000000000
--- a/include/linux/percpu.h
+++ b/include/linux/percpu.h
@@@ -37,11 -37,12 +37,11 @@@
/*
* Percpu allocator can serve percpu allocations before slab is
* initialized which allows slab to depend on the percpu allocator.
- * The following two parameters decide how much resource to
- * preallocate for this. Keep PERCPU_DYNAMIC_RESERVE equal to or
- * larger than PERCPU_DYNAMIC_EARLY_SIZE.
+ * The following parameter decide how much resource to preallocate
+ * for this. Keep PERCPU_DYNAMIC_RESERVE equal to or larger than
+ * PERCPU_DYNAMIC_EARLY_SIZE.
*/
- #define PERCPU_DYNAMIC_EARLY_SIZE (12 << 10)
-#define PERCPU_DYNAMIC_EARLY_SLOTS 128
+ #define PERCPU_DYNAMIC_EARLY_SIZE (20 << 10)
/*
* PERCPU_DYNAMIC_RESERVE indicates the amount of free area to piggy
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
reply other threads:[~2022-11-22 5:36 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=20221122163634.3b21cf71@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=bhe@redhat$(echo .)com \
--cc=cl@linux-foundation$(echo .)org \
--cc=dennis@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@redhat$(echo .)com \
--cc=tj@kernel$(echo .)org \
--cc=vbabka@suse$(echo .)cz \
/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