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>
Cc: Anusha Srivatsa <anusha.srivatsa@intel.com>,
Intel Graphics <intel-gfx@lists.freedesktop.org>,
Lucas De Marchi <lucas.demarchi@intel.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
DRI <dri-devel@lists.freedesktop.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linus Torvalds <torvalds@linux-foundation.org>
Subject: linux-next: manual merge of the drm-intel tree with Linus' tree
Date: Wed, 8 Jun 2022 09:53:43 +1000 [thread overview]
Message-ID: <20220608095343.7196dedf@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 854 bytes --]
Hi all,
Today's linux-next merge of the drm-intel tree got a conflict in:
drivers/gpu/drm/i915/display/intel_dmc_regs.h
between commit:
2518f226c60d ("Merge tag 'drm-next-2022-05-25' of git://anongit.freedesktop.org/drm/drm")
from Linus' tree and commit:
21c47196aec3 ("drm/i915/dmc: Add MMIO range restrictions")
from the drm-intel tree.
I fixed it up (these were only white space differences, so 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 --]
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>
Cc: Intel Graphics <intel-gfx@lists.freedesktop.org>,
Lucas De Marchi <lucas.demarchi@intel.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
DRI <dri-devel@lists.freedesktop.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linus Torvalds <torvalds@linux-foundation.org>
Subject: [Intel-gfx] linux-next: manual merge of the drm-intel tree with Linus' tree
Date: Wed, 8 Jun 2022 09:53:43 +1000 [thread overview]
Message-ID: <20220608095343.7196dedf@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 854 bytes --]
Hi all,
Today's linux-next merge of the drm-intel tree got a conflict in:
drivers/gpu/drm/i915/display/intel_dmc_regs.h
between commit:
2518f226c60d ("Merge tag 'drm-next-2022-05-25' of git://anongit.freedesktop.org/drm/drm")
from Linus' tree and commit:
21c47196aec3 ("drm/i915/dmc: Add MMIO range restrictions")
from the drm-intel tree.
I fixed it up (these were only white space differences, so 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 --]
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>
Cc: Intel Graphics <intel-gfx@lists.freedesktop.org>,
DRI <dri-devel@lists.freedesktop.org>,
Anusha Srivatsa <anusha.srivatsa@intel.com>,
Linus Torvalds <torvalds@linux-foundation.org>,
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>
Subject: linux-next: manual merge of the drm-intel tree with Linus' tree
Date: Wed, 8 Jun 2022 09:53:43 +1000 [thread overview]
Message-ID: <20220608095343.7196dedf@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 854 bytes --]
Hi all,
Today's linux-next merge of the drm-intel tree got a conflict in:
drivers/gpu/drm/i915/display/intel_dmc_regs.h
between commit:
2518f226c60d ("Merge tag 'drm-next-2022-05-25' of git://anongit.freedesktop.org/drm/drm")
from Linus' tree and commit:
21c47196aec3 ("drm/i915/dmc: Add MMIO range restrictions")
from the drm-intel tree.
I fixed it up (these were only white space differences, so 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:[~2022-06-07 23:53 UTC|newest]
Thread overview: 108+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-07 23:53 Stephen Rothwell [this message]
2022-06-07 23:53 ` linux-next: manual merge of the drm-intel tree with Linus' tree Stephen Rothwell
2022-06-07 23:53 ` [Intel-gfx] " Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2024-01-09 0:22 Stephen Rothwell
2024-01-09 0:22 ` Stephen Rothwell
2023-11-22 0:51 Stephen Rothwell
2023-11-22 0:51 ` Stephen Rothwell
2023-11-22 1:10 ` Stephen Rothwell
2023-11-22 1:10 ` Stephen Rothwell
2023-03-06 23:09 Stephen Rothwell
2023-03-06 23:09 ` Stephen Rothwell
2022-11-13 23:23 Stephen Rothwell
2022-11-13 23:23 ` Stephen Rothwell
2022-11-14 8:19 ` Hans de Goede
2022-11-14 8:19 ` Hans de Goede
2022-11-14 10:10 ` Jani Nikula
2022-11-14 10:10 ` Jani Nikula
2022-11-14 10:35 ` Hans de Goede
2022-11-14 10:35 ` Hans de Goede
2022-11-14 11:02 ` Jani Nikula
2022-11-14 11:02 ` Jani Nikula
2022-10-17 22:05 Stephen Rothwell
2022-10-17 22:05 ` Stephen Rothwell
2022-06-07 23:59 Stephen Rothwell
2022-06-07 23:59 ` Stephen Rothwell
2022-04-05 1:00 Stephen Rothwell
2022-04-05 1:00 ` Stephen Rothwell
2022-04-05 0:53 Stephen Rothwell
2022-04-05 0:53 ` Stephen Rothwell
2022-01-24 22:39 Stephen Rothwell
2022-01-24 22:39 ` Stephen Rothwell
2022-01-24 22:33 Stephen Rothwell
2022-01-24 22:33 ` Stephen Rothwell
2021-08-02 15:29 Mark Brown
2021-05-20 0:19 Stephen Rothwell
2021-05-20 0:19 ` Stephen Rothwell
2021-05-21 1:45 ` Stephen Rothwell
2021-05-21 1:45 ` Stephen Rothwell
2021-05-12 0:28 Stephen Rothwell
2021-05-12 0:28 ` Stephen Rothwell
2020-09-08 4:00 Stephen Rothwell
2020-09-08 4:00 ` Stephen Rothwell
2020-09-08 8:22 ` Hans de Goede
2020-09-08 8:22 ` Hans de Goede
2020-09-08 11:04 ` Stephen Rothwell
2020-09-08 11:04 ` Stephen Rothwell
2020-09-08 13:20 ` Hans de Goede
2020-09-08 13:20 ` Hans de Goede
2020-06-23 1:35 Stephen Rothwell
2020-06-23 1:35 ` Stephen Rothwell
2018-03-22 2:21 Stephen Rothwell
2018-03-22 2:21 ` Stephen Rothwell
2018-03-23 0:50 ` Stephen Rothwell
2018-03-23 0:50 ` Stephen Rothwell
2017-09-19 1:42 Stephen Rothwell
2016-09-16 0:38 Stephen Rothwell
2016-09-16 0:38 ` Stephen Rothwell
2016-09-08 2:08 Stephen Rothwell
2016-09-08 2:08 ` Stephen Rothwell
2016-05-31 1:06 Stephen Rothwell
2016-05-31 1:06 ` Stephen Rothwell
2016-05-31 1:00 Stephen Rothwell
2016-05-31 1:00 ` Stephen Rothwell
2015-12-22 1:03 Stephen Rothwell
2015-12-22 1:03 ` Stephen Rothwell
2015-11-19 0:23 Stephen Rothwell
2015-11-19 0:23 ` Stephen Rothwell
2015-09-29 1:20 Stephen Rothwell
2015-09-29 1:20 ` Stephen Rothwell
2015-09-29 1:20 Stephen Rothwell
2015-09-29 1:20 ` Stephen Rothwell
2015-09-17 0:13 Stephen Rothwell
2015-09-17 0:13 ` Stephen Rothwell
2015-07-09 1:02 Stephen Rothwell
2015-07-09 1:02 ` Stephen Rothwell
2015-04-29 1:15 Stephen Rothwell
2015-04-29 1:15 ` Stephen Rothwell
2014-09-08 4:32 Stephen Rothwell
2014-09-08 4:32 ` Stephen Rothwell
2013-12-18 2:50 Stephen Rothwell
2013-12-18 2:50 ` Stephen Rothwell
2013-12-13 0:58 Stephen Rothwell
2013-12-13 0:58 ` Stephen Rothwell
2013-09-18 1:25 Stephen Rothwell
2013-09-18 1:25 ` Stephen Rothwell
2013-09-18 1:20 Stephen Rothwell
2013-09-18 1:20 ` Stephen Rothwell
2013-06-26 3:54 Stephen Rothwell
2013-06-26 3:54 ` Stephen Rothwell
2013-06-17 3:32 Stephen Rothwell
2013-06-17 3:32 ` Stephen Rothwell
2013-06-17 3:25 Stephen Rothwell
2013-06-17 3:25 ` Stephen Rothwell
2013-05-21 1:58 Stephen Rothwell
2013-05-21 1:58 ` Stephen Rothwell
2013-05-07 1:27 Stephen Rothwell
2013-05-07 1:27 ` Stephen Rothwell
2013-05-07 8:43 ` Daniel Vetter
2013-05-07 8:43 ` Daniel Vetter
2013-05-08 0:11 ` Stephen Rothwell
2013-05-08 0:11 ` Stephen Rothwell
2013-04-03 2:43 Stephen Rothwell
2013-04-03 2:43 ` Stephen Rothwell
2013-04-03 8:31 ` Daniel Vetter
2013-04-02 2:46 Stephen Rothwell
2013-04-02 2:46 ` Stephen Rothwell
2013-03-04 23:23 Stephen Rothwell
2013-03-04 23:23 ` 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=20220608095343.7196dedf@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=anusha.srivatsa@intel.com \
--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=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.