From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Daniel Vetter <daniel.vetter@ffwll.ch>,
Jani Nikula <jani.nikula@linux.intel.com>,
Joonas Lahtinen <joonas.lahtinen@linux.intel.com>,
Rodrigo Vivi <rodrigo.vivi@intel.com>,
Dave Airlie <airlied@linux.ie>,
Intel Graphics <intel-gfx@lists.freedesktop.org>,
DRI <dri-devel@lists.freedesktop.org>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Lucas De Marchi <lucas.demarchi@intel.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Thomas Zimmermann <tzimmermann@suse.de>
Subject: linux-next: manual merge of the drm-intel tree with the drm tree
Date: Wed, 9 Feb 2022 11:55:41 +1100 [thread overview]
Message-ID: <20220209115541.59188f6c@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 793 bytes --]
Hi all,
Today's linux-next merge of the drm-intel tree got a conflict in:
include/linux/dma-buf-map.h
between commit:
e8c1f36157ce ("dma-buf-map: Fix dot vs comma in example")
from the drm tree and commit:
7938f4218168 ("dma-buf-map: Rename to iosys-map")
from the drm-intel tree.
I fixed it up (I just removed the file - the changes from the former
commit are only on comments) 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 --]
WARNING: multiple messages have this Message-ID (diff)
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Daniel Vetter <daniel.vetter@ffwll.ch>,
Jani Nikula <jani.nikula@linux.intel.com>,
Joonas Lahtinen <joonas.lahtinen@linux.intel.com>,
Rodrigo Vivi <rodrigo.vivi@intel.com>,
Dave Airlie <airlied@linux.ie>,
Intel Graphics <intel-gfx@lists.freedesktop.org>,
DRI <dri-devel@lists.freedesktop.org>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Lucas De Marchi <lucas.demarchi@intel.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Thomas Zimmermann <tzimmermann@suse.de>
Subject: [Intel-gfx] linux-next: manual merge of the drm-intel tree with the drm tree
Date: Wed, 9 Feb 2022 11:55:41 +1100 [thread overview]
Message-ID: <20220209115541.59188f6c@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 793 bytes --]
Hi all,
Today's linux-next merge of the drm-intel tree got a conflict in:
include/linux/dma-buf-map.h
between commit:
e8c1f36157ce ("dma-buf-map: Fix dot vs comma in example")
from the drm tree and commit:
7938f4218168 ("dma-buf-map: Rename to iosys-map")
from the drm-intel tree.
I fixed it up (I just removed the file - the changes from the former
commit are only on comments) 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 --]
WARNING: multiple messages have this Message-ID (diff)
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Daniel Vetter <daniel.vetter@ffwll.ch>,
Jani Nikula <jani.nikula@linux.intel.com>,
Joonas Lahtinen <joonas.lahtinen@linux.intel.com>,
Rodrigo Vivi <rodrigo.vivi@intel.com>,
Dave Airlie <airlied@linux.ie>,
Intel Graphics <intel-gfx@lists.freedesktop.org>,
DRI <dri-devel@lists.freedesktop.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Lucas De Marchi <lucas.demarchi@intel.com>,
Thomas Zimmermann <tzimmermann@suse.de>
Subject: linux-next: manual merge of the drm-intel tree with the drm tree
Date: Wed, 9 Feb 2022 11:55:41 +1100 [thread overview]
Message-ID: <20220209115541.59188f6c@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 793 bytes --]
Hi all,
Today's linux-next merge of the drm-intel tree got a conflict in:
include/linux/dma-buf-map.h
between commit:
e8c1f36157ce ("dma-buf-map: Fix dot vs comma in example")
from the drm tree and commit:
7938f4218168 ("dma-buf-map: Rename to iosys-map")
from the drm-intel tree.
I fixed it up (I just removed the file - the changes from the former
commit are only on comments) 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-02-09 0:55 UTC|newest]
Thread overview: 67+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-09 0:55 Stephen Rothwell [this message]
2022-02-09 0:55 ` linux-next: manual merge of the drm-intel tree with the drm tree Stephen Rothwell
2022-02-09 0:55 ` [Intel-gfx] " Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2023-10-03 0:09 Stephen Rothwell
2023-10-03 0:09 ` Stephen Rothwell
2023-10-05 14:41 ` Jani Nikula
2023-05-30 1:59 Stephen Rothwell
2023-05-30 1:59 ` Stephen Rothwell
2023-05-30 1:57 Stephen Rothwell
2023-05-30 1:57 ` Stephen Rothwell
2023-05-30 2:10 ` Stephen Rothwell
2023-05-30 2:10 ` Stephen Rothwell
2023-01-24 23:42 Stephen Rothwell
2023-01-24 23:42 ` Stephen Rothwell
2022-09-13 2:19 Stephen Rothwell
2022-09-13 2:19 ` Stephen Rothwell
2022-09-12 1:46 Stephen Rothwell
2022-09-12 1:46 ` Stephen Rothwell
2022-02-11 2:06 Stephen Rothwell
2022-02-11 2:06 ` Stephen Rothwell
2021-08-12 1:28 Stephen Rothwell
2021-04-01 2:13 Stephen Rothwell
2021-04-01 2:13 ` Stephen Rothwell
2021-03-17 3:08 Stephen Rothwell
2021-03-17 3:08 ` Stephen Rothwell
2021-03-18 1:52 ` Stephen Rothwell
2021-03-18 1:52 ` Stephen Rothwell
2021-04-29 22:23 ` Stephen Rothwell
2021-04-29 22:23 ` Stephen Rothwell
2021-05-14 1:53 ` Stephen Rothwell
2021-05-14 1:53 ` Stephen Rothwell
2021-05-14 12:14 ` Thomas Zimmermann
2021-01-25 0:46 Stephen Rothwell
2021-01-25 0:46 ` Stephen Rothwell
2020-07-14 2:59 Stephen Rothwell
2020-07-14 2:59 ` Stephen Rothwell
2019-08-22 3:15 Stephen Rothwell
2019-02-06 0:42 Stephen Rothwell
2019-01-17 1:59 Stephen Rothwell
2019-01-17 1:59 ` Stephen Rothwell
2017-05-19 2:04 Stephen Rothwell
2016-09-07 3:59 Stephen Rothwell
2014-07-23 3:18 Stephen Rothwell
2014-07-23 3:18 ` Stephen Rothwell
2014-07-23 3:06 Stephen Rothwell
2014-07-23 3:06 ` Stephen Rothwell
2014-07-23 5:09 ` Daniel Vetter
2014-07-23 5:09 ` Daniel Vetter
2014-04-03 1:00 Stephen Rothwell
2014-04-03 1:00 ` Stephen Rothwell
2014-01-22 3:09 Stephen Rothwell
2014-01-22 3:09 ` Stephen Rothwell
2014-01-22 3:04 Stephen Rothwell
2014-01-22 3:04 ` Stephen Rothwell
2014-01-22 10:06 ` Daniel Vetter
2014-01-23 1:21 ` Olof Johansson
2014-01-23 1:21 ` Olof Johansson
2014-01-23 21:10 ` Olof Johansson
2014-01-23 21:10 ` Olof Johansson
2013-11-07 2:37 Stephen Rothwell
2013-11-07 2:37 ` Stephen Rothwell
2013-08-29 4:09 Stephen Rothwell
2013-08-29 4:09 ` Stephen Rothwell
2013-06-18 3:04 Stephen Rothwell
2013-06-18 3:04 ` Stephen Rothwell
2013-05-01 4:37 Stephen Rothwell
2013-05-01 8:08 ` Daniel Vetter
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=20220209115541.59188f6c@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=airlied@linux.ie \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jani.nikula@linux.intel.com \
--cc=joonas.lahtinen@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=lucas.demarchi@intel.com \
--cc=rodrigo.vivi@intel.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 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.