Re: linux-next: manual merge of the drm tree with the mm tree

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:

linux-next: manual merge of the drm tree with the mm tree

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 d