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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <ZDuqut+8BKjMXblJ@phenom.ffwll.local>
Date:   Sun, 16 Apr 2023 09:58:50 +0200
From:   Daniel Vetter <daniel@...ll.ch>
To:     broonie@...nel.org
Cc:     Daniel Vetter <daniel.vetter@...ll.ch>,
        Intel Graphics <intel-gfx@...ts.freedesktop.org>,
        DRI <dri-devel@...ts.freedesktop.org>,
        Andrew Morton <akpm@...ux-foundation.org>,
        Christian König <christian.koenig@....com>,
        "Kirill A . Shutemov" <kirill.shutemov@...ux.intel.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the drm-misc tree with the mm-stable
 tree

On Fri, Apr 14, 2023 at 01:59:12PM +0100, broonie@...nel.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 tree and commit:
> 
>   56e51681246e5 ("drm/ttm: revert "Reduce the number of used allocation orders for TTM pages"")
> 
> from the drm-misc 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.
> 
> 
> diff --cc drivers/gpu/drm/ttm/ttm_pool.c
> index 4db3982057be8,dfce896c4baeb..0000000000000
> --- a/drivers/gpu/drm/ttm/ttm_pool.c
> +++ b/drivers/gpu/drm/ttm/ttm_pool.c
> 
> [Just the version in mm]

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?

Thanks, Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch