From: Stephen Rothwell <sfr@canb•auug.org.au>
To: 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>,
"Thomas Hellström" <thomas.hellstrom@linux•intel.com>
Subject: linux-next: manual merge of the drm tree with the mm-stable tree
Date: Tue, 11 Apr 2023 12:24:32 +1000 [thread overview]
Message-ID: <20230411122432.1d2b3ccb@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 807 bytes --]
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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2023-04-11 2:24 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-11 2:24 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-10-24 0:52 linux-next: manual merge of the drm tree with the mm-stable tree Stephen Rothwell
2023-11-01 21:36 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230411122432.1d2b3ccb@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=airlied@redhat$(echo .)com \
--cc=akpm@linux-foundation$(echo .)org \
--cc=dri-devel@lists$(echo .)freedesktop.org \
--cc=kirill.shutemov@linux$(echo .)intel.com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=thomas.hellstrom@linux$(echo .)intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox