From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Intel Graphics <intel-gfx@lists.freedesktop.org>,
DRI <dri-devel@lists.freedesktop.org>, Andrew Davis <afd@ti.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Maxime Ripard <mripard@kernel.org>,
Tony Lindgren <tony@atomide.com>
Subject: linux-next: manual merge of the drm-misc tree with Linus' tree
Date: Tue, 26 Mar 2024 10:29:40 +1100 [thread overview]
Message-ID: <20240326102940.3aae34c2@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1475 bytes --]
Hi all,
Today's linux-next merge of the drm-misc tree got a conflict in:
MAINTAINERS
between commits:
35df039b26ac ("dt-bindings: gpu: Rename img,powervr to img,powervr-rogue")
796da8ca7e05 ("dt-bindings: gpu: Add PowerVR Series5 SGX GPUs")
from Linus' tree and commit:
3f9ba0c01125 ("MAINTAINERS: Update drm-misc.git URL")
from the drm-misc 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.
--
Cheers,
Stephen Rothwell
diff --cc MAINTAINERS
index ae2121b7a176,13a69b4731c7..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -10600,9 -10496,8 +10611,9 @@@ IMGTEC POWERVR DRM DRIVE
M: Frank Binns <frank.binns@imgtec.com>
M: Matt Coster <matt.coster@imgtec.com>
S: Supported
- T: git git://anongit.freedesktop.org/drm/drm-misc
+ T: git https://gitlab.freedesktop.org/drm/misc/kernel.git
-F: Documentation/devicetree/bindings/gpu/img,powervr.yaml
+F: Documentation/devicetree/bindings/gpu/img,powervr-rogue.yaml
+F: Documentation/devicetree/bindings/gpu/img,powervr-sgx.yaml
F: Documentation/gpu/imagination/
F: drivers/gpu/drm/imagination/
F: include/uapi/drm/pvr_drm.h
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2024-03-25 23:29 UTC|newest]
Thread overview: 68+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-25 23:29 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-02-06 0:59 linux-next: manual merge of the drm-misc tree with Linus' tree Stephen Rothwell
2024-02-06 1:06 ` Stephen Rothwell
2024-02-06 11:28 ` Michael Walle
2024-02-06 11:34 ` Dario Binacchi
2023-11-14 0:42 Stephen Rothwell
2023-11-14 0:36 Stephen Rothwell
2023-11-14 0:31 Stephen Rothwell
2023-11-14 0:25 Stephen Rothwell
2023-09-25 1:41 Stephen Rothwell
2023-09-20 1:12 Stephen Rothwell
2023-09-13 1:09 Stephen Rothwell
2023-09-13 9:04 ` Uwe Kleine-König
2023-07-12 23:58 Stephen Rothwell
2023-05-23 0:43 Stephen Rothwell
2023-05-15 1:14 Stephen Rothwell
2023-03-14 0:19 Stephen Rothwell
2023-01-19 1:13 Stephen Rothwell
2023-01-05 23:50 Stephen Rothwell
2022-11-03 23:15 Stephen Rothwell
2022-10-05 0:43 Stephen Rothwell
2022-06-29 1:06 Stephen Rothwell
2022-06-10 0:44 Stephen Rothwell
2021-11-16 22:29 Stephen Rothwell
2021-10-28 2:48 Stephen Rothwell
2021-01-21 1:24 Stephen Rothwell
2020-10-27 1:26 Stephen Rothwell
2020-10-27 1:20 Stephen Rothwell
2020-10-27 1:16 Stephen Rothwell
2020-08-26 0:01 Stephen Rothwell
2020-09-02 3:11 ` Stephen Rothwell
2020-06-29 1:14 Stephen Rothwell
2020-06-26 1:43 Stephen Rothwell
2020-06-17 0:46 Stephen Rothwell
2020-04-16 1:25 Stephen Rothwell
2020-04-15 1:46 Stephen Rothwell
2019-12-16 0:51 Stephen Rothwell
2019-12-16 0:46 Stephen Rothwell
2019-05-21 0:51 Stephen Rothwell
2019-05-23 0:27 ` Stephen Rothwell
2019-05-23 8:10 ` Maxime Ripard
2019-05-23 9:34 ` Stephen Rothwell
2019-05-23 11:53 ` Maxime Ripard
2019-05-23 13:04 ` Stephen Rothwell
2019-05-23 13:11 ` Daniel Vetter
2019-05-23 14:16 ` Stephen Rothwell
2019-05-23 16:10 ` Rob Herring
2019-05-24 7:12 ` Maxime Ripard
2019-01-11 0:14 Stephen Rothwell
2018-03-20 1:08 Stephen Rothwell
2018-03-23 0:43 ` Stephen Rothwell
2018-03-15 3:14 Stephen Rothwell
2018-03-23 0:45 ` Stephen Rothwell
2017-09-22 2:24 Stephen Rothwell
2017-08-02 2:23 Stephen Rothwell
2017-08-10 2:06 ` Stephen Rothwell
2017-07-19 1:30 Stephen Rothwell
2016-09-23 1:35 Stephen Rothwell
2016-06-07 1:32 Stephen Rothwell
2016-03-31 0:15 Stephen Rothwell
2016-03-29 23:49 Stephen Rothwell
2015-12-16 0:38 Stephen Rothwell
2015-12-14 1:12 Stephen Rothwell
2015-12-14 7:09 ` Thomas Hellstrom
2015-09-12 3:15 Stephen Rothwell
2015-08-14 2:06 Stephen Rothwell
2015-08-03 2:11 Stephen Rothwell
2015-07-30 3:04 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=20240326102940.3aae34c2@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=afd@ti.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=mripard@kernel.org \
--cc=tony@atomide.com \
/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).