From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Dave Airlie <airlied@linux.ie>,
Daniel Vetter <daniel.vetter@ffwll.ch>,
<intel-gfx@lists.freedesktop.org>,
<dri-devel@lists.freedesktop.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Hugh Dickins <hughd@google.com>,
Chris Wilson <chris@chris-wilson.co.uk>
Subject: linux-next: manual merge of the drm tree with the drm-intel-fixes tree
Date: Wed, 23 Jul 2014 12:38:56 +1000 [thread overview]
Message-ID: <20140723123856.3836daae@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 564 bytes --]
Hi Dave,
Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/i915/i915_gem_render_state.c between commit
88b982873567 ("drm/i915: fix freeze with blank screen booting highmem")
from the drm-intel-fixes tree and commit 1ce826d436f3 ("drm/i915:
Simplify processing of the golden render context state") from the drm
tree.
I fixed it up (the latter appears to supercede the former, so I used
that) and can carry the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2014-07-23 2:39 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-23 2:38 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-03-07 2:10 linux-next: manual merge of the drm tree with the drm-intel-fixes tree Stephen Rothwell
2024-03-07 8:27 ` Joonas Lahtinen
2023-04-17 14:39 broonie
2022-05-17 1:26 Stephen Rothwell
2022-02-25 16:14 broonie
2022-02-22 17:03 broonie
2020-05-08 3:50 Stephen Rothwell
2020-05-07 2:43 Stephen Rothwell
2020-01-22 0:37 Stephen Rothwell
2020-01-08 1:15 Stephen Rothwell
2020-01-08 1:10 Stephen Rothwell
2020-01-08 1:04 Stephen Rothwell
2020-01-08 2:28 ` Stephen Rothwell
2019-10-31 0:33 Stephen Rothwell
2019-11-08 0:42 ` Stephen Rothwell
2018-01-05 1:00 Stephen Rothwell
2017-07-21 1:26 Stephen Rothwell
2017-06-14 0:56 Stephen Rothwell
2017-06-14 0:50 Stephen Rothwell
2017-06-09 2:26 Stephen Rothwell
2017-06-08 2:53 Stephen Rothwell
2017-03-30 1:14 Stephen Rothwell
2017-03-30 1:08 Stephen Rothwell
2017-03-22 0:00 Stephen Rothwell
2017-03-21 23:57 Stephen Rothwell
2017-03-21 0:28 Stephen Rothwell
2016-06-14 2:10 Stephen Rothwell
2015-12-22 23:06 Stephen Rothwell
2015-12-09 2:35 Stephen Rothwell
2015-12-03 14:51 Mark Brown
2015-12-03 15:49 ` Jani Nikula
2015-12-03 14:47 Mark Brown
2015-12-03 14:52 ` Imre Deak
2015-08-17 3:23 Stephen Rothwell
[not found] <20150605054634.E4FA3140218@ozlabs.org>
2015-06-05 8:03 ` Jani Nikula
2015-06-09 1:58 ` Stephen Rothwell
2015-03-16 2:30 Stephen Rothwell
2015-03-16 13:43 ` Xi Ruoyao
2014-12-03 2:27 Stephen Rothwell
2014-12-03 8:24 ` Jani Nikula
2014-12-03 8:28 ` Stephen Rothwell
2014-11-17 3:04 Stephen Rothwell
2014-07-09 4:06 Stephen Rothwell
2014-05-22 5:44 Stephen Rothwell
2014-05-22 5:40 Stephen Rothwell
2014-05-07 3:24 Stephen Rothwell
2013-10-28 5:46 Stephen Rothwell
2013-10-28 6:12 ` 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=20140723123856.3836daae@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=airlied@linux.ie \
--cc=chris@chris-wilson.co.uk \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=hughd@google.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.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 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).