From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Daniel Vetter <daniel.vetter@ffwll•ch>, Dave Airlie <airlied@redhat•com>
Cc: Intel Graphics <intel-gfx@lists•freedesktop.org>,
DRI <dri-devel@lists•freedesktop.org>,
Ben Skeggs <bskeggs@redhat•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Thomas Zimmermann <tzimmermann@suse•de>
Subject: linux-next: manual merge of the drm-misc tree with the drm tree
Date: Thu, 10 Nov 2022 10:54:31 +1100 [thread overview]
Message-ID: <20221110105431.164e411d@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 965 bytes --]
Hi all,
Today's linux-next merge of the drm-misc tree got a conflict in:
drivers/gpu/drm/nouveau/nouveau_fbcon.c
between commit:
4a16dd9d18a0 ("drm/nouveau/kms: switch to drm fbdev helpers")
from the drm tree and commits:
9877d8f6bc37 ("drm/fb_helper: Rename field fbdev to info in struct drm_fb_helper")
7fd50bc39d12 ("drm/fb-helper: Rename drm_fb_helper_alloc_fbi() to use _info postfix")
afb0ff78c13c ("drm/fb-helper: Rename drm_fb_helper_unregister_fbi() to use _info postfix")
from the drm-misc tree.
I fixed it up (I just removed the file) 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:[~2022-11-09 23:54 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-09 23:54 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2026-04-03 13:34 linux-next: manual merge of the drm-misc tree with the drm tree Mark Brown
2026-03-30 16:02 Mark Brown
2026-03-30 16:02 Mark Brown
2025-07-01 3:07 Stephen Rothwell
2025-07-01 3:21 ` Stephen Rothwell
2019-10-09 0:12 Stephen Rothwell
2019-10-09 0:10 Stephen Rothwell
2019-10-08 23:46 Stephen Rothwell
2019-10-08 23:38 Stephen Rothwell
2019-10-08 23:33 Stephen Rothwell
2019-08-19 3:18 Stephen Rothwell
2019-06-11 3:52 Stephen Rothwell
2019-06-11 3:38 Stephen Rothwell
2019-04-09 1:34 Stephen Rothwell
2019-04-09 7:23 ` Gerd Hoffmann
2019-02-08 1:27 Stephen Rothwell
2019-02-08 8:53 ` Daniel Vetter
2019-02-08 9:25 ` Stephen Rothwell
2019-02-08 9:34 ` Daniel Vetter
2018-11-23 0:13 Stephen Rothwell
2018-09-18 1:31 Stephen Rothwell
2018-09-12 0:39 Stephen Rothwell
2018-03-19 1:29 Stephen Rothwell
2018-03-19 14:14 ` Ville Syrjälä
2017-11-01 3:36 Stephen Rothwell
2017-04-03 3:18 Stephen Rothwell
2016-09-28 2:11 Stephen Rothwell
2014-12-10 1:49 Stephen Rothwell
2014-12-03 2:43 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=20221110105431.164e411d@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=airlied@redhat$(echo .)com \
--cc=bskeggs@redhat$(echo .)com \
--cc=daniel.vetter@ffwll$(echo .)ch \
--cc=dri-devel@lists$(echo .)freedesktop.org \
--cc=intel-gfx@lists$(echo .)freedesktop.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=tzimmermann@suse$(echo .)de \
/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