Received-SPF: pass (google.com: domain of linux-kernel+bounces-14557-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161;
Message-ID: <bd7ef073-99c3-5d38-ca5b-236ac0415fe3@quicinc.com>
Date: Tue, 2 Jan 2024 08:24:36 -0700
Precedence: bulk
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101
 Thunderbird/91.6.0
Subject: Re: linux-next: manual merge of the drm tree with the mm tree
Content-Language: en-US
To: Stephen Rothwell <sfr@canb.auug.org.au>, Dave Airlie <airlied@redhat.com>,
        Andrew Morton <akpm@linux-foundation.org>
CC: DRI <dri-devel@lists.freedesktop.org>,
        "Kirill A. Shutemov"
	<kirill.shutemov@linux.intel.com>,
        Linux Kernel Mailing List
	<linux-kernel@vger.kernel.org>,
        Linux Next Mailing List
	<linux-next@vger.kernel.org>
References: <20240102105223.7634699d@canb.auug.org.au>
From: Jeffrey Hugo <quic_jhugo@quicinc.com>
In-Reply-To: <20240102105223.7634699d@canb.auug.org.au>
Content-Type: text/plain; charset="UTF-8"; format=flowed
Content-Transfer-Encoding: 7bit

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