On 1/1/2024 4:52 PM, Stephen Rothwell wrote:
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.
Thanks Stephen. Your fixup is correct. -Jeff