linux-kernel - linux-next: manual merge of the drm 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>] [day] [month] [year] [list]

Message-ID: <20230411122432.1d2b3ccb@canb.auug.org.au>
Date:   Tue, 11 Apr 2023 12:24:32 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Dave Airlie <airlied@...hat.com>,
        Andrew Morton <akpm@...ux-foundation.org>
Cc:     DRI <dri-devel@...ts.freedesktop.org>,
        "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>,
        Thomas Hellström 
        <thomas.hellstrom@...ux.intel.com>
Subject: linux-next: manual merge of the drm tree with the mm-stable tree

Hi all,

Today's linux-next merge of the drm tree got a conflict in:

  drivers/gpu/drm/ttm/ttm_pool.c

between commit:

  23baf831a32c ("mm, treewide: redefine MAX_ORDER sanely")

from the mm-stable tree and commit:

  322458c2bb1a ("drm/ttm: Reduce the number of used allocation orders for TTM pages")

from the drm tree.

I fixed it up (I just used the latter version - though I may have missed
something) 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.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped