From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Hans de Goede <hdegoede@redhat.com>,
Mark Gross <mark.gross@intel.com>,
Daniel Vetter <daniel.vetter@ffwll.ch>,
Intel Graphics <intel-gfx@lists.freedesktop.org>,
DRI <dri-devel@lists.freedesktop.org>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Patrik Jakobsson <patrik.r.jakobsson@gmail.com>,
Thomas Zimmermann <tzimmermann@suse.de>
Subject: linux-next: manual merge of the drivers-x86 tree with the drm-misc tree
Date: Thu, 4 Feb 2021 15:58:46 +1100 [thread overview]
Message-ID: <20210204155846.5aef94a8@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1118 bytes --]
Hi all,
Today's linux-next merge of the drivers-x86 tree got a conflict in:
drivers/gpu/drm/gma500/Kconfig
drivers/gpu/drm/gma500/mdfld_device.c
drivers/gpu/drm/gma500/mdfld_dsi_output.c
drivers/gpu/drm/gma500/mdfld_output.c
drivers/gpu/drm/gma500/tc35876x-dsi-lvds.c
between commits:
b51035c200bd ("drm/gma500: Remove Medfield support")
837f23bb4b60 ("drm/gma500: Drop DRM_GMA3600 config option")
from the drm-misc tree and commit:
bfc838f8598e ("drm/gma500: Convert to use new SCU IPC API")
25ded39ad064 ("drm/gma500: Get rid of duplicate NULL checks")
from the drivers-x86 tree.
I fixed it up (the former removed the text that was updated by the
latter and removed the last 4 files) 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:[~2021-02-04 4:59 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-04 4:58 Stephen Rothwell [this message]
[not found] ` <CAHp75Vct=jSQxu187hwz4Wrc_xRKiTmKFt_bgT-m-z=iW31drg@mail.gmail.com>
2021-02-05 11:06 ` linux-next: manual merge of the drivers-x86 tree with the drm-misc tree Andy Shevchenko
2021-02-05 11:14 ` Patrik Jakobsson
2021-02-05 13:05 ` Daniel Vetter
2021-02-05 14:01 ` Andy Shevchenko
2021-02-14 22:39 ` 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=20210204155846.5aef94a8@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=andriy.shevchenko@linux.intel.com \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=hdegoede@redhat.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mark.gross@intel.com \
--cc=patrik.r.jakobsson@gmail.com \
--cc=tzimmermann@suse.de \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).