From: Stephen Rothwell <sfr@canb.auug.org.au>
To: 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,
Paulo Zanoni <paulo.r.zanoni@intel.com>,
Deepak S <deepak.s@intel.com>
Subject: linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree
Date: Mon, 2 Dec 2013 12:04:37 +1100 [thread overview]
Message-ID: <20131202120437.db17c98af3f3e09ecdde0f2e@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 547 bytes --]
Hi all,
Today's linux-next merge of the drm-intel tree got a conflict in
drivers/gpu/drm/i915/intel_display.c between commit a1216444283e
("drm/i915: use the correct force_wake function at the PC8 code") from
the drm-intel-fixes tree and commit c8d9a5905e45 ("drm/i915: Add power
well arguments to force wake routines") from the drm-intel tree.
I fixed it up (I just used the drm-intel-fixes version) and can carry the
fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
WARNING: multiple messages have this Message-ID (diff)
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Daniel Vetter <daniel.vetter@ffwll.ch>,
intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org
Cc: Deepak S <deepak.s@intel.com>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Paulo Zanoni <paulo.r.zanoni@intel.com>
Subject: linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree
Date: Mon, 2 Dec 2013 12:04:37 +1100 [thread overview]
Message-ID: <20131202120437.db17c98af3f3e09ecdde0f2e@canb.auug.org.au> (raw)
[-- Attachment #1.1: Type: text/plain, Size: 547 bytes --]
Hi all,
Today's linux-next merge of the drm-intel tree got a conflict in
drivers/gpu/drm/i915/intel_display.c between commit a1216444283e
("drm/i915: use the correct force_wake function at the PC8 code") from
the drm-intel-fixes tree and commit c8d9a5905e45 ("drm/i915: Add power
well arguments to force wake routines") from the drm-intel tree.
I fixed it up (I just used the drm-intel-fixes version) and can carry the
fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #1.2: Type: application/pgp-signature, Size: 836 bytes --]
[-- Attachment #2: Type: text/plain, Size: 159 bytes --]
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
next reply other threads:[~2013-12-02 1:04 UTC|newest]
Thread overview: 91+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-02 1:04 Stephen Rothwell [this message]
2013-12-02 1:04 ` linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree Stephen Rothwell
2013-12-02 1:13 ` Stephen Rothwell
2013-12-02 1:13 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2022-02-25 17:08 broonie
2022-02-25 17:08 ` broonie
2022-02-23 14:46 broonie
2022-02-23 14:46 ` broonie
2022-02-02 23:59 Stephen Rothwell
2022-02-02 23:59 ` Stephen Rothwell
2021-08-02 15:18 Mark Brown
2020-06-30 1:52 Stephen Rothwell
2020-06-30 1:52 ` Stephen Rothwell
2020-07-06 1:51 ` Stephen Rothwell
2020-07-06 1:51 ` Stephen Rothwell
2020-03-11 2:36 Stephen Rothwell
2020-03-11 2:36 ` Stephen Rothwell
2020-03-20 1:57 ` Stephen Rothwell
2020-03-20 1:57 ` Stephen Rothwell
2019-03-21 23:57 Stephen Rothwell
2019-03-21 23:57 ` Stephen Rothwell
2019-03-31 22:59 ` Stephen Rothwell
2017-10-18 9:27 Mark Brown
2017-10-18 9:27 ` Mark Brown
2017-10-16 11:35 Mark Brown
2017-10-16 11:35 ` Mark Brown
2017-10-17 8:11 ` Arnd Bergmann
2017-10-17 8:11 ` Arnd Bergmann
2017-10-17 8:30 ` Mark Brown
2017-10-17 8:30 ` Mark Brown
2017-10-12 18:44 Mark Brown
2017-10-12 18:44 ` Mark Brown
2017-10-12 18:36 Mark Brown
2017-10-12 18:36 ` Mark Brown
2017-06-08 3:07 Stephen Rothwell
2017-06-08 3:04 Stephen Rothwell
2017-03-21 0:37 Stephen Rothwell
2017-03-21 0:37 ` Stephen Rothwell
2016-08-24 1:42 Stephen Rothwell
2016-08-24 1:42 ` Stephen Rothwell
2016-08-24 1:32 Stephen Rothwell
2016-08-24 1:32 ` Stephen Rothwell
2016-06-22 1:40 Stephen Rothwell
2016-06-22 1:40 ` Stephen Rothwell
2015-11-18 0:30 Stephen Rothwell
2015-11-18 0:30 ` Stephen Rothwell
2015-09-30 1:32 Stephen Rothwell
2015-09-30 1:32 ` Stephen Rothwell
2015-09-24 1:25 Stephen Rothwell
2015-09-24 1:25 ` Stephen Rothwell
2015-09-24 8:57 ` Jani Nikula
2015-09-24 8:57 ` Jani Nikula
2015-09-24 11:52 ` Stephen Rothwell
2015-07-15 0:15 Stephen Rothwell
2015-07-15 0:15 ` Stephen Rothwell
2015-07-14 2:11 Stephen Rothwell
2015-07-14 2:11 ` Stephen Rothwell
2015-07-14 7:34 ` Daniel Vetter
2015-07-14 7:34 ` Daniel Vetter
2015-07-10 2:15 Stephen Rothwell
2015-07-10 2:15 ` Stephen Rothwell
2015-07-10 2:08 Stephen Rothwell
2015-07-10 2:08 ` Stephen Rothwell
2015-02-27 0:36 Stephen Rothwell
2015-02-27 0:36 ` Stephen Rothwell
2015-02-26 0:15 Stephen Rothwell
2015-02-26 0:15 ` Stephen Rothwell
2015-02-25 1:05 Stephen Rothwell
2015-02-25 1:05 ` Stephen Rothwell
2015-01-09 2:06 Stephen Rothwell
2015-01-09 2:06 ` Stephen Rothwell
2014-05-22 5:58 Stephen Rothwell
2014-05-22 5:58 ` Stephen Rothwell
2014-04-30 2:37 Stephen Rothwell
2014-04-30 2:37 ` Stephen Rothwell
2013-12-16 1:45 Stephen Rothwell
2013-12-16 1:45 ` Stephen Rothwell
2013-09-25 2:00 Stephen Rothwell
2013-09-25 2:00 ` Stephen Rothwell
2013-09-20 1:40 Stephen Rothwell
2013-09-20 1:40 ` Stephen Rothwell
2013-07-26 3:14 Stephen Rothwell
2013-07-26 3:14 ` Stephen Rothwell
2013-07-26 3:10 Stephen Rothwell
2013-07-26 3:10 ` Stephen Rothwell
2013-07-18 2:07 Stephen Rothwell
2013-07-18 2:07 ` Stephen Rothwell
2013-07-18 1:44 Stephen Rothwell
2013-07-18 1:44 ` Stephen Rothwell
2013-07-16 2:05 Stephen Rothwell
2013-07-16 2:05 ` 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=20131202120437.db17c98af3f3e09ecdde0f2e@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=daniel.vetter@ffwll.ch \
--cc=deepak.s@intel.com \
--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=paulo.r.zanoni@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.