Message ID | 20240102105223.7634699d@canb.auug.org.au (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | linux-next: manual merge of the drm tree with the mm tree | expand |
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
diff --cc drivers/accel/qaic/qaic_data.c index 24e886f857d5,cf2898eda7ae..000000000000 --- a/drivers/accel/qaic/qaic_data.c