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

2023-04-19 Thread Daniel Vetter
On Wed, Apr 19, 2023 at 09:30:11AM -0700, Nathan Chancellor wrote: > On Wed, Apr 19, 2023 at 06:24:37PM +0200, Daniel Vetter wrote: > > On Tue, Apr 18, 2023 at 07:34:44PM +0100, Mark Brown wrote: > > > On Sun, Apr 16, 2023 at 09:58:50AM +0200, Daniel Vetter wrote: > > > > > > > Note there was a pp

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

2023-04-19 Thread Nathan Chancellor
On Wed, Apr 19, 2023 at 06:24:37PM +0200, Daniel Vetter wrote: > On Tue, Apr 18, 2023 at 07:34:44PM +0100, Mark Brown wrote: > > On Sun, Apr 16, 2023 at 09:58:50AM +0200, Daniel Vetter wrote: > > > > > Note there was a ppc compile fail, which is why we pushed the ttm revert. > > > That /should/ be

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

2023-04-19 Thread Daniel Vetter
On Tue, Apr 18, 2023 at 07:34:44PM +0100, Mark Brown wrote: > On Sun, Apr 16, 2023 at 09:58:50AM +0200, Daniel Vetter wrote: > > > Note there was a ppc compile fail, which is why we pushed the ttm revert. > > That /should/ be fixed now, but would be good if you can confirm? > > According to Natha

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

2023-04-18 Thread Mark Brown
On Sun, Apr 16, 2023 at 09:58:50AM +0200, Daniel Vetter wrote: > Note there was a ppc compile fail, which is why we pushed the ttm revert. > That /should/ be fixed now, but would be good if you can confirm? According to Nathan (CCed) there's still issues with the interaction with the PowerPC tree

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

2023-04-17 Thread Mark Brown
On Sun, Apr 16, 2023 at 09:58:50AM +0200, Daniel Vetter wrote: > Note there was a ppc compile fail, which is why we pushed the ttm revert. > That /should/ be fixed now, but would be good if you can confirm? I don't have any PowerPC toolchains set up - I guess one of the community builders might h

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

2023-04-16 Thread Daniel Vetter
On Fri, Apr 14, 2023 at 01:59:12PM +0100, broo...@kernel.org wrote: > Hi all, > > Today's linux-next merge of the drm-misc tree got a conflict in: > > drivers/gpu/drm/ttm/ttm_pool.c > > between commit: > > 23baf831a32c0 ("mm, treewide: redefine MAX_ORDER sanely") > > from the mm-stable tre

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

2023-04-14 Thread broonie
Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/ttm/ttm_pool.c between commit: 23baf831a32c0 ("mm, treewide: redefine MAX_ORDER sanely") from the mm-stable tree and commit: 56e51681246e5 ("drm/ttm: revert "Reduce the number of used allocation ord