Received-SPF: pass (google.com: domain of linux-kernel+bounces-14007-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1;
Date: Tue, 2 Jan 2024 15:02:24 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Vlastimil Babka <vbabka@suse.cz>, Andrew Morton
 <akpm@linux-foundation.org>
Cc: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.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 mm tree
Message-ID: <20240102150224.3c091932@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/nzPrdCZFY8XSgWxki9yE8uE";
 protocol="application/pgp-signature"; micalg=pgp-sha256

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

Hi all,

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

  include/linux/slab.h

between commit:

  78f5d33f3dd4 ("mm, treewide: rename MAX_ORDER to MAX_PAGE_ORDER")

from the mm tree and commit:

  a9e0b9f27266 ("mm/slab: remove CONFIG_SLAB code from slab common code")

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.

--=20
Cheers,
Stephen Rothwell

diff --cc include/linux/slab.h
index d63823e518c0,b2015d0e01ad..000000000000
--- a/include/linux/slab.h
+++ b/include/linux/slab.h
@@@ -308,19 -307,10 +307,10 @@@ static inline unsigned int arch_slab_mi
   * (PAGE_SIZE*2).  Larger requests are passed to the page allocator.
   */
  #define KMALLOC_SHIFT_HIGH	(PAGE_SHIFT + 1)
 -#define KMALLOC_SHIFT_MAX	(MAX_ORDER + PAGE_SHIFT)
 +#define KMALLOC_SHIFT_MAX	(MAX_PAGE_ORDER + PAGE_SHIFT)
  #ifndef KMALLOC_SHIFT_LOW
- #define KMALLOC_SHIFT_LOW	5
- #endif
- #endif
-=20
- #ifdef CONFIG_SLUB
- #define KMALLOC_SHIFT_HIGH	(PAGE_SHIFT + 1)
- #define KMALLOC_SHIFT_MAX	(MAX_PAGE_ORDER + PAGE_SHIFT)
- #ifndef KMALLOC_SHIFT_LOW
  #define KMALLOC_SHIFT_LOW	3
  #endif
- #endif
 =20
  /* Maximum allocatable size */
  #define KMALLOC_MAX_SIZE	(1UL << KMALLOC_SHIFT_MAX)

--Sig_/nzPrdCZFY8XSgWxki9yE8uE
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmWTitAACgkQAVBC80lX
0GwStgf+IZvl+B5gAHUm5EuVoEqe2vrUIpYgnxG4oHklgrz9R6qfuOaemRECfELl
7SoHqHWwGsSJniLptwX0jsUTnJH9X9tfb7ML8pO998JwbLc9f8Fm4lpowsMapNmP
jGRqTtnnbgQg3YddlyjWuIdES0OeGJkexz1g5hnocZBhlicitFWq8MmMT2upAxCn
9Qmrdcv4kkkKn5IgMRYsLnkFRnI3Kd7zXhjvRlEb3A4m87jXXZ5BLqUxZaK1S8ec
SQz06sZVhAhDVp1rTxt33+jAkHugk4CTplIBJd4T/eRAJMzaAt2Z9sbXiOAPHBhC
d6oirYA1Uh9Ki9C75EkMHDlVQHMQHg==
=3U+4
-----END PGP SIGNATURE-----

--Sig_/nzPrdCZFY8XSgWxki9yE8uE--