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

Date: Tue, 2 Jan 2024 08:24:36 -0700
From: Jeffrey Hugo <quic_jhugo@...cinc.com>
To: Stephen Rothwell <sfr@...b.auug.org.au>, 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>
Subject: 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: 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