From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Daniel Vetter <daniel.vetter@ffwll.ch>,
Linus Torvalds <torvalds@linux-foundation.org>
Cc: "Intel Graphics" <intel-gfx@lists.freedesktop.org>,
DRI <dri-devel@lists.freedesktop.org>,
"Christian König" <christian.koenig@amd.com>,
"Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>,
"Linux Next Mailing List" <linux-next@vger.kernel.org>,
"Matthew Auld" <matthew.auld@intel.com>
Subject: linux-next: manual merge of the drm-misc-fixes tree with Linus' tree
Date: Wed, 21 Feb 2024 09:16:55 +1100 [thread overview]
Message-ID: <20240221091655.2937adbd@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 789 bytes --]
Hi all,
Today's linux-next merge of the drm-misc-fixes tree got a conflict in:
drivers/gpu/drm/tests/drm_buddy_test.c
between commit:
fca7526b7d89 ("drm/tests/drm_buddy: fix build failure on 32-bit targets")
from Linus' tree and commit:
335126937753 ("drm/tests/drm_buddy: fix 32b build")
from the drm-misc-fixes tree.
I fixed it up (I just used the version from Linus' tree) 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:[~2024-02-20 22:17 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-20 22:16 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-12-13 22:00 linux-next: manual merge of the drm-misc-fixes tree with Linus' tree Stephen Rothwell
2022-12-13 22:00 ` Stephen Rothwell
2021-09-19 23:07 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=20240221091655.2937adbd@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=christian.koenig@amd.com \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=matthew.auld@intel.com \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.