Received-SPF: pass (google.com: domain of linux-kernel+bounces-13959-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Date: Tue, 2 Jan 2024 10:52:23 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Dave Airlie <airlied@redhat.com>, Andrew Morton
 <akpm@linux-foundation.org>
Cc: DRI <dri-devel@lists.freedesktop.org>, Jeffrey Hugo
 <quic_jhugo@quicinc.com>, "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 drm tree with the mm tree
Message-ID: <20240102105223.7634699d@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/nj3n3oz8ER.n_Fp.+QqdXTS";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/nj3n3oz8ER.n_Fp.+QqdXTS
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

  drivers/accel/qaic/qaic_data.c

between commit:

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

from the mm tree and commit:

  47fbee5f27ed ("accel/qaic: Update MAX_ORDER use to be inclusive")

from the drm 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 drivers/accel/qaic/qaic_data.c
index 24e886f857d5,cf2898eda7ae..000000000000
--- a/drivers/accel/qaic/qaic_data.c
+++ b/drivers/accel/qaic/qaic_data.c
@@@ -451,7 -452,7 +452,7 @@@ static int create_sgt(struct qaic_devic
  		 * later
  		 */
  		buf_extra =3D (PAGE_SIZE - size % PAGE_SIZE) % PAGE_SIZE;
- 		max_order =3D min(MAX_PAGE_ORDER - 1, get_order(size));
 -		max_order =3D min(MAX_ORDER, get_order(size));
++		max_order =3D min(MAX_PAGE_ORDER, get_order(size));
  	} else {
  		/* allocate a single page for book keeping */
  		nr_pages =3D 1;

--Sig_/nj3n3oz8ER.n_Fp.+QqdXTS
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmWTUDcACgkQAVBC80lX
0GwR1Af+MZT5Ie1hMcp412OyeJLJP0VMgjSICZYZoyTVEuZm4DiYz+eWPvLkvOh8
rmdRatJrE/Y29xaFjIHtAiCv0ab4M+f50hkw3p/6aA4PHCUKf8+Zg5bRQqjAcXB+
O8TQ6K+ZrrLSgbkCSPuhJa1aiSXL3jlraM6MPBrkepIWeTw53aBS80BnRXO0kZh0
+5gwMvO2UqZ/9t/vEH0TYVrVmau1zAiRx+20miBvHlk8wlF0gStwWuhKrRxZkMqE
4gzZnQGqbpTEpyqlodNQO9AIhHH3vu/p5CYrrluEplEGsH54Cel091bvjXyoEALF
ETWtLZ+Ng6X289xTrivLUWqYUc3N9w==
=eTR6
-----END PGP SIGNATURE-----

--Sig_/nj3n3oz8ER.n_Fp.+QqdXTS--