From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Daniel Vetter <daniel.vetter@ffwll.ch>,
Intel Graphics <intel-gfx@lists.freedesktop.org>,
DRI <dri-devel@lists.freedesktop.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Deepak M <m.deepak@intel.com>,
Jani Nikula <jani.nikula@intel.com>, Lyude <cpaul@redhat.com>
Subject: linux-next: manual merge of the drm-intel tree with Linus' tree
Date: Fri, 16 Sep 2016 10:38:38 +1000 [thread overview]
Message-ID: <20160916103838.34a84b44@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the drm-intel tree got a conflict in:
drivers/gpu/drm/i915/intel_pm.c
between commit:
f403372658fc ("drm/i915/skl: Add support for the SAGV, fix underrun hangs")
(which is also in the drm-intel tree)
from Linus' tree and commit:
6f3fff602e81 ("drm/i915: Add ddb size field to device info structure")
from the drm-intel tree.
I fixed it up (I just used the drm-intel version) 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
WARNING: multiple messages have this Message-ID (diff)
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Daniel Vetter <daniel.vetter@ffwll.ch>,
Intel Graphics <intel-gfx@lists.freedesktop.org>,
DRI <dri-devel@lists.freedesktop.org>
Cc: Deepak M <m.deepak@intel.com>,
Jani Nikula <jani.nikula@intel.com>, Lyude <cpaul@redhat.com>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: linux-next: manual merge of the drm-intel tree with Linus' tree
Date: Fri, 16 Sep 2016 10:38:38 +1000 [thread overview]
Message-ID: <20160916103838.34a84b44@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the drm-intel tree got a conflict in:
drivers/gpu/drm/i915/intel_pm.c
between commit:
f403372658fc ("drm/i915/skl: Add support for the SAGV, fix underrun hangs")
(which is also in the drm-intel tree)
from Linus' tree and commit:
6f3fff602e81 ("drm/i915: Add ddb size field to device info structure")
from the drm-intel tree.
I fixed it up (I just used the drm-intel version) 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
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next reply other threads:[~2016-09-16 0:38 UTC|newest]
Thread overview: 107+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-16 0:38 Stephen Rothwell [this message]
2016-09-16 0:38 ` linux-next: manual merge of the drm-intel tree with Linus' tree 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-06-07 23:53 Stephen Rothwell
2022-06-07 23:53 ` 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-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=20160916103838.34a84b44@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=cpaul@redhat.com \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jani.nikula@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=m.deepak@intel.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 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.